diff options
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/Android.mk | 3 | ||||
| -rw-r--r-- | libc/arch-arm/bionic/memcpy.S | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/libc/Android.mk b/libc/Android.mk index dab652317..a4031462a 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -478,6 +478,9 @@ ifeq ($(TARGET_ARCH),arm) ifeq ($(ARCH_ARM_HAVE_TLS_REGISTER),true) libc_common_cflags += -DHAVE_ARM_TLS_REGISTER 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 := diff --git a/libc/arch-arm/bionic/memcpy.S b/libc/arch-arm/bionic/memcpy.S index 438fa001e..8c0b4d7f2 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 |