commit 83a38b8c4407ef38203fd103b0e2695037ec412c
author Iliyan Malchev <malchev@google.com> Thu May 10 09:24:46 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu May 10 09:24:46 2012 -0700
tree 68f340bb7b22f74bcccfd2928c6f5798b9033924
parent 537867aed889b6205805c03190ba655b8128fc19
parent 8034415ddd8404f8788199ed993af89692235dc5

am 8034415d: resolved conflicts for merge of 08e72d01 to jb-dev-plus-aosp

* commit '8034415ddd8404f8788199ed993af89692235dc5':
  bionic: add support for non-NEON memcpy() on NEON SoCs

libc/Android.mk

diff --git a/libc/Android.mk b/libc/Android.mk
index 6c535dc..a79d15c 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -678,12 +678,6 @@
 # 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 := \