diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2019-02-05 18:39:32 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2019-02-05 18:39:32 +0000 |
| commit | 648606c4b555111c26c44a5fb51bc827d8039515 (patch) | |
| tree | b3f3ffb4b543636f596bad8df78a0daa57ce5af0 | |
| parent | 0646903fc1f75f6e605754621119473ee083f4a4 (diff) | |
Vendor import of compiler-rt release_80 branch r353167:vendor/compiler-rt/compiler-rt-release_80-r353167
Notes
Notes:
svn path=/vendor/compiler-rt/dist-release_80/; revision=343798
svn path=/vendor/compiler-rt/compiler-rt-release_80-r353167/; revision=343799; tag=vendor/compiler-rt/compiler-rt-release_80-r353167
| -rw-r--r-- | cmake/config-ix.cmake | 1 | ||||
| -rw-r--r-- | lib/xray/tests/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | test/CMakeLists.txt | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake index db5c4645dc0a..5b9433877178 100644 --- a/cmake/config-ix.cmake +++ b/cmake/config-ix.cmake @@ -118,6 +118,7 @@ check_library_exists(dl dlopen "" COMPILER_RT_HAS_LIBDL) check_library_exists(rt shm_open "" COMPILER_RT_HAS_LIBRT) check_library_exists(m pow "" COMPILER_RT_HAS_LIBM) check_library_exists(pthread pthread_create "" COMPILER_RT_HAS_LIBPTHREAD) +check_library_exists(execinfo backtrace "" COMPILER_RT_HAS_LIBEXECINFO) # Look for terminfo library, used in unittests that depend on LLVMSupport. if(LLVM_ENABLE_TERMINFO) diff --git a/lib/xray/tests/CMakeLists.txt b/lib/xray/tests/CMakeLists.txt index 89a2b3b01ed8..deddc5101e76 100644 --- a/lib/xray/tests/CMakeLists.txt +++ b/lib/xray/tests/CMakeLists.txt @@ -71,13 +71,14 @@ if (NOT APPLE) endforeach() # We also add the actual libraries to link as dependencies. - list(APPEND XRAY_UNITTEST_LINK_FLAGS -lLLVMXRay -lLLVMSupport -lLLVMTestingSupport) + list(APPEND XRAY_UNITTEST_LINK_FLAGS -lLLVMXRay -lLLVMSupport -lLLVMDemangle -lLLVMTestingSupport) endif() append_list_if(COMPILER_RT_HAS_LIBM -lm XRAY_UNITTEST_LINK_FLAGS) append_list_if(COMPILER_RT_HAS_LIBRT -lrt XRAY_UNITTEST_LINK_FLAGS) append_list_if(COMPILER_RT_HAS_LIBDL -ldl XRAY_UNITTEST_LINK_FLAGS) append_list_if(COMPILER_RT_HAS_LIBPTHREAD -pthread XRAY_UNITTEST_LINK_FLAGS) + append_list_if(COMPILER_RT_HAS_LIBEXECINFO -lexecinfo XRAY_UNITTEST_LINK_FLAGS) endif() macro(add_xray_unittest testname) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 2e239d54e29c..7070fb789520 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -14,10 +14,6 @@ if(COMPILER_RT_BUILD_PROFILE AND COMPILER_RT_HAS_PROFILE) list(APPEND SANITIZER_COMMON_LIT_TEST_DEPS profile) endif() -if(COMPILER_RT_STANDALONE_BUILD) - list(APPEND SANITIZER_COMMON_LIT_TEST_DEPS FileCheck) -endif() - # When ANDROID, we build tests with the host compiler (i.e. CMAKE_C_COMPILER), # and run tests with tools from the host toolchain. if(NOT ANDROID) |