commit 4d696eb49d24590a6d6d25657b5bc0103e2d90ba
author Elliott Hughes <enh@google.com> Fri Mar 15 00:30:48 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 15 00:30:48 2013 +0000
tree fa167f871be2e9c9cd9e33468b8a73e76c17b155
parent d30b9f0912b4763f0d98bdee23064015223ec03f
parent af7f2f2fcf9887668918bdc5f0670bdd4aae8009

Merge "Fix a bug in ZoneCompactor that meant the zonetab offset was wrong."

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)