From: Dmitry Vyukov <dvyukov@google.com>
Date: Tue, 27 Nov 2012 12:51:16 +0000 (+0000)
Subject: tsan: fix macro mess
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ec8da998468c5830a4cce4c96e7b0f56a71bae9a;p=platform%2Fupstream%2Fllvm.git

tsan: fix macro mess

llvm-svn: 168697
---

diff --git a/compiler-rt/lib/tsan/rtl/tsan_interface_atomic.h b/compiler-rt/lib/tsan/rtl/tsan_interface_atomic.h
index 576bbd1..ce9be14 100644
--- a/compiler-rt/lib/tsan/rtl/tsan_interface_atomic.h
+++ b/compiler-rt/lib/tsan/rtl/tsan_interface_atomic.h
@@ -22,12 +22,8 @@ typedef short    __tsan_atomic16;  // NOLINT
 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