diff options
| author | Alexey Samsonov <vonosmas@gmail.com> | 2015-02-26 21:03:41 +0000 |
|---|---|---|
| committer | Alexey Samsonov <vonosmas@gmail.com> | 2015-02-26 21:03:41 +0000 |
| commit | a716618927feefe5133bc1ee45c6b120c1d4ae22 (patch) | |
| tree | 7e4af5e698176959407c34c48902243fc187bacf | |
| parent | 6307cf0aa33e0401a67c981a20eb682ac8c93c58 (diff) | |
| download | llvm-a716618927feefe5133bc1ee45c6b120c1d4ae22.zip llvm-a716618927feefe5133bc1ee45c6b120c1d4ae22.tar.gz llvm-a716618927feefe5133bc1ee45c6b120c1d4ae22.tar.bz2 | |
[CMake] Make sure we built one variant of i386/i686 runtime libraries.
llvm-svn: 230683
| -rw-r--r-- | compiler-rt/cmake/config-ix.cmake | 4 | ||||
| -rw-r--r-- | compiler-rt/lib/asan/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | compiler-rt/lib/ubsan/CMakeLists.txt | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/compiler-rt/cmake/config-ix.cmake b/compiler-rt/cmake/config-ix.cmake index 48f9117..9c4c8de 100644 --- a/compiler-rt/cmake/config-ix.cmake +++ b/compiler-rt/cmake/config-ix.cmake @@ -161,8 +161,10 @@ else() if("${LLVM_NATIVE_ARCH}" STREQUAL "X86") if(NOT MSVC) test_target_arch(x86_64 "" "-m64") - test_target_arch(i386 __i386__ "-m32") test_target_arch(i686 __i686__ "-m32") + if(NOT CAN_TARGET_i686) + test_target_arch(i386 __i386__ "-m32") + endif() else() test_target_arch(i386 "" "") endif() diff --git a/compiler-rt/lib/asan/CMakeLists.txt b/compiler-rt/lib/asan/CMakeLists.txt index d4c5c17..90cb6f8 100644 --- a/compiler-rt/lib/asan/CMakeLists.txt +++ b/compiler-rt/lib/asan/CMakeLists.txt @@ -147,7 +147,7 @@ else() target_link_libraries(clang_rt.asan-dynamic-${arch} ${ASAN_DYNAMIC_LIBS}) add_dependencies(asan clang_rt.asan-dynamic-${arch}) - if (UNIX AND NOT ${arch} STREQUAL "i386" AND NOT ${arch} STREQUAL "i686") + if (UNIX AND NOT ${arch} MATCHES "i386|i686") add_sanitizer_rt_symbols(clang_rt.asan_cxx-${arch}) add_dependencies(asan clang_rt.asan_cxx-${arch}-symbols) add_sanitizer_rt_symbols(clang_rt.asan-${arch} asan.syms.extra) diff --git a/compiler-rt/lib/ubsan/CMakeLists.txt b/compiler-rt/lib/ubsan/CMakeLists.txt index 09c7a85..6683272 100644 --- a/compiler-rt/lib/ubsan/CMakeLists.txt +++ b/compiler-rt/lib/ubsan/CMakeLists.txt @@ -44,7 +44,7 @@ else() clang_rt.san-${arch} clang_rt.ubsan-${arch} clang_rt.ubsan_cxx-${arch}) - if (UNIX AND NOT ${arch} STREQUAL "i386" AND NOT ${arch} STREQUAL "i686") + if (UNIX AND NOT ${arch} MATCHES "i386|i686") add_sanitizer_rt_symbols(clang_rt.ubsan-${arch} ubsan.syms.extra) add_sanitizer_rt_symbols(clang_rt.ubsan_cxx-${arch} ubsan.syms.extra) add_dependencies(ubsan |