<div dir="ltr"><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Dec 8, 2015 at 10:03 AM, Alexey Samsonov <span dir="ltr"><<a href="mailto:vonosmas@gmail.com" target="_blank">vonosmas@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div class="gmail_extra"><br><div class="gmail_quote"><span class="">On Tue, Dec 8, 2015 at 5:53 AM, Kuba Brecka <span dir="ltr"><<a href="mailto:jbrecka@apple.com" target="_blank">jbrecka@apple.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span>> +  message(STATUS "platform: ${_tsan_platform_sources}")<br>
> +  message(STATUS "generic: ${_tsan_generic_sources}”)<br>
<br>
</span>Is that intentional?<br></blockquote><div><br></div></span><div>Removed in r255030, sorry about that.</div></div></div></div></blockquote><div><br></div><div>err, 255031.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div class="gmail_extra"><div class="gmail_quote"><div><div class="h5"><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<span><font color="#888888"><br>
Kuba<br>
</font></span><div><div><br>
> On 08 Dec 2015, at 00:21, Alexey Samsonov via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>> wrote:<br>
><br>
> Author: samsonov<br>
> Date: Mon Dec  7 17:21:36 2015<br>
> New Revision: 254966<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=254966&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=254966&view=rev</a><br>
> Log:<br>
> [TSan] Enforce TSan runtime doesn't include system headers with --sysroot flag.<br>
><br>
> Modified:<br>
>    compiler-rt/trunk/cmake/config-ix.cmake<br>
>    compiler-rt/trunk/lib/tsan/CMakeLists.txt<br>
><br>
> Modified: compiler-rt/trunk/cmake/config-ix.cmake<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/cmake/config-ix.cmake?rev=254966&r1=254965&r2=254966&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/cmake/config-ix.cmake?rev=254966&r1=254965&r2=254966&view=diff</a><br>
> ==============================================================================<br>
> --- compiler-rt/trunk/cmake/config-ix.cmake (original)<br>
> +++ compiler-rt/trunk/cmake/config-ix.cmake Mon Dec  7 17:21:36 2015<br>
> @@ -29,6 +29,7 @@ check_cxx_compiler_flag(-ftls-model=init<br>
> check_cxx_compiler_flag(-fno-lto             COMPILER_RT_HAS_FNO_LTO_FLAG)<br>
> check_cxx_compiler_flag(-msse3               COMPILER_RT_HAS_MSSE3_FLAG)<br>
> check_cxx_compiler_flag(-std=c99             COMPILER_RT_HAS_STD_C99_FLAG)<br>
> +check_cxx_compiler_flag(--sysroot=.          COMPILER_RT_HAS_SYSROOT_FLAG)<br>
><br>
> if(NOT WIN32 AND NOT CYGWIN)<br>
>   # MinGW warns if -fvisibility-inlines-hidden is used.<br>
><br>
> Modified: compiler-rt/trunk/lib/tsan/CMakeLists.txt<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/CMakeLists.txt?rev=254966&r1=254965&r2=254966&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/CMakeLists.txt?rev=254966&r1=254965&r2=254966&view=diff</a><br>
> ==============================================================================<br>
> --- compiler-rt/trunk/lib/tsan/CMakeLists.txt (original)<br>
> +++ compiler-rt/trunk/lib/tsan/CMakeLists.txt Mon Dec  7 17:21:36 2015<br>
> @@ -21,7 +21,6 @@ append_list_if(SANITIZER_LIMIT_FRAME_SIZ<br>
>                TSAN_RTL_CFLAGS)<br>
> append_list_if(COMPILER_RT_HAS_WGLOBAL_CONSTRUCTORS_FLAG -Wglobal-constructors<br>
>                TSAN_RTL_CFLAGS)<br>
> -# FIXME: Add support for --sysroot=. compile flag:<br>
><br>
> set(TSAN_SOURCES<br>
>   rtl/tsan_clock.cc<br>
> @@ -187,6 +186,18 @@ endif()<br>
><br>
> add_dependencies(compiler-rt tsan)<br>
><br>
> +# Make sure that non-platform-specific files don't include any system headers.<br>
> +if(COMPILER_RT_HAS_SYSROOT_FLAG)<br>
> +  file(GLOB _tsan_generic_sources rtl/tsan*)<br>
> +  file(GLOB _tsan_platform_sources rtl/tsan*posix* rtl/tsan*mac*<br>
> +                                   rtl/tsan*linux*)<br>
> +  list(REMOVE_ITEM _tsan_generic_sources ${_tsan_platform_sources})<br>
> +  message(STATUS "platform: ${_tsan_platform_sources}")<br>
> +  message(STATUS "generic: ${_tsan_generic_sources}")<br>
> +  set_source_files_properties(${_tsan_generic_sources}<br>
> +    PROPERTIES COMPILE_FLAGS "--sysroot=.")<br>
> +endif()<br>
> +<br>
> # Build libcxx instrumented with TSan.<br>
> if(COMPILER_RT_HAS_LIBCXX_SOURCES AND<br>
>    COMPILER_RT_TEST_COMPILER_ID STREQUAL "Clang")<br>
><br>
><br>
> _______________________________________________<br>
> llvm-commits mailing list<br>
> <a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
> <a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
<br>
</div></div></blockquote></div></div></div><span class="HOEnZb"><font color="#888888"><br><br clear="all"><div><br></div>-- <br><div><div dir="ltr">Alexey Samsonov<br><a href="mailto:vonosmas@gmail.com" target="_blank">vonosmas@gmail.com</a></div></div>
</font></span></div></div>
</blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="gmail_signature"><div dir="ltr">Alexey Samsonov<br><a href="mailto:vonosmas@gmail.com" target="_blank">vonosmas@gmail.com</a></div></div>
</div></div>