maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[CMake] Make sure we built one variant of i386/i686 runtime libraries. 

llvm-svn: 230683
This commit is contained in:
Alexey Samsonov 2015-02-26 21:03:41 +00:00
parent 6307cf0aa3
commit a716618927
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler-rt/cmake/config-ix.cmake
View File

@ -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()

2
compiler-rt/lib/asan/CMakeLists.txt
View File

@ -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)

2
compiler-rt/lib/ubsan/CMakeLists.txt
View File

@ -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