diff options
| author | Nick Kralevich <nnk@google.com> | 2012-04-26 09:54:48 -0700 |
|---|---|---|
| committer | Nick Kralevich <nnk@google.com> | 2012-04-26 11:04:44 -0700 |
| commit | b091dd9bf27a9132c4ac9da55f2f4a87ffe3b59f (patch) | |
| tree | 81edf00d647d3e1bd7fa8ec68dcb831cf39a4130 | |
| parent | 94179a509ee3f6ba7b4ba45fb90477b01049dab8 (diff) | |
| download | android_bionic-b091dd9bf27a9132c4ac9da55f2f4a87ffe3b59f.tar.gz android_bionic-b091dd9bf27a9132c4ac9da55f2f4a87ffe3b59f.tar.bz2 android_bionic-b091dd9bf27a9132c4ac9da55f2f4a87ffe3b59f.zip | |
libc: continue to use Android's custom linker script
By default, Android no longer compiles code using it's custom
linker script /build/core/armelf.xsc. However, this causes
problems for libc. Certain programs linked using older versions
of GOLD expect libc.so to export __exidx_start and __exidx_end.
Removing the custom linker script causes libc.so not to export
those symbols.
For now, continue using the old linker script, until we can
figure out a better solution.
Change-Id: Iaf002afd63a58b848818da24e5a4525620dc4d74
| -rw-r--r-- | libc/Android.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libc/Android.mk b/libc/Android.mk index 885fb932d..d158dbc6e 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -659,6 +659,12 @@ include $(CLEAR_VARS) # see libc/bionic/pthread_debug.c for details LOCAL_CFLAGS := $(libc_common_cflags) -DPTHREAD_DEBUG -DPTHREAD_DEBUG_ENABLED=0 + +ifeq ($(TARGET_ARCH),arm) +# TODO: At some point, we need to remove this custom linker script. +LOCAL_LDFLAGS := -Wl,-T,$(BUILD_SYSTEM)/armelf.xsc +endif + LOCAL_C_INCLUDES := $(libc_common_c_includes) LOCAL_SRC_FILES := \ |