diff options
| author | Petr Hosek <phosek@chromium.org> | 2017-04-05 22:53:05 +0000 |
|---|---|---|
| committer | Petr Hosek <phosek@chromium.org> | 2017-04-05 22:53:05 +0000 |
| commit | 963bcd2ec31fd512b11bb557ec0c73337867dbe4 (patch) | |
| tree | 2e0b3f8bbcaa3109efb799cfdae2269b83831d9e | |
| parent | e935296f369df6ac4bb54bf953c1a5ae219f5567 (diff) | |
| download | bcm5719-llvm-963bcd2ec31fd512b11bb557ec0c73337867dbe4.tar.gz bcm5719-llvm-963bcd2ec31fd512b11bb557ec0c73337867dbe4.zip | |
[CMake][libcxx] Use builtins rather than gcc_s when compiler-rt is requested
When compiler-rt is requested, we should attempt to link compiler-rt
builtins library rather than gcc_s.
Differential Revision: https://reviews.llvm.org/D31617
llvm-svn: 299599
| -rw-r--r-- | libcxx/cmake/Modules/HandleCompilerRT.cmake | 5 | ||||
| -rw-r--r-- | libcxx/cmake/config-ix.cmake | 4 | ||||
| -rw-r--r-- | libcxx/lib/CMakeLists.txt | 7 |
3 files changed, 13 insertions, 3 deletions
diff --git a/libcxx/cmake/Modules/HandleCompilerRT.cmake b/libcxx/cmake/Modules/HandleCompilerRT.cmake index 9730008319c..41cdd44b3c9 100644 --- a/libcxx/cmake/Modules/HandleCompilerRT.cmake +++ b/libcxx/cmake/Modules/HandleCompilerRT.cmake @@ -3,8 +3,11 @@ function(find_compiler_rt_library name dest) message(FATAL_ERROR "LIBCXX_COMPILE_FLAGS must be defined when using this function") endif() set(dest "" PARENT_SCOPE) - set(CLANG_COMMAND ${CMAKE_CXX_COMPILER} ${LIBCXX_COMPILE_FLAGS} + set(CLANG_COMMAND ${CMAKE_CXX_COMPILER} ${TARGET_TRIPLE} ${LIBCXX_COMPILE_FLAGS} "--rtlib=compiler-rt" "--print-libgcc-file-name") + if (CMAKE_CXX_COMPILER_ID MATCHES Clang AND CMAKE_CXX_COMPILER_TARGET) + list(APPEND CLANG_COMMAND "--target=${CMAKE_CXX_COMPILER_TARGET}") + endif() execute_process( COMMAND ${CLANG_COMMAND} RESULT_VARIABLE HAD_ERROR diff --git a/libcxx/cmake/config-ix.cmake b/libcxx/cmake/config-ix.cmake index ed9d3e8e89b..5f31cfac328 100644 --- a/libcxx/cmake/config-ix.cmake +++ b/libcxx/cmake/config-ix.cmake @@ -31,7 +31,9 @@ if (LIBCXX_SUPPORTS_NODEFAULTLIBS_FLAG) list(APPEND CMAKE_REQUIRED_LIBRARIES c) endif () if (LIBCXX_USE_COMPILER_RT) - list(APPEND CMAKE_REQUIRED_LIBRARIES -rtlib=compiler-rt) + list(APPEND CMAKE_REQUIRED_FLAGS -rtlib=compiler-rt) + find_compiler_rt_library(builtins LIBCXX_BUILTINS_LIBRARY) + list(APPEND CMAKE_REQUIRED_LIBRARIES "${LIBCXX_BUILTINS_LIBRARY}") elseif (LIBCXX_HAS_GCC_S_LIB) list(APPEND CMAKE_REQUIRED_LIBRARIES gcc_s) endif () diff --git a/libcxx/lib/CMakeLists.txt b/libcxx/lib/CMakeLists.txt index e6f3b4c5581..bc15be6798e 100644 --- a/libcxx/lib/CMakeLists.txt +++ b/libcxx/lib/CMakeLists.txt @@ -83,7 +83,12 @@ add_library_flags_if(LIBCXX_HAS_PTHREAD_LIB pthread) add_library_flags_if(LIBCXX_HAS_C_LIB c) add_library_flags_if(LIBCXX_HAS_M_LIB m) add_library_flags_if(LIBCXX_HAS_RT_LIB rt) -add_library_flags_if(LIBCXX_HAS_GCC_S_LIB gcc_s) +if (LIBCXX_USE_COMPILER_RT) + find_compiler_rt_library(builtins LIBCXX_BUILTINS_LIBRARY) + add_library_flags_if(LIBCXX_BUILTINS_LIBRARY "${LIBCXX_BUILTINS_LIBRARY}") +else() + add_library_flags_if(LIBCXX_HAS_GCC_S_LIB gcc_s) +endif() add_library_flags_if(LIBCXX_HAVE_CXX_ATOMICS_WITH_LIB atomic) # Add the unwinder library. |
