diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2019-06-11 18:16:59 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2019-06-11 18:16:59 +0000 |
| commit | 90579156da340660a42e22e794a3c03ac1b50112 (patch) | |
| tree | 1483e6ba43e5be0f97505da31a50af0865ee16fe /lib | |
| parent | 70b4e3ee53373a02bcc9f6530a28537b6f2edeac (diff) | |
vendor/compiler-rt/compiler-rt-release_801-r366581vendor/compiler-rt/compiler-rt-release_80-r364487vendor/compiler-rt/compiler-rt-release_80-r363030vendor/compiler-rt-80
Notes
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc | 2 | ||||
| -rw-r--r-- | lib/xray/tests/CMakeLists.txt | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc b/lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc index c112e044b1d8..c32c80b3e48b 100644 --- a/lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc +++ b/lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc @@ -124,7 +124,9 @@ #include <dev/isa/isvio.h> #include <dev/isa/wtreg.h> #include <dev/iscsi/iscsi_ioctl.h> +#if 0 #include <dev/nvmm/nvmm_ioctl.h> +#endif #include <dev/ofw/openfirmio.h> #include <dev/pci/amrio.h> #include <dev/pci/mlyreg.h> diff --git a/lib/xray/tests/CMakeLists.txt b/lib/xray/tests/CMakeLists.txt index deddc5101e76..145852904549 100644 --- a/lib/xray/tests/CMakeLists.txt +++ b/lib/xray/tests/CMakeLists.txt @@ -48,8 +48,7 @@ endfunction() set(XRAY_TEST_ARCH ${XRAY_SUPPORTED_ARCH}) set(XRAY_UNITTEST_LINK_FLAGS - ${CMAKE_THREAD_LIBS_INIT} - -l${SANITIZER_CXX_ABI_LIBRARY}) + ${CMAKE_THREAD_LIBS_INIT}) if (NOT APPLE) # Needed by LLVMSupport. @@ -81,6 +80,8 @@ if (NOT APPLE) append_list_if(COMPILER_RT_HAS_LIBEXECINFO -lexecinfo XRAY_UNITTEST_LINK_FLAGS) endif() +list(APPEND XRAY_UNITTEST_LINK_FLAGS -l${SANITIZER_CXX_ABI_LIBRARY}) + macro(add_xray_unittest testname) cmake_parse_arguments(TEST "" "" "SOURCES;HEADERS" ${ARGN}) if(UNIX AND NOT APPLE) |