commit e5d81f57cb97b3b6b7fccc9c5610d21eb81db09d
author Ben Murdoch <benm@google.com> Thu Apr 03 12:29:45 2014 +0100
committer Ben Murdoch <benm@google.com> Thu Apr 03 12:29:45 2014 +0100
tree f266aab56db899073b21c1edd1d0e00055b9a2cf
parent 67e8dac6e410a019f58fc452b262a184e8e7fd12

Merge from Chromium at DEPS revision 261286

This commit was generated by merge_to_master.py.

Change-Id: Iea9643ce91618057f128e9a5b62c07be152f2b89

build/build_config.h

diff --git a/build/build_config.h b/build/build_config.h
index d8f5dd6..7a208a5 100644
--- a/build/build_config.h
+++ b/build/build_config.h
@@ -107,7 +107,7 @@
 #define ARCH_CPU_ARMEL 1
 #define ARCH_CPU_32_BITS 1
 #define ARCH_CPU_LITTLE_ENDIAN 1
-#elif defined(__arm64__) || defined(__aarch64__)
+#elif defined(__aarch64__)
 #define ARCH_CPU_ARM_FAMILY 1
 #define ARCH_CPU_ARM64 1
 #define ARCH_CPU_64_BITS 1