[compiler-rt] r313291 - Revert "[mips] Fix sem_init_glibc test for MIPS."

[Simon Dardis via llvm-commits]

Author: sdardis
Date: Thu Sep 14 12:58:04 2017
New Revision: 313291

URL: http://llvm.org/viewvc/llvm-project?rev=313291&view=rev
Log:
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.

Modified:
    compiler-rt/trunk/test/sanitizer_common/TestCases/Linux/sem_init_glibc.cc

Modified: compiler-rt/trunk/test/sanitizer_common/TestCases/Linux/sem_init_glibc.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/sanitizer_common/TestCases/Linux/sem_init_glibc.cc?rev=313291&r1=313290&r2=313291&view=diff
==============================================================================
--- compiler-rt/trunk/test/sanitizer_common/TestCases/Linux/sem_init_glibc.cc (original)
+++ compiler-rt/trunk/test/sanitizer_common/TestCases/Linux/sem_init_glibc.cc Thu Sep 14 12:58:04 2017
@@ -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;