diff -urN a/src/base/atomicops.h b/src/base/atomicops.h
--- a/src/base/atomicops.h	2013-07-30 03:12:11.000000000 -0600
+++ b/src/base/atomicops.h	2013-08-22 16:40:55.204885730 -0600
@@ -101,7 +101,7 @@
 // TODO(csilvers): match piii, not just __i386.  Also, match k8
 #if defined(__MACH__) && defined(__APPLE__)
 #include "base/atomicops-internals-macosx.h"
-#elif defined(__GNUC__) && defined(ARMV6)
+#elif defined(__GNUC__) && defined(ARMV7)
 #include "base/atomicops-internals-arm-v6plus.h"
 #elif defined(ARMV3)
 #include "base/atomicops-internals-arm-generic.h"