| Message ID | 7df02e5097a4b6ac9971ce581c2f2ad0d39817b1.camel@mengyan1223.wang |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] libsanitizer: cherry-pick db7bca28638e from upstream | expand |
Xi Ruoyao <xry111@mengyan1223.wang> writes: > libsanitizer/ > > * sanitizer_common/sanitizer_atomic_clang.h: Ensures to only > include sanitizer_atomic_clang_mips.h for O32. OK, thanks. Richard > --- > libsanitizer/sanitizer_common/sanitizer_atomic_clang.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/libsanitizer/sanitizer_common/sanitizer_atomic_clang.h b/libsanitizer/sanitizer_common/sanitizer_atomic_clang.h > index fc13ca52dda..ccf18f0786d 100644 > --- a/libsanitizer/sanitizer_common/sanitizer_atomic_clang.h > +++ b/libsanitizer/sanitizer_common/sanitizer_atomic_clang.h > @@ -96,8 +96,8 @@ inline bool atomic_compare_exchange_weak(volatile T *a, > // 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) > - #include "sanitizer_atomic_clang_mips.h" > +#if defined(_MIPS_SIM) && defined(_ABIO32) && _MIPS_SIM == _ABIO32 > +# include "sanitizer_atomic_clang_mips.h" > #endif > > #undef ATOMIC_ORDER
diff --git a/libsanitizer/sanitizer_common/sanitizer_atomic_clang.h b/libsanitizer/sanitizer_common/sanitizer_atomic_clang.h index fc13ca52dda..ccf18f0786d 100644 --- a/libsanitizer/sanitizer_common/sanitizer_atomic_clang.h +++ b/libsanitizer/sanitizer_common/sanitizer_atomic_clang.h @@ -96,8 +96,8 @@ inline bool atomic_compare_exchange_weak(volatile T *a, // 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) - #include "sanitizer_atomic_clang_mips.h" +#if defined(_MIPS_SIM) && defined(_ABIO32) && _MIPS_SIM == _ABIO32 +# include "sanitizer_atomic_clang_mips.h" #endif #undef ATOMIC_ORDER