commit 8034415ddd8404f8788199ed993af89692235dc5
author Iliyan Malchev <malchev@google.com> Thu May 10 09:19:59 2012 -0700
committer Iliyan Malchev <malchev@google.com> Thu May 10 09:19:59 2012 -0700
tree 18342dbe06d1d56229eb1fb49e466b340989d331
parent 804147cb7d533f5635da6adc28fbca1467a3078b
parent 08e72d0161e39e99ff1003bf1ce894f37d7b7eb4

resolved conflicts for merge of 08e72d01 to jb-dev-plus-aosp

Change-Id: If00e354a5953ed54b31963d4f8ea77e1603c321e

libc/Android.mk

diff --git a/libc/Android.mk b/libc/Android.mk
index 5e9d6777..6c535dc 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