commit e0879e90ec579540c9759cae8c61775ffb360f6c
author Linux Build Service Account <lnxbuild@localhost> Wed Feb 04 10:03:07 2015 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Feb 04 10:03:07 2015 -0800
tree 1cbc98bae97984eb96ccd20a08c6bc3681e6683c
parent 7b93f5af2fd5ee9bca6bee5f5bbb2cc33cb56deb
parent 6daa89c6947f7e4a79e57f15d5d7ff5742da7a8d

Merge "libc: memcpy_base: Disable opt for certain targets"

libc/arch-arm/krait/krait.mk

diff --git a/libc/arch-arm/krait/krait.mk b/libc/arch-arm/krait/krait.mk
index d82c896..615fbc2 100644
--- a/libc/arch-arm/krait/krait.mk
+++ b/libc/arch-arm/krait/krait.mk
@@ -1,11 +1,18 @@
 libc_bionic_src_files_arm += \
-    arch-arm/krait/bionic/memcpy.S \
     arch-arm/krait/bionic/memset.S \
     arch-arm/krait/bionic/strcmp.S \
     arch-arm/krait/bionic/__strcat_chk.S \
     arch-arm/krait/bionic/__strcpy_chk.S \
     arch-arm/krait/bionic/memmove.S
 
+#For some targets we don't need this optimization
+ifeq ($(TARGET_CPU_MEMCPY_BASE_OPT_DISABLE),true)
+libc_bionic_src_files_arm += \
+    arch-arm/cortex-a15/bionic/memcpy.S
+else
+libc_bionic_src_files_arm += \
+    arch-arm/krait/bionic/memcpy.S
+endif
 
 # Use cortex-a15 versions of strcat/strcpy/strlen and standard memmove
 libc_bionic_src_files_arm += \