[llvm-branch-commits] [compiler-rt-branch] r259665 - Merging r259577:

[Daniel Sanders via llvm-branch-commits]

Author: dsanders
Date: Wed Feb  3 11:12:36 2016
New Revision: 259665

URL: http://llvm.org/viewvc/llvm-project?rev=259665&view=rev
Log:
Merging r259577:
------------------------------------------------------------------------
r259577 | dsanders | 2016-02-02 21:41:17 +0000 (Tue, 02 Feb 2016) | 5 lines

[tsan] Disable x86_64h build that was enabled as part of r259542.

It fails almost every test on clang-stage1-cmake-RA_check.


------------------------------------------------------------------------

Modified:
    compiler-rt/branches/release_38/cmake/config-ix.cmake

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=259665&r1=259664&r2=259665&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:12:36 2016
@@ -299,6 +299,9 @@ 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.