diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2012-11-27 12:51:16 +0000 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2012-11-27 12:51:16 +0000 |
| commit | ec8da998468c5830a4cce4c96e7b0f56a71bae9a (patch) | |
| tree | 5df16536d7af4bb9e0c12a0f925da52c2116c27a /compiler-rt | |
| parent | ee5984df399aa360047e2e4ac9209bd886bc4961 (diff) | |
| download | bcm5719-llvm-ec8da998468c5830a4cce4c96e7b0f56a71bae9a.tar.gz bcm5719-llvm-ec8da998468c5830a4cce4c96e7b0f56a71bae9a.zip | |
tsan: fix macro mess
llvm-svn: 168697
Diffstat (limited to 'compiler-rt')
| -rw-r--r-- | compiler-rt/lib/tsan/rtl/tsan_interface_atomic.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/compiler-rt/lib/tsan/rtl/tsan_interface_atomic.h b/compiler-rt/lib/tsan/rtl/tsan_interface_atomic.h index 576bbd1488b..ce9be14c338 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 |
