OSDN Git Service

libc: stop using the custom linker script
authorNick Kralevich <nnk@google.com>
Mon, 7 May 2012 21:33:32 +0000 (14:33 -0700)
committerNick Kralevich <nnk@google.com>
Mon, 7 May 2012 21:33:32 +0000 (14:33 -0700)
stop using the custom linker script. It prevents relro from
working on libc.

This reverts commit b091dd9bf27a9132c4ac9da55f2f4a87ffe3b59f.

libc/Android.mk

index d158dbc..885fb93 100644 (file)
@@ -659,12 +659,6 @@ 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 := \