[llvm-branch-commits] [compiler-rt-branch] r259666 - Merging r259593:

[Daniel Sanders via llvm-branch-commits]

Author: dsanders
Date: Wed Feb  3 11:13:25 2016
New Revision: 259666

URL: http://llvm.org/viewvc/llvm-project?rev=259666&view=rev
Log:
Merging r259593:
------------------------------------------------------------------------
r259593 | samsonov | 2016-02-02 22:42:25 +0000 (Tue, 02 Feb 2016) | 3 lines

[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/branches/release_38/cmake/config-ix.cmake
    compiler-rt/branches/release_38/test/tsan/CMakeLists.txt

Modified: compiler-rt/branches/release_38/cmake/config-ix.cmake
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_38/cmake/config-ix.cmake?rev=259666&r1=259665&r2=259666&view=diff
==============================================================================
--- compiler-rt/branches/release_38/cmake/config-ix.cmake (original)
+++ compiler-rt/branches/release_38/cmake/config-ix.cmake Wed Feb  3 11:13: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/branches/release_38/test/tsan/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_38/test/tsan/CMakeLists.txt?rev=259666&r1=259665&r2=259666&view=diff
==============================================================================
--- compiler-rt/branches/release_38/test/tsan/CMakeLists.txt (original)
+++ compiler-rt/branches/release_38/test/tsan/CMakeLists.txt Wed Feb  3 11:13: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.