From b091dd9bf27a9132c4ac9da55f2f4a87ffe3b59f Mon Sep 17 00:00:00 2001 From: Nick Kralevich Date: Thu, 26 Apr 2012 09:54:48 -0700 Subject: 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 --- libc/Android.mk | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'libc') 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 := \ -- cgit v1.1