diff options
| author | Daniel Sanders <daniel.sanders@imgtec.com> | 2016-02-03 17:13:25 +0000 |
|---|---|---|
| committer | Daniel Sanders <daniel.sanders@imgtec.com> | 2016-02-03 17:13:25 +0000 |
| commit | 78bd1bedb55ce6e5f53f68ac2a1b9d088a4d9f7c (patch) | |
| tree | 626bda810fbf8cee578cc3a4af86a397e13d62c9 | |
| parent | d297dafa58f7c1f5ad826e1d8eaaf1e796602e7c (diff) | |
| download | compiler-rt-78bd1bedb55ce6e5f53f68ac2a1b9d088a4d9f7c.tar.gz | |
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.
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/branches/release_38@259666 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | cmake/config-ix.cmake | 3 | ||||
| -rw-r--r-- | test/tsan/CMakeLists.txt | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake index 312f0e060..264085e65 100644 --- a/cmake/config-ix.cmake +++ b/cmake/config-ix.cmake @@ -299,9 +299,6 @@ set(ALL_CFI_SUPPORTED_ARCH ${X86} ${X86_64}) 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. diff --git a/test/tsan/CMakeLists.txt b/test/tsan/CMakeLists.txt index 1f183a41d..f45a6fc59 100644 --- a/test/tsan/CMakeLists.txt +++ b/test/tsan/CMakeLists.txt @@ -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. |