| Index: base/atomicops.h
 | 
| ===================================================================
 | 
| --- base/atomicops.h	(revision 152459)
 | 
| +++ base/atomicops.h	(working copy)
 | 
| @@ -132,10 +132,11 @@
 | 
|  #include "base/atomicops_internals_x86_msvc.h"
 | 
|  #elif defined(OS_MACOSX)
 | 
|  #include "base/atomicops_internals_mac.h"
 | 
| +#elif (defined(COMPILER_GCC) && defined(ARCH_CPU_ARM_FAMILY)) || \
 | 
| +       defined(OS_NACL)
 | 
| +#include "base/atomicops_internals_gcc.h"
 | 
|  #elif defined(COMPILER_GCC) && defined(ARCH_CPU_X86_FAMILY)
 | 
|  #include "base/atomicops_internals_x86_gcc.h"
 | 
| -#elif defined(COMPILER_GCC) && defined(ARCH_CPU_ARM_FAMILY)
 | 
| -#include "base/atomicops_internals_arm_gcc.h"
 | 
|  #elif defined(COMPILER_GCC) && defined(ARCH_CPU_MIPS_FAMILY)
 | 
|  #include "base/atomicops_internals_mips_gcc.h"
 | 
|  #else
 | 
| 
 |