Author: dim
Date: Tue Feb  5 18:39:32 2019
New Revision: 343798
URL: https://svnweb.freebsd.org/changeset/base/343798

Log:
  Vendor import of compiler-rt release_80 branch r353167:
  https://llvm.org/svn/llvm-project/compiler-rt/branches/release_80@353167

Modified:
  vendor/compiler-rt/dist-release_80/cmake/config-ix.cmake
  vendor/compiler-rt/dist-release_80/lib/xray/tests/CMakeLists.txt
  vendor/compiler-rt/dist-release_80/test/CMakeLists.txt

Modified: vendor/compiler-rt/dist-release_80/cmake/config-ix.cmake
==============================================================================
--- vendor/compiler-rt/dist-release_80/cmake/config-ix.cmake    Tue Feb  5 
18:39:28 2019        (r343797)
+++ vendor/compiler-rt/dist-release_80/cmake/config-ix.cmake    Tue Feb  5 
18:39:32 2019        (r343798)
@@ -118,6 +118,7 @@ check_library_exists(dl dlopen "" COMPILER_RT_HAS_LIBD
 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)

Modified: vendor/compiler-rt/dist-release_80/lib/xray/tests/CMakeLists.txt
==============================================================================
--- vendor/compiler-rt/dist-release_80/lib/xray/tests/CMakeLists.txt    Tue Feb 
 5 18:39:28 2019        (r343797)
+++ vendor/compiler-rt/dist-release_80/lib/xray/tests/CMakeLists.txt    Tue Feb 
 5 18:39:32 2019        (r343798)
@@ -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)

Modified: vendor/compiler-rt/dist-release_80/test/CMakeLists.txt
==============================================================================
--- vendor/compiler-rt/dist-release_80/test/CMakeLists.txt      Tue Feb  5 
18:39:28 2019        (r343797)
+++ vendor/compiler-rt/dist-release_80/test/CMakeLists.txt      Tue Feb  5 
18:39:32 2019        (r343798)
@@ -14,10 +14,6 @@ if(COMPILER_RT_BUILD_PROFILE AND COMPILER_RT_HAS_PROFI
   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)
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to