commit 306a3538254ed8272ff3d04bcb724d87af7423d1
author Christopher Ferris <cferris@google.com> Wed Feb 27 16:25:03 2013 -0800
committer Christopher Ferris <cferris@google.com> Thu Mar 14 15:32:18 2013 -0700
tree d033f8fc94bd5790c5ba3484faebc321e299e6ef
parent f861bc5cc3e17322e49f89deea61f278aaefbe76

Remove unused arm defines.

The defines HAVE_32_BYTE_CACHE_LINES and ARCH_ARM_USE_NON_NEON_MEMCPY
are not used by any code. The previous memcpy code that used these
has been split into different architecture versions to avoid the need
for them.

Bug: 8005082

Merge from internal master.

(cherry-picked from commit 6e1a5cf31ba47508b08dba02a45b4ea6e1edd6d2)

Change-Id: Ib18fc3f4131b21cdbd19b9dde7697ac25d066fcf

libc/Android.mk

diff --git a/libc/Android.mk b/libc/Android.mk
index d85f596..98399d5 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -493,17 +493,6 @@
   libc_common_cflags += -DSOFTFLOAT
   libc_common_cflags += -fstrict-aliasing
   libc_crt_target_cflags := -mthumb-interwork
-  #
-  # Define HAVE_32_BYTE_CACHE_LINES to indicate to the C library
-  # that it should use the 32-byte version of memcpy, not
-  # the 64-byte version.
-  #
-  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
 endif # !arm
 
 ifeq ($(TARGET_ARCH),x86)