--- a/src/base/atomicops.h	
+++ a/src/base/atomicops.h	
@@ -91,8 +91,10 @@ 
 // 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(__GNUC__) && defined(ARMV6)
+#include "base/atomicops-internals-arm-generic.h"
 #elif defined(ARMV3)
 #include "base/atomicops-internals-arm-generic.h"
 #elif defined(_WIN32)