[compiler-rt] r254420 - Revert r254417 ("[tsan] Enable Thread Sanitizer on OS X builds by default").

Kuba Brecka via llvm-commits llvm-commits at lists.llvm.org
Tue Dec 1 07:56:38 PST 2015


Author: kuba.brecka
Date: Tue Dec  1 09:56:38 2015
New Revision: 254420

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


Modified:
    compiler-rt/trunk/cmake/config-ix.cmake

Modified: compiler-rt/trunk/cmake/config-ix.cmake
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/cmake/config-ix.cmake?rev=254420&r1=254419&r2=254420&view=diff
==============================================================================
--- compiler-rt/trunk/cmake/config-ix.cmake (original)
+++ compiler-rt/trunk/cmake/config-ix.cmake Tue Dec  1 09:56:38 2015
@@ -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)




More information about the llvm-commits mailing list