diff options
| author | Simon Dardis <simon.dardis@imgtec.com> | 2017-09-14 19:58:04 +0000 |
|---|---|---|
| committer | Simon Dardis <simon.dardis@imgtec.com> | 2017-09-14 19:58:04 +0000 |
| commit | aa753d2dffec736c1389b876a55f6390c70d8e71 (patch) | |
| tree | 98aaa961cc1bd2a08ca0e6e2fc2ccf1882dd7b0a /test/sanitizer_common | |
| parent | ee5ce553a0e466226246bde2390c6d18f06bcf86 (diff) | |
Revert "[mips] Fix sem_init_glibc test for MIPS."
The commit did not fix the failing test and instead exposed an inconsistency
between lsan and (t|m|a)san. I'm reverting the patch as it causes more failures
and the original patch had a '||' instead of '&&', which meant that an N32 build
of test would have be incorrect w.r.t. __HAVE_64B_ATOMICS for glibc.
This reverts commit r313248.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@313291 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/sanitizer_common')
| -rw-r--r-- | test/sanitizer_common/TestCases/Linux/sem_init_glibc.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/test/sanitizer_common/TestCases/Linux/sem_init_glibc.cc b/test/sanitizer_common/TestCases/Linux/sem_init_glibc.cc index 5fc9e4639..523ac9811 100644 --- a/test/sanitizer_common/TestCases/Linux/sem_init_glibc.cc +++ b/test/sanitizer_common/TestCases/Linux/sem_init_glibc.cc @@ -13,11 +13,9 @@ typedef uint64_t semval_t; // This condition needs to correspond to __HAVE_64B_ATOMICS macro in glibc. -#elif (defined(__x86_64__) || defined(__aarch64__) || \ - defined(__powerpc64__) || defined(__s390x__) || defined(__sparc64__) || \ - defined(__alpha__) || defined(__ia64__) || defined(__m68k__) || \ - (defined(__mips64) || _MIPS_SIM == _ABI64)) && \ - __GLIBC_PREREQ(2, 21) +#elif (defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__) || \ + defined(__s390x__) || defined(__sparc64__) || defined(__alpha__) || \ + defined(__ia64__) || defined(__m68k__)) && __GLIBC_PREREQ(2, 21) typedef uint64_t semval_t; #else typedef unsigned semval_t; |