[compiler-rt] r259593 - [TSan] Use darwin_filter_host_arch to restrict set of test arch on Mac OS.

[Alexey Samsonov via llvm-commits]

Author: samsonov
Date: Tue Feb  2 16:42:25 2016
New Revision: 259593

URL: http://llvm.org/viewvc/llvm-project?rev=259593&view=rev
Log:
[TSan] Use darwin_filter_host_arch to restrict set of test arch on Mac OS.

This also reverts r259577 which was a quick-fix to fix buildbots.

Modified:
    compiler-rt/trunk/cmake/config-ix.cmake
    compiler-rt/trunk/test/tsan/CMakeLists.txt

Modified: compiler-rt/trunk/cmake/config-ix.cmake
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/cmake/config-ix.cmake?rev=259593&r1=259592&r2=259593&view=diff
==============================================================================
--- compiler-rt/trunk/cmake/config-ix.cmake (original)
+++ compiler-rt/trunk/cmake/config-ix.cmake Tue Feb  2 16:42:25 2016
@@ -299,9 +299,6 @@ set(ALL_CFI_SUPPORTED_ARCH ${X86} ${X86_
 if(APPLE)
   include(CompilerRTDarwinUtils)
 
-  # tsan fails almost everything for x86_64h
-  list(REMOVE_ITEM ALL_TSAN_SUPPORTED_ARCH x86_64h)
-
   # On Darwin if /usr/include doesn't exist, the user probably has Xcode but not
   # the command line tools. If this is the case, we need to find the OS X
   # sysroot to pass to clang.

Modified: compiler-rt/trunk/test/tsan/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/tsan/CMakeLists.txt?rev=259593&r1=259592&r2=259593&view=diff
==============================================================================
--- compiler-rt/trunk/test/tsan/CMakeLists.txt (original)
+++ compiler-rt/trunk/test/tsan/CMakeLists.txt Tue Feb  2 16:42:25 2016
@@ -16,7 +16,12 @@ endif()
 
 set(TSAN_TESTSUITES)
 
-foreach(arch ${TSAN_SUPPORTED_ARCH})
+set(TSAN_TEST_ARCH ${TSAN_SUPPORTED_ARCH})
+if(APPLE)
+  darwin_filter_host_archs(TSAN_SUPPORTED_ARCH TSAN_TEST_ARCH)
+endif()
+
+foreach(arch ${TSAN_TEST_ARCH})
   string(TOLOWER "-${arch}" TSAN_TEST_CONFIG_SUFFIX)
   if(ANDROID OR ${arch} MATCHES "arm|aarch64")
     # This is only true if we are cross-compiling.