diff options
Diffstat (limited to 'sys-libs/compiler-rt-sanitizers/files/9999/0002-test-Support-using-libtirpc-on-Linux.patch')
| -rw-r--r-- | sys-libs/compiler-rt-sanitizers/files/9999/0002-test-Support-using-libtirpc-on-Linux.patch | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sys-libs/compiler-rt-sanitizers/files/9999/0002-test-Support-using-libtirpc-on-Linux.patch b/sys-libs/compiler-rt-sanitizers/files/9999/0002-test-Support-using-libtirpc-on-Linux.patch index 880284775e22..c851cae0a6b8 100644 --- a/sys-libs/compiler-rt-sanitizers/files/9999/0002-test-Support-using-libtirpc-on-Linux.patch +++ b/sys-libs/compiler-rt-sanitizers/files/9999/0002-test-Support-using-libtirpc-on-Linux.patch @@ -1,7 +1,7 @@ -From 4fc99ef388e2f110759dc774428fd194b65614c8 Mon Sep 17 00:00:00 2001 +From a415328c75fe88c5e8e3bd0c01913a25b5705fec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> Date: Wed, 6 Jun 2018 12:45:55 +0200 -Subject: [PATCH 8/8] [test] Support using libtirpc on Linux +Subject: [PATCH 2/2] [test] Support using libtirpc on Linux Add compiler flags necessary for using libtirpc on Linux (RPC headers split out of glibc). The flags are obtained via pkg-config. This fixes @@ -16,7 +16,7 @@ test failures due to tests being unable to find <rpc/...> includes. 6 files changed, 10 insertions(+), 4 deletions(-) diff --git a/cmake/base-config-ix.cmake b/cmake/base-config-ix.cmake -index b208f0852..46b88f72b 100644 +index b92e29a2e..ec0b1b979 100644 --- a/cmake/base-config-ix.cmake +++ b/cmake/base-config-ix.cmake @@ -8,6 +8,10 @@ include(CheckCXXSourceCompiles) @@ -31,10 +31,10 @@ index b208f0852..46b88f72b 100644 add_custom_target(compiler-rt ALL) add_custom_target(install-compiler-rt) diff --git a/lib/sanitizer_common/CMakeLists.txt b/lib/sanitizer_common/CMakeLists.txt -index 4071bc0e8..08d1781a6 100644 +index f2a6bab51..a560e7c15 100644 --- a/lib/sanitizer_common/CMakeLists.txt +++ b/lib/sanitizer_common/CMakeLists.txt -@@ -151,8 +151,6 @@ include_directories(..) +@@ -191,8 +191,6 @@ include_directories(..) set(SANITIZER_COMMON_DEFINITIONS) @@ -44,7 +44,7 @@ index 4071bc0e8..08d1781a6 100644 include_directories(${TIRPC_INCLUDE_DIRS}) set(CMAKE_REQUIRED_INCLUDES ${TIRPC_INCLUDE_DIRS}) diff --git a/test/msan/lit.cfg b/test/msan/lit.cfg -index cac260999..fe8525047 100644 +index e08673d5c..e86f6091f 100644 --- a/test/msan/lit.cfg +++ b/test/msan/lit.cfg @@ -14,7 +14,8 @@ clang_msan_cflags = (["-fsanitize=memory", @@ -56,7 +56,7 @@ index cac260999..fe8525047 100644 + [config.rpc_cflags]) # Some Msan tests leverage backtrace() which requires libexecinfo on FreeBSD. if config.host_os == 'FreeBSD': - clang_msan_cflags += ["-lexecinfo"] + clang_msan_cflags += ["-lexecinfo", "-fPIC"] diff --git a/test/msan/lit.site.cfg.in b/test/msan/lit.site.cfg.in index f744d71fd..35634d324 100644 --- a/test/msan/lit.site.cfg.in @@ -70,7 +70,7 @@ index f744d71fd..35634d324 100644 # Load common config for all compiler-rt lit tests. lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured") diff --git a/test/tsan/lit.cfg b/test/tsan/lit.cfg -index fdbafefbc..82fd2f79d 100644 +index 233d273f3..2776775eb 100644 --- a/test/tsan/lit.cfg +++ b/test/tsan/lit.cfg @@ -49,7 +49,8 @@ clang_tsan_cflags = (["-fsanitize=thread", @@ -84,11 +84,11 @@ index fdbafefbc..82fd2f79d 100644 # Add additional flags if we're using instrumented libc++. # Instrumented libcxx currently not supported on Darwin. diff --git a/test/tsan/lit.site.cfg.in b/test/tsan/lit.site.cfg.in -index a215e664a..142d61bf2 100644 +index 6dec5f92b..67020f3b9 100644 --- a/test/tsan/lit.site.cfg.in +++ b/test/tsan/lit.site.cfg.in -@@ -7,6 +7,7 @@ config.ios = @TSAN_TEST_IOS_PYBOOL@ - config.iossim = @TSAN_TEST_IOSSIM_PYBOOL@ +@@ -6,6 +6,7 @@ config.has_libcxx = @TSAN_HAS_LIBCXX@ + config.apple_platform = "@TSAN_TEST_APPLE_PLATFORM@" config.target_cflags = "@TSAN_TEST_TARGET_CFLAGS@" config.target_arch = "@TSAN_TEST_TARGET_ARCH@" +config.rpc_cflags = "@TIRPC_CFLAGS@" @@ -96,5 +96,5 @@ index a215e664a..142d61bf2 100644 # Load common config for all compiler-rt lit tests. lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured") -- -2.18.0 +2.19.1 |