Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/compiler-rt-sanitizers/files/7.1.0/, sys-libs/compiler-rt-sanitizers/
Date: Fri, 01 May 2020 08:54:13
Message-Id: 1588323223.c965486e4b3f351349860d6fca55be1e1ee55e00.mgorny@gentoo
1 commit: c965486e4b3f351349860d6fca55be1e1ee55e00
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 1 08:46:47 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri May 1 08:53:43 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c965486e
7
8 sys-libs/compiler-rt-sanitizers: Remove 7*
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-libs/compiler-rt-sanitizers/Manifest | 2 -
13 .../compiler-rt-sanitizers-7.1.0.ebuild | 181 ---------------------
14 ...itizer_common-Fix-using-libtirpc-on-Linux.patch | 67 --------
15 ...0002-test-Support-using-libtirpc-on-Linux.patch | 100 ------------
16 4 files changed, 350 deletions(-)
17
18 diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
19 index b88194d0666..401035f5654 100644
20 --- a/sys-libs/compiler-rt-sanitizers/Manifest
21 +++ b/sys-libs/compiler-rt-sanitizers/Manifest
22 @@ -1,6 +1,4 @@
23 -DIST compiler-rt-7.1.0.src.tar.xz 1864248 BLAKE2B 42ab86416f7f85c5833cf85dbfb66b18a5d5cf53fa0560ad43b2ef39f5a2cd7ec1dbe4192cc8dac9b3f658b828c8306f26745c4d0e8f846d9f550ac22717eb33 SHA512 54d3ad80936f011dbf2ecebba3f1b7d4a156044b178228411ba855be5ec48eb646155b74dea1a96674adab6f93803456ae1435395e3240a4423a3f65f4566b55
24 DIST compiler-rt-8.0.1.src.tar.xz 1954204 BLAKE2B cbba1d5fb37385116920da39dea26739d09e3f11c392503f8bc45293f1ef00c97f6a9fbd3ba67094d7f1e532410d0eca461943dadfdb10646110470a8e3b5f1f SHA512 12bf1bdabe25c0c3a84cc73a718fe154573dd729ec3ff5e099bd5f74c6bec9c80521b87ded646d3b20dfdb9aa51dea0234281418c7eb81805e1dd5d3107d3d8e
25 -DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
26 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
27 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
28 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
29
30 diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-7.1.0.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-7.1.0.ebuild
31 deleted file mode 100644
32 index ca11e3a590b..00000000000
33 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-7.1.0.ebuild
34 +++ /dev/null
35 @@ -1,181 +0,0 @@
36 -# Copyright 1999-2020 Gentoo Authors
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=6
40 -
41 -: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
42 -# (needed due to CMAKE_BUILD_TYPE != Gentoo)
43 -CMAKE_MIN_VERSION=3.7.0-r1
44 -PYTHON_COMPAT=( python2_7 )
45 -
46 -inherit check-reqs cmake-utils flag-o-matic llvm \
47 - multiprocessing python-any-r1
48 -
49 -MY_P=compiler-rt-${PV/_/}.src
50 -LLVM_P=llvm-${PV/_/}.src
51 -
52 -DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
53 -HOMEPAGE="https://llvm.org/"
54 -SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
55 - test? ( https://releases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz )"
56 -
57 -LICENSE="|| ( UoI-NCSA MIT )"
58 -SLOT="${PV%_*}"
59 -KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
60 -IUSE="+clang +libfuzzer +profile +sanitize test +xray elibc_glibc"
61 -# FIXME: libfuzzer does not enable all its necessary dependencies
62 -REQUIRED_USE="libfuzzer? ( || ( sanitize xray ) )"
63 -RESTRICT="!test? ( test ) !clang? ( test )"
64 -
65 -CLANG_SLOT=${SLOT%%.*}
66 -# llvm-6 for new lit options
67 -DEPEND="
68 - >=sys-devel/llvm-6
69 - clang? ( sys-devel/clang )
70 - elibc_glibc? ( net-libs/libtirpc )
71 - test? (
72 - !<sys-apps/sandbox-2.13
73 - $(python_gen_any_dep ">=dev-python/lit-5[\${PYTHON_USEDEP}]")
74 - =sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
75 - sys-libs/compiler-rt:${SLOT} )
76 - ${PYTHON_DEPS}"
77 -
78 -S=${WORKDIR}/${MY_P}
79 -
80 -# least intrusive of all
81 -CMAKE_BUILD_TYPE=RelWithDebInfo
82 -
83 -python_check_deps() {
84 - use test || return 0
85 - has_version "dev-python/lit[${PYTHON_USEDEP}]"
86 -}
87 -
88 -check_space() {
89 - if use test; then
90 - local CHECKREQS_DISK_BUILD=11G
91 - check-reqs_pkg_pretend
92 - fi
93 -}
94 -
95 -pkg_pretend() {
96 - check_space
97 -}
98 -
99 -pkg_setup() {
100 - check_space
101 - llvm_pkg_setup
102 - python-any-r1_pkg_setup
103 -}
104 -
105 -src_unpack() {
106 - einfo "Unpacking ${MY_P}.tar.xz ..."
107 - tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die
108 -
109 - if use test; then
110 - einfo "Unpacking parts of ${LLVM_P}.tar.xz ..."
111 - tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \
112 - "${LLVM_P}"/utils/{lit,unittest} || die
113 - mv "${LLVM_P}" llvm || die
114 - fi
115 -}
116 -
117 -src_prepare() {
118 - cmake-utils_src_prepare
119 -
120 - # apply the fixes for new glibc / split tirpc
121 - eapply "${FILESDIR}/7.1.0/0001-sanitizer_common-Fix-using-libtirpc-on-Linux.patch"
122 - eapply "${FILESDIR}/7.1.0/0002-test-Support-using-libtirpc-on-Linux.patch"
123 -
124 - if use test; then
125 - # remove tests that are (still) broken by new glibc
126 - # https://bugs.llvm.org/show_bug.cgi?id=36065
127 - if use elibc_glibc && has_version '>=sys-libs/glibc-2.25'; then
128 - rm test/lsan/TestCases/Linux/{fork_and_leak,use_tls_dynamic}.cc || die
129 - rm test/msan/dtls_test.c || die
130 - fi
131 - fi
132 -}
133 -
134 -src_configure() {
135 - # pre-set since we need to pass it to cmake
136 - BUILD_DIR=${WORKDIR}/${P}_build
137 -
138 - if use clang; then
139 - local -x CC=${CHOST}-clang
140 - local -x CXX=${CHOST}-clang++
141 - strip-unsupported-flags
142 - fi
143 -
144 - local mycmakeargs=(
145 - -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
146 - # use a build dir structure consistent with install
147 - # this makes it possible to easily deploy test-friendly clang
148 - -DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${SLOT}"
149 -
150 - -DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
151 - # built-ins installed by sys-libs/compiler-rt
152 - -DCOMPILER_RT_BUILD_BUILTINS=OFF
153 - -DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
154 - -DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
155 - -DCOMPILER_RT_BUILD_SANITIZERS=$(usex sanitize)
156 - -DCOMPILER_RT_BUILD_XRAY=$(usex xray)
157 - )
158 - if use test; then
159 - mycmakeargs+=(
160 - -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
161 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
162 - -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
163 -
164 - # they are created during src_test()
165 - -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang"
166 - -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++"
167 - )
168 -
169 - # same flags are passed for build & tests, so we need to strip
170 - # them down to a subset supported by clang
171 - CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \
172 - CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \
173 - strip-unsupported-flags
174 - fi
175 -
176 - if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
177 - mycmakeargs+=(
178 - # disable use of SDK for the system itself
179 - -DDARWIN_macosx_CACHED_SYSROOT=/
180 - )
181 - fi
182 -
183 - cmake-utils_src_configure
184 -
185 - if use test; then
186 - local sys_dir=( "${EPREFIX}"/usr/lib/clang/${SLOT}/lib/* )
187 - [[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
188 - [[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}"
189 -
190 - # copy clang over since resource_dir is located relatively to binary
191 - # therefore, we can put our new libraries in it
192 - mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die
193 - cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \
194 - "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die
195 - cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \
196 - "${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die
197 - cp "${sys_dir}"/*builtins*.a \
198 - "${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die
199 - # we also need LLVMgold.so for gold-based tests
200 - if [[ -f ${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
201 - ln -s "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \
202 - "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ || die
203 - fi
204 - fi
205 -}
206 -
207 -src_test() {
208 - # respect TMPDIR!
209 - local -x LIT_PRESERVES_TMP=1
210 - # disable sandbox to have it stop clobbering LD_PRELOAD
211 - local -x SANDBOX_ON=0
212 - # wipe LD_PRELOAD to make ASAN happy
213 - local -x LD_PRELOAD=
214 -
215 - cmake-utils_src_make check-all
216 -}
217
218 diff --git a/sys-libs/compiler-rt-sanitizers/files/7.1.0/0001-sanitizer_common-Fix-using-libtirpc-on-Linux.patch b/sys-libs/compiler-rt-sanitizers/files/7.1.0/0001-sanitizer_common-Fix-using-libtirpc-on-Linux.patch
219 deleted file mode 100644
220 index ca871c37b99..00000000000
221 --- a/sys-libs/compiler-rt-sanitizers/files/7.1.0/0001-sanitizer_common-Fix-using-libtirpc-on-Linux.patch
222 +++ /dev/null
223 @@ -1,67 +0,0 @@
224 -From e198d21b9a5851dbc061f60911e3b3da910bca0a Mon Sep 17 00:00:00 2001
225 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o>
226 -Date: Wed, 6 Jun 2018 12:16:38 +0200
227 -Subject: [PATCH 7/8] [sanitizer_common] Fix using libtirpc on Linux
228 -
229 -Fix using libtirpc on Linux by using pkg-config to detect it, and append
230 -appropriate include directory. The libtirpc headers reference one
231 -another via '#include <rpc/...>', so attempting to include it via
232 -'#include <tirpc/...>' just failed and resulted in RPC headers not being
233 -detected at all.
234 -
235 -Additionally, perform the header check without -nodefaultlibs as that
236 -apparently causes it to fail.
237 ----
238 - lib/sanitizer_common/CMakeLists.txt | 11 ++++++++++-
239 - .../sanitizer_platform_limits_posix.cc | 4 +---
240 - 2 files changed, 11 insertions(+), 4 deletions(-)
241 -
242 -diff --git a/lib/sanitizer_common/CMakeLists.txt b/lib/sanitizer_common/CMakeLists.txt
243 -index e0226ae49..4071bc0e8 100644
244 ---- a/lib/sanitizer_common/CMakeLists.txt
245 -+++ b/lib/sanitizer_common/CMakeLists.txt
246 -@@ -151,9 +151,18 @@ include_directories(..)
247 -
248 - set(SANITIZER_COMMON_DEFINITIONS)
249 -
250 -+include(FindPkgConfig)
251 -+pkg_check_modules(TIRPC libtirpc)
252 -+if (TIRPC_FOUND)
253 -+ include_directories(${TIRPC_INCLUDE_DIRS})
254 -+ set(CMAKE_REQUIRED_INCLUDES ${TIRPC_INCLUDE_DIRS})
255 -+endif()
256 -+
257 - include(CheckIncludeFile)
258 -+cmake_push_check_state()
259 -+string(REPLACE "-nodefaultlibs" "" CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
260 - append_have_file_definition(rpc/xdr.h HAVE_RPC_XDR_H SANITIZER_COMMON_DEFINITIONS)
261 --append_have_file_definition(tirpc/rpc/xdr.h HAVE_TIRPC_RPC_XDR_H SANITIZER_COMMON_DEFINITIONS)
262 -+cmake_pop_check_state()
263 -
264 - set(SANITIZER_CFLAGS ${SANITIZER_COMMON_CFLAGS})
265 - append_rtti_flag(OFF SANITIZER_CFLAGS)
266 -diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
267 -index feb7bad6f..2e736ee26 100644
268 ---- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
269 -+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
270 -@@ -146,8 +146,6 @@ typedef struct user_fpregs elf_fpregset_t;
271 - #include <netrom/netrom.h>
272 - #if HAVE_RPC_XDR_H
273 - # include <rpc/xdr.h>
274 --#elif HAVE_TIRPC_RPC_XDR_H
275 --# include <tirpc/rpc/xdr.h>
276 - #endif
277 - #include <scsi/scsi.h>
278 - #include <sys/mtio.h>
279 -@@ -1236,7 +1234,7 @@ CHECK_SIZE_AND_OFFSET(group, gr_passwd);
280 - CHECK_SIZE_AND_OFFSET(group, gr_gid);
281 - CHECK_SIZE_AND_OFFSET(group, gr_mem);
282 -
283 --#if HAVE_RPC_XDR_H || HAVE_TIRPC_RPC_XDR_H
284 -+#if HAVE_RPC_XDR_H
285 - CHECK_TYPE_SIZE(XDR);
286 - CHECK_SIZE_AND_OFFSET(XDR, x_op);
287 - CHECK_SIZE_AND_OFFSET(XDR, x_ops);
288 ---
289 -2.18.0
290 -
291
292 diff --git a/sys-libs/compiler-rt-sanitizers/files/7.1.0/0002-test-Support-using-libtirpc-on-Linux.patch b/sys-libs/compiler-rt-sanitizers/files/7.1.0/0002-test-Support-using-libtirpc-on-Linux.patch
293 deleted file mode 100644
294 index 880284775e2..00000000000
295 --- a/sys-libs/compiler-rt-sanitizers/files/7.1.0/0002-test-Support-using-libtirpc-on-Linux.patch
296 +++ /dev/null
297 @@ -1,100 +0,0 @@
298 -From 4fc99ef388e2f110759dc774428fd194b65614c8 Mon Sep 17 00:00:00 2001
299 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o>
300 -Date: Wed, 6 Jun 2018 12:45:55 +0200
301 -Subject: [PATCH 8/8] [test] Support using libtirpc on Linux
302 -
303 -Add compiler flags necessary for using libtirpc on Linux (RPC headers
304 -split out of glibc). The flags are obtained via pkg-config. This fixes
305 -test failures due to tests being unable to find <rpc/...> includes.
306 ----
307 - cmake/base-config-ix.cmake | 4 ++++
308 - lib/sanitizer_common/CMakeLists.txt | 2 --
309 - test/msan/lit.cfg | 3 ++-
310 - test/msan/lit.site.cfg.in | 1 +
311 - test/tsan/lit.cfg | 3 ++-
312 - test/tsan/lit.site.cfg.in | 1 +
313 - 6 files changed, 10 insertions(+), 4 deletions(-)
314 -
315 -diff --git a/cmake/base-config-ix.cmake b/cmake/base-config-ix.cmake
316 -index b208f0852..46b88f72b 100644
317 ---- a/cmake/base-config-ix.cmake
318 -+++ b/cmake/base-config-ix.cmake
319 -@@ -8,6 +8,10 @@ include(CheckCXXSourceCompiles)
320 -
321 - check_include_file(unwind.h HAVE_UNWIND_H)
322 -
323 -+# used in sanitizer_common and tests
324 -+include(FindPkgConfig)
325 -+pkg_check_modules(TIRPC libtirpc)
326 -+
327 - # Top level target used to build all compiler-rt libraries.
328 - add_custom_target(compiler-rt ALL)
329 - add_custom_target(install-compiler-rt)
330 -diff --git a/lib/sanitizer_common/CMakeLists.txt b/lib/sanitizer_common/CMakeLists.txt
331 -index 4071bc0e8..08d1781a6 100644
332 ---- a/lib/sanitizer_common/CMakeLists.txt
333 -+++ b/lib/sanitizer_common/CMakeLists.txt
334 -@@ -151,8 +151,6 @@ include_directories(..)
335 -
336 - set(SANITIZER_COMMON_DEFINITIONS)
337 -
338 --include(FindPkgConfig)
339 --pkg_check_modules(TIRPC libtirpc)
340 - if (TIRPC_FOUND)
341 - include_directories(${TIRPC_INCLUDE_DIRS})
342 - set(CMAKE_REQUIRED_INCLUDES ${TIRPC_INCLUDE_DIRS})
343 -diff --git a/test/msan/lit.cfg b/test/msan/lit.cfg
344 -index cac260999..fe8525047 100644
345 ---- a/test/msan/lit.cfg
346 -+++ b/test/msan/lit.cfg
347 -@@ -14,7 +14,8 @@ clang_msan_cflags = (["-fsanitize=memory",
348 - "-fno-omit-frame-pointer",
349 - "-fno-optimize-sibling-calls"] +
350 - [config.target_cflags] +
351 -- config.debug_info_flags)
352 -+ config.debug_info_flags +
353 -+ [config.rpc_cflags])
354 - # Some Msan tests leverage backtrace() which requires libexecinfo on FreeBSD.
355 - if config.host_os == 'FreeBSD':
356 - clang_msan_cflags += ["-lexecinfo"]
357 -diff --git a/test/msan/lit.site.cfg.in b/test/msan/lit.site.cfg.in
358 -index f744d71fd..35634d324 100644
359 ---- a/test/msan/lit.site.cfg.in
360 -+++ b/test/msan/lit.site.cfg.in
361 -@@ -6,6 +6,7 @@ config.target_cflags = "@MSAN_TEST_TARGET_CFLAGS@"
362 - config.target_arch = "@MSAN_TEST_TARGET_ARCH@"
363 - config.use_lld = @MSAN_TEST_USE_LLD@
364 - config.use_thinlto = @MSAN_TEST_USE_THINLTO@
365 -+config.rpc_cflags = "@TIRPC_CFLAGS@"
366 -
367 - # Load common config for all compiler-rt lit tests.
368 - lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured")
369 -diff --git a/test/tsan/lit.cfg b/test/tsan/lit.cfg
370 -index fdbafefbc..82fd2f79d 100644
371 ---- a/test/tsan/lit.cfg
372 -+++ b/test/tsan/lit.cfg
373 -@@ -49,7 +49,8 @@ clang_tsan_cflags = (["-fsanitize=thread",
374 - [config.target_cflags] +
375 - config.debug_info_flags +
376 - extra_cflags +
377 -- ["-I%s" % tsan_incdir])
378 -+ ["-I%s" % tsan_incdir] +
379 -+ [config.rpc_cflags])
380 - clang_tsan_cxxflags = config.cxx_mode_flags + clang_tsan_cflags + ["-std=c++11"] + ["-I%s" % tsan_incdir]
381 - # Add additional flags if we're using instrumented libc++.
382 - # Instrumented libcxx currently not supported on Darwin.
383 -diff --git a/test/tsan/lit.site.cfg.in b/test/tsan/lit.site.cfg.in
384 -index a215e664a..142d61bf2 100644
385 ---- a/test/tsan/lit.site.cfg.in
386 -+++ b/test/tsan/lit.site.cfg.in
387 -@@ -7,6 +7,7 @@ config.ios = @TSAN_TEST_IOS_PYBOOL@
388 - config.iossim = @TSAN_TEST_IOSSIM_PYBOOL@
389 - config.target_cflags = "@TSAN_TEST_TARGET_CFLAGS@"
390 - config.target_arch = "@TSAN_TEST_TARGET_ARCH@"
391 -+config.rpc_cflags = "@TIRPC_CFLAGS@"
392 -
393 - # Load common config for all compiler-rt lit tests.
394 - lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured")
395 ---
396 -2.18.0
397 -