commit ddc7c98e9138f7b218cb7839c8d8bbb23c1a96f5
author Mathias Agopian <mathias@google.com> Tue Feb 21 12:52:15 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 21 12:52:15 2012 -0800
tree 84f4b202abc4bde7803fc40862e0fbf15ced36bd
parent e27e41b19dcfc6f45ce484fabda95783763f196a
parent 9f763bec7b2b7e3344472f6f5571cf7e6881cdd0

Merge "frameworks/base refactoring"

core/combo/arch/arm/armv7-a-neon.mk

diff --git a/core/combo/arch/arm/armv7-a-neon.mk b/core/combo/arch/arm/armv7-a-neon.mk
index 7b5b8ed..32273ff 100644
--- a/core/combo/arch/arm/armv7-a-neon.mk
+++ b/core/combo/arch/arm/armv7-a-neon.mk
@@ -8,6 +8,7 @@
 ARCH_ARM_HAVE_CLZ               := true
 ARCH_ARM_HAVE_FFS               := true
 ARCH_ARM_HAVE_ARMV7A            := true
+ARCH_ARM_HAVE_TLS_REGISTER      := true
 ARCH_ARM_HAVE_VFP               := true
 ARCH_ARM_HAVE_VFP_D32           := true
 ARCH_ARM_HAVE_NEON              := true

core/combo/arch/arm/armv7-a.mk

diff --git a/core/combo/arch/arm/armv7-a.mk b/core/combo/arch/arm/armv7-a.mk
index 0ca3ec6..220f7ec 100644
--- a/core/combo/arch/arm/armv7-a.mk
+++ b/core/combo/arch/arm/armv7-a.mk
@@ -8,6 +8,7 @@
 ARCH_ARM_HAVE_CLZ               := true
 ARCH_ARM_HAVE_FFS               := true
 ARCH_ARM_HAVE_ARMV7A            := true
+ARCH_ARM_HAVE_TLS_REGISTER      := true
 ARCH_ARM_HAVE_VFP               := true
 
 # Note: Hard coding the 'tune' value here is probably not ideal,