[llvm-commits] [compiler-rt] r168697 - /compiler-rt/trunk/lib/tsan/rtl/tsan_interface_atomic.h

[Dmitry Vyukov]

Author: dvyukov
Date: Tue Nov 27 06:51:16 2012
New Revision: 168697

URL: http://llvm.org/viewvc/llvm-project?rev=168697&view=rev
Log:
tsan: fix macro mess

Modified:
    compiler-rt/trunk/lib/tsan/rtl/tsan_interface_atomic.h

Modified: compiler-rt/trunk/lib/tsan/rtl/tsan_interface_atomic.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/rtl/tsan_interface_atomic.h?rev=168697&r1=168696&r2=168697&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/rtl/tsan_interface_atomic.h (original)
+++ compiler-rt/trunk/lib/tsan/rtl/tsan_interface_atomic.h Tue Nov 27 06:51:16 2012
@@ -22,12 +22,8 @@
 typedef int      __tsan_atomic32;
 typedef long     __tsan_atomic64;  // NOLINT
 
-#if (defined(__clang__) && defined(__clang_major__) \
-      && defined(__clang_minor__) && __clang__ >= 1 && __clang_major__ >= 3 \
-      && __clang_minor__ >= 3) \
-    || (defined(__GNUC__) && defined(__GNUC_MINOR__) \
-      && defined(__GNUC_PATCHLEVEL__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 6 \
-      && __GNUC_PATCHLEVEL__ >= 3)
+#if defined(__SIZEOF_INT128__) \
+    || (__clang_major__ * 100 + __clang_minor__ >= 302)
 typedef __int128 __tsan_atomic128;
 #define __TSAN_HAS_INT128 1
 #else