diff options
| author | Peter Collingbourne <peter@pcc.me.uk> | 2016-09-22 20:51:48 +0000 |
|---|---|---|
| committer | Peter Collingbourne <peter@pcc.me.uk> | 2016-09-22 20:51:48 +0000 |
| commit | 18d49e2643099b77104651e6a2d0ac0f277887c7 (patch) | |
| tree | dbf4690be3ff94bcc80e155f373caaa9bdc369cf | |
| parent | 08cd4cf2f65789d8ccc89be522d249423e9ef3d3 (diff) | |
cfi: Fixes for check-cfi when configured as an external project.
Differential Revision: https://reviews.llvm.org/D24817
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@282189 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | cmake/Modules/CompilerRTUtils.cmake | 2 | ||||
| -rw-r--r-- | cmake/config-ix.cmake | 2 | ||||
| -rw-r--r-- | test/cfi/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | test/lit.common.configured.in | 2 |
4 files changed, 12 insertions, 7 deletions
diff --git a/cmake/Modules/CompilerRTUtils.cmake b/cmake/Modules/CompilerRTUtils.cmake index 3fa50c8ad..ae389ba05 100644 --- a/cmake/Modules/CompilerRTUtils.cmake +++ b/cmake/Modules/CompilerRTUtils.cmake @@ -219,7 +219,7 @@ macro(load_llvm_config) include("${LLVM_CMAKE_PATH}/LLVMConfig.cmake") set(LLVM_LIBRARY_OUTPUT_INTDIR - ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) + ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) endmacro() macro(construct_compiler_rt_default_triple) diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake index 63f81cd30..2cefff577 100644 --- a/cmake/config-ix.cmake +++ b/cmake/config-ix.cmake @@ -400,6 +400,8 @@ else() set(CAN_SYMBOLIZE 1) endif() +find_program(GOLD_EXECUTABLE NAMES ${LLVM_DEFAULT_TARGET_TRIPLE}-ld.gold ld.gold ${LLVM_DEFAULT_TARGET_TRIPLE}-ld ld DOC "The gold linker") + message(STATUS "Compiler-RT supported architectures: ${COMPILER_RT_SUPPORTED_ARCH}") if(ANDROID) diff --git a/test/cfi/CMakeLists.txt b/test/cfi/CMakeLists.txt index 4c4debaf1..bd51eacb6 100644 --- a/test/cfi/CMakeLists.txt +++ b/test/cfi/CMakeLists.txt @@ -11,16 +11,19 @@ configure_lit_site_cfg( ) set(CFI_TEST_DEPS ${SANITIZER_COMMON_LIT_TEST_DEPS}) +list(APPEND CFI_TEST_DEPS + ubsan + stats +) +if(COMPILER_RT_HAS_CFI) + list(APPEND CFI_TEST_DEPS cfi) +endif() + if(NOT COMPILER_RT_STANDALONE_BUILD) list(APPEND CFI_TEST_DEPS opt - ubsan - stats sanstats ) - if(COMPILER_RT_HAS_CFI) - list(APPEND CFI_TEST_DEPS cfi) - endif() if(LLVM_ENABLE_PIC AND LLVM_BINUTILS_INCDIR) list(APPEND CFI_TEST_DEPS LLVMgold diff --git a/test/lit.common.configured.in b/test/lit.common.configured.in index 4472f59dd..862d06bf2 100644 --- a/test/lit.common.configured.in +++ b/test/lit.common.configured.in @@ -17,7 +17,7 @@ set_default("llvm_obj_root", "@LLVM_BINARY_DIR@") set_default("compiler_rt_src_root", "@COMPILER_RT_SOURCE_DIR@") set_default("compiler_rt_obj_root", "@COMPILER_RT_BINARY_DIR@") set_default("llvm_tools_dir", "@LLVM_TOOLS_BINARY_DIR@") -set_default("llvm_shlib_dir", "@SHLIBDIR@") +set_default("llvm_shlib_dir", "@LLVM_LIBRARY_OUTPUT_INTDIR@") set_default("gold_executable", "@GOLD_EXECUTABLE@") set_default("clang", "@COMPILER_RT_TEST_COMPILER@") set_default("compiler_id", "@COMPILER_RT_TEST_COMPILER_ID@") |