| Index: base/atomicops.h
|
| diff --git a/base/atomicops.h b/base/atomicops.h
|
| index 27a8714d995a8813f48a59062002844717bd3f80..4d4ecf415a0f72f90fe05729ff6b2c8165e25485 100644
|
| --- a/base/atomicops.h
|
| +++ b/base/atomicops.h
|
| @@ -143,11 +143,12 @@ Atomic64 Release_Load(volatile const Atomic64* ptr);
|
| #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) && defined(OS_NACL)
|
| +#include "base/atomicops_internals_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
|
|
|