Index: compiler-rt/lib/sanitizer_common/sanitizer_atomic_clang.h =================================================================== --- compiler-rt/lib/sanitizer_common/sanitizer_atomic_clang.h +++ compiler-rt/lib/sanitizer_common/sanitizer_atomic_clang.h @@ -95,7 +95,7 @@ // This include provides explicit template instantiations for atomic_uint64_t // on MIPS32, which does not directly support 8 byte atomics. It has to // proceed the template definitions above. -#if defined(_MIPS_SIM) && defined(_ABIO32) +#if defined(_MIPS_SIM) && defined(_ABIO32) && _MIPS_SIM == _ABIO32 #include "sanitizer_atomic_clang_mips.h" #endif