commit 6daa89c6947f7e4a79e57f15d5d7ff5742da7a8d
author Raghavendra Prasad Nagaraj <prasr@codeaurora.org> Mon Jan 19 19:24:53 2015 +0530
committer Raghavendra Prasad Nagaraj <prasr@codeaurora.org> Tue Feb 03 16:21:18 2015 +0530
tree 1cbc98bae97984eb96ccd20a08c6bc3681e6683c
parent 7b93f5af2fd5ee9bca6bee5f5bbb2cc33cb56deb

libc: memcpy_base: Disable opt for certain targets

memcpy_base.S optimization is yielding low
memory scores for 8x26 and 8x10. So this opt is
being conditionally compiled.

CRs-fixed: 790279

Change-Id: I5a5a60dfa81d86fd43b6be73fa344da861ebb33c

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