From c396efc1baec875160afe34a3e65c46cce2bd72f Mon Sep 17 00:00:00 2001
From: buzbee <buzbee@google.com>
Date: Sun, 11 Sep 2011 09:36:41 -0700
Subject: 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
---
 src/thread.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/thread.cc')

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;
-- 
cgit v1.2.3-59-g8ed1b