summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuba Brecka <kuba.brecka@gmail.com>2015-12-01 15:56:38 +0000
committerKuba Brecka <kuba.brecka@gmail.com>2015-12-01 15:56:38 +0000
commit1e9fd96c4c8adb856638438d87c880ad9d29da91 (patch)
tree958b4a956ea59e37cac1e839eda174a5e1ea49b3
parentb318fcbd8b1e820df8b11706891dd677b41f2083 (diff)
downloadbcm5719-llvm-1e9fd96c4c8adb856638438d87c880ad9d29da91.tar.gz
bcm5719-llvm-1e9fd96c4c8adb856638438d87c880ad9d29da91.zip
Revert r254417 ("[tsan] Enable Thread Sanitizer on OS X builds by default").
A ton of tests fail on OS X 10.10, because dyld auto-interposition is only available in 10.11. llvm-svn: 254420
-rw-r--r--compiler-rt/cmake/config-ix.cmake9
1 files changed, 8 insertions, 1 deletions
diff --git a/compiler-rt/cmake/config-ix.cmake b/compiler-rt/cmake/config-ix.cmake
index 75190307005..b12d4f78a81 100644
--- a/compiler-rt/cmake/config-ix.cmake
+++ b/compiler-rt/cmake/config-ix.cmake
@@ -560,12 +560,19 @@ else()
endif()
if (COMPILER_RT_HAS_SANITIZER_COMMON AND TSAN_SUPPORTED_ARCH AND
- OS_NAME MATCHES "Darwin|Linux|FreeBSD")
+ OS_NAME MATCHES "Linux|FreeBSD")
set(COMPILER_RT_HAS_TSAN TRUE)
else()
set(COMPILER_RT_HAS_TSAN FALSE)
endif()
+if(APPLE)
+ option(COMPILER_RT_ENABLE_TSAN_OSX "Enable building TSan for OS X - Experimental" Off)
+ if(COMPILER_RT_ENABLE_TSAN_OSX)
+ set(COMPILER_RT_HAS_TSAN TRUE)
+ endif()
+endif()
+
if (COMPILER_RT_HAS_SANITIZER_COMMON AND UBSAN_SUPPORTED_ARCH AND
OS_NAME MATCHES "Darwin|Linux|FreeBSD|Windows")
set(COMPILER_RT_HAS_UBSAN TRUE)
OpenPOWER on IntegriCloud