libc: rework linaro optimization inclusion (again)
fix it for krait optimization
switch linaro optimizations to opt-in
although i have not had any issues its probably a bad idea to turn them
on by default. there could be issues using it and qcom optimizations together
and cortex-a8 really isnt seeing any drastic performance increase from it.
Change-Id: I890b343c7a6bd5a9391775e21357d5453b87b1fc
diff --git a/libc/Android.mk b/libc/Android.mk
index 5f34b29..265cdb4 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -398,8 +398,8 @@
libc_arch_dynamic_src_files := \
arch-arm/bionic/exidx_dynamic.c
-# Allow opt-out of linaro optimized string routines
-TARGET_USE_LINARO_STRING_ROUTINES ?= true
+# linaro optimized string routines are opt-in
+TARGET_USE_LINARO_STRING_ROUTINES ?= false
# We can only use linaro optimizations on Arm-v7a
ifeq ($(TARGET_USE_LINARO_STRING_ROUTINES)-$(ARCH_ARM_HAVE_ARMV7A),true-true)
@@ -408,25 +408,32 @@
arch-arm/bionic/armv7/strchr.S \
arch-arm/bionic/armv7/strcpy.c \
arch-arm/bionic/armv7/strlen.S
-# We don't want to override the scorpion optimizations
+else
+libc_common_src_files += \
+ string/memchr.c \
+ string/strchr.c \
+ arch-arm/bionic/strcpy.S \
+ arch-arm/bionic/strlen.c.arm
+endif
+
+# Don't override Qcom optimizations with linaro
ifeq ($(TARGET_USE_SCORPION_BIONIC_OPTIMIZATION),true)
libc_common_src_files += \
arch-arm/bionic/memcpy.S \
arch-arm/bionic/memset.S
-else
+else ifeq ($(TARGET_USE_KRAIT_BIONIC_OPTIMIZATION),true)
+libc_common_src_files += \
+ arch-arm/bionic/memcpy.S \
+ arch-arm/bionic/memset.S
+else ifeq ($(TARGET_USE_LINARO_STRING_ROUTINES)-$(ARCH_ARM_HAVE_ARMV7A),true-true)
libc_common_src_files += \
arch-arm/bionic/armv7/memcpy.S \
arch-arm/bionic/armv7/memset.S \
arch-arm/bionic/armv7/bzero.S
-endif
-else
+else # No mem optimizations
libc_common_src_files += \
- string/memchr.c \
arch-arm/bionic/memcpy.S \
- arch-arm/bionic/memset.S \
- string/strchr.c \
- arch-arm/bionic/strcpy.S \
- arch-arm/bionic/strlen.c.arm
+ arch-arm/bionic/memset.S
endif
else # !arm