diff options
| author | Colin Cross <ccross@android.com> | 2010-01-15 14:07:40 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-01-15 14:07:40 -0800 |
| commit | 3839580cd9635fcfb8b509eef4c693b51ec48a12 (patch) | |
| tree | 8c6c2c2c865e53204cf1c1f68b3f7210355e1c86 | |
| parent | 6458c49c96fd2069a82fa6bb48283b4397087a25 (diff) | |
| parent | 278d157f437c0357b7c6d1fb1cbffbc0a72bb788 (diff) | |
| download | bionic-3839580cd9635fcfb8b509eef4c693b51ec48a12.zip bionic-3839580cd9635fcfb8b509eef4c693b51ec48a12.tar.gz bionic-3839580cd9635fcfb8b509eef4c693b51ec48a12.tar.bz2 | |
Merge "Use correct TLS codepath for linker"
| -rw-r--r-- | linker/Android.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/linker/Android.mk b/linker/Android.mk index 6c26eb3..c2d369e 100644 --- a/linker/Android.mk +++ b/linker/Android.mk @@ -27,7 +27,11 @@ LOCAL_CFLAGS += -DLINKER_TEXT_BASE=$(LINKER_TEXT_BASE) LOCAL_CFLAGS += -DLINKER_AREA_SIZE=$(LINKER_AREA_SIZE) # we need to access the Bionic private header <bionic_tls.h> -# in the linker +# in the linker; duplicate the HAVE_ARM_TLS_REGISTER definition +# from the libc build +ifeq ($(TARGET_ARCH)-$(ARCH_ARM_HAVE_TLS_REGISTER),arm-true) + LOCAL_CFLAGS += -DHAVE_ARM_TLS_REGISTER +endif LOCAL_CFLAGS += -I$(LOCAL_PATH)/../libc/private ifeq ($(TARGET_ARCH),arm) |