diff options
| author | Nick Kralevich <nnk@google.com> | 2012-04-26 11:58:48 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-04-26 11:58:48 -0700 |
| commit | 2cc08949923f666d6d71e329871234b6c2154384 (patch) | |
| tree | 9b310091384fbe4e857fa4b26c8182acb977d778 /libc | |
| parent | 203aae7d79be8609e61844593cb40b90ae8a0b30 (diff) | |
| parent | b091dd9bf27a9132c4ac9da55f2f4a87ffe3b59f (diff) | |
| download | bionic-2cc08949923f666d6d71e329871234b6c2154384.zip bionic-2cc08949923f666d6d71e329871234b6c2154384.tar.gz bionic-2cc08949923f666d6d71e329871234b6c2154384.tar.bz2 | |
am b091dd9b: libc: continue to use Android\'s custom linker script
* commit 'b091dd9bf27a9132c4ac9da55f2f4a87ffe3b59f':
libc: continue to use Android's custom linker script
Diffstat (limited to 'libc')
| -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 885fb93..d158dbc 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 := \ |