diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2015-07-02 01:10:03 +0000 |
|---|---|---|
| committer | Nico Weber <nicolasweber@gmx.de> | 2015-07-02 01:10:03 +0000 |
| commit | 5e8af5dbfb9d7d043cf39a7d4e49a45e8c4d1569 (patch) | |
| tree | a74af4b10173cde8180cb5dc97519ca4cc5f587e /cmake | |
| parent | 54cfca3b4459e03fe782d6a4db03c48092928da2 (diff) | |
Revert r241217, it breaks the build on Windows.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@241219 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/config-ix.cmake | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake index 7ba85f864..b6fe8ffb0 100644 --- a/cmake/config-ix.cmake +++ b/cmake/config-ix.cmake @@ -181,11 +181,7 @@ else() test_target_arch(i686 __i686__ "-m32") test_target_arch(i386 __i386__ "-m32") else() - if (CMAKE_SIZEOF_VOID_P EQUAL 4) - test_target_arch(i386 "" "") - else() - test_target_arch(x86_64 "" "") - endif() + test_target_arch(i386 "" "") endif() elseif("${LLVM_NATIVE_ARCH}" STREQUAL "PowerPC") TEST_BIG_ENDIAN(HOST_IS_BIG_ENDIAN) @@ -271,14 +267,13 @@ endif() if (SANITIZER_COMMON_SUPPORTED_ARCH AND NOT LLVM_USE_SANITIZER AND (OS_NAME MATCHES "Android|Darwin|Linux|FreeBSD" OR - (OS_NAME MATCHES "Windows" AND MSVC))) + (OS_NAME MATCHES "Windows" AND MSVC AND CMAKE_SIZEOF_VOID_P EQUAL 4))) set(COMPILER_RT_HAS_SANITIZER_COMMON TRUE) else() set(COMPILER_RT_HAS_SANITIZER_COMMON FALSE) endif() -if (COMPILER_RT_HAS_SANITIZER_COMMON AND ASAN_SUPPORTED_ARCH AND - (NOT OS_NAME MATCHES "Windows" OR CMAKE_SIZEOF_VOID_P EQUAL 4)) +if (COMPILER_RT_HAS_SANITIZER_COMMON AND ASAN_SUPPORTED_ARCH) set(COMPILER_RT_HAS_ASAN TRUE) else() set(COMPILER_RT_HAS_ASAN FALSE) @@ -328,7 +323,7 @@ else() endif() if (COMPILER_RT_HAS_SANITIZER_COMMON AND UBSAN_SUPPORTED_ARCH AND - OS_NAME MATCHES "Darwin|Linux|FreeBSD|Windows") + OS_NAME MATCHES "Darwin|Linux|FreeBSD") set(COMPILER_RT_HAS_UBSAN TRUE) else() set(COMPILER_RT_HAS_UBSAN FALSE) |