commit 1b56aaa659174c56cd602dc54f119b40c5ca1af6
author Elliott Hughes <enh@google.com> Thu May 10 23:15:00 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu May 10 23:15:00 2012 -0700
tree e6cf2bbb49a5879663c8af0eeb6536ce3a0f0097
parent 83a38b8c4407ef38203fd103b0e2695037ec412c
parent f2f7bf76dfd1d6014ed3baa1e27b221388e70a09

am f2f7bf76: am 4f05d1c7: Merge "bionic/x86: Optimization for memcpy"

* commit 'f2f7bf76dfd1d6014ed3baa1e27b221388e70a09':
  bionic/x86: Optimization for memcpy

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 := \