Build fix: move target-indepent code out of __arm__

F2L and D2L are target independent, so the function pointer
initialization should be outside of the arm-only section.

Change-Id: I979b39d25a7d49c47e4fbbf6c0d5e50a460c2e43

1 files changed, 2 insertions, 2 deletions

diff --git a/src/thread.cc b/src/thread.cc
index d5174ab10d..9361d004fb 100644
--- a/src/thread.cc
+++ b/src/thread.cc
@@ -270,12 +270,12 @@ void Thread::InitFunctionPointers() {
   pDdiv = __aeabi_ddiv;
   pDmul = __aeabi_dmul;
   pFmod = fmod;
-  pF2l = F2L;
-  pD2l = D2L;
   pLdivmod = __aeabi_ldivmod;
   pLmul = __aeabi_lmul;
   pInvokeInterfaceTrampoline = art_invoke_interface_trampoline;
 #endif
+  pF2l = F2L;
+  pD2l = D2L;
   pAllocFromCode = Array::AllocFromCode;
   pCheckAndAllocFromCode = CheckAndAllocFromCode;
   pAllocObjectFromCode = Class::AllocObjectFromCode;