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 1b0243f..a79d15c 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -493,6 +493,9 @@
   ifeq ($(ARCH_ARM_HAVE_32_BYTE_CACHE_LINES),true)
     libc_common_cflags += -DHAVE_32_BYTE_CACHE_LINE
   endif
+  ifeq ($(ARCH_ARM_USE_NON_NEON_MEMCPY),true)
+    libc_common_cflags += -DARCH_ARM_USE_NON_NEON_MEMCPY
+  endif
 else # !arm
   ifeq ($(TARGET_ARCH),x86)
     libc_crt_target_cflags :=

libc/arch-arm/bionic/memcpy.S

diff --git a/libc/arch-arm/bionic/memcpy.S b/libc/arch-arm/bionic/memcpy.S
index 815b5f6..8453cc0 100644
--- a/libc/arch-arm/bionic/memcpy.S
+++ b/libc/arch-arm/bionic/memcpy.S
@@ -29,7 +29,7 @@
 #include <machine/cpu-features.h>
 #include <machine/asm.h>
 
-#if defined(__ARM_NEON__)
+#if defined(__ARM_NEON__) && !defined(ARCH_ARM_USE_NON_NEON_MEMCPY)
 
         .text
         .fpu    neon