[compiler-rt] r254966 - [TSan] Enforce TSan runtime doesn't include system headers with --sysroot flag.

[Kuba Brecka via llvm-commits]

> +  message(STATUS "platform: ${_tsan_platform_sources}")
> +  message(STATUS "generic: ${_tsan_generic_sources}”)

Is that intentional?

Kuba

> On 08 Dec 2015, at 00:21, Alexey Samsonov via llvm-commits <llvm-commits at lists.llvm.org> wrote:
> 
> Author: samsonov
> Date: Mon Dec  7 17:21:36 2015
> New Revision: 254966
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=254966&view=rev
> Log:
> [TSan] Enforce TSan runtime doesn't include system headers with --sysroot flag.
> 
> Modified:
>    compiler-rt/trunk/cmake/config-ix.cmake
>    compiler-rt/trunk/lib/tsan/CMakeLists.txt
> 
> Modified: compiler-rt/trunk/cmake/config-ix.cmake
> URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/cmake/config-ix.cmake?rev=254966&r1=254965&r2=254966&view=diff
> ==============================================================================
> --- compiler-rt/trunk/cmake/config-ix.cmake (original)
> +++ compiler-rt/trunk/cmake/config-ix.cmake Mon Dec  7 17:21:36 2015
> @@ -29,6 +29,7 @@ check_cxx_compiler_flag(-ftls-model=init
> check_cxx_compiler_flag(-fno-lto             COMPILER_RT_HAS_FNO_LTO_FLAG)
> check_cxx_compiler_flag(-msse3               COMPILER_RT_HAS_MSSE3_FLAG)
> check_cxx_compiler_flag(-std=c99             COMPILER_RT_HAS_STD_C99_FLAG)
> +check_cxx_compiler_flag(--sysroot=.          COMPILER_RT_HAS_SYSROOT_FLAG)
> 
> if(NOT WIN32 AND NOT CYGWIN)
>   # MinGW warns if -fvisibility-inlines-hidden is used.
> 
> Modified: compiler-rt/trunk/lib/tsan/CMakeLists.txt
> URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/CMakeLists.txt?rev=254966&r1=254965&r2=254966&view=diff
> ==============================================================================
> --- compiler-rt/trunk/lib/tsan/CMakeLists.txt (original)
> +++ compiler-rt/trunk/lib/tsan/CMakeLists.txt Mon Dec  7 17:21:36 2015
> @@ -21,7 +21,6 @@ append_list_if(SANITIZER_LIMIT_FRAME_SIZ
>                TSAN_RTL_CFLAGS)
> append_list_if(COMPILER_RT_HAS_WGLOBAL_CONSTRUCTORS_FLAG -Wglobal-constructors
>                TSAN_RTL_CFLAGS)
> -# FIXME: Add support for --sysroot=. compile flag:
> 
> set(TSAN_SOURCES
>   rtl/tsan_clock.cc
> @@ -187,6 +186,18 @@ endif()
> 
> add_dependencies(compiler-rt tsan)
> 
> +# Make sure that non-platform-specific files don't include any system headers.
> +if(COMPILER_RT_HAS_SYSROOT_FLAG)
> +  file(GLOB _tsan_generic_sources rtl/tsan*)
> +  file(GLOB _tsan_platform_sources rtl/tsan*posix* rtl/tsan*mac*
> +                                   rtl/tsan*linux*)
> +  list(REMOVE_ITEM _tsan_generic_sources ${_tsan_platform_sources})
> +  message(STATUS "platform: ${_tsan_platform_sources}")
> +  message(STATUS "generic: ${_tsan_generic_sources}")
> +  set_source_files_properties(${_tsan_generic_sources}
> +    PROPERTIES COMPILE_FLAGS "--sysroot=.")
> +endif()
> +
> # Build libcxx instrumented with TSan.
> if(COMPILER_RT_HAS_LIBCXX_SOURCES AND
>    COMPILER_RT_TEST_COMPILER_ID STREQUAL "Clang")
> 
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits