[CMake] Avoid accidental C++ standard library dependency in sanitizers

[phosek]

Summary

While sanitizers don't use C++ standard library, we could still end
up accidentally including or linking it just by the virtue of using
the C++ compiler. Pass -nostdinc++ and -nostdlib++ to avoid these
accidental dependencies.

[smeenai]

LGTM, but I'll give the sanitizer folks a bit of time to review as well.

[smeenai]

This is needed to avoid potential race conditions where some of the C++ headers have been copied but not all of them, and some other runtime that doesn't depend on the C++ headers sees this incomplete state and gets a spurious build failure, so LGTM.

[vitalybuka]

ninja check-tsan

1 error generated.
[18/23] Generating TsanUnitTestsObjects.tsan_clock_test.cpp.x86_64.o
FAILED: projects/compiler-rt/lib/tsan/tests/unit/TsanUnitTestsObjects.tsan_clock_test.cpp.x86_64.o 
cd /usr/local/google/home/vitalybuka/src/llvm.git/out/z/projects/compiler-rt/lib/tsan/tests/unit && /usr/local/google/home/vitalybuka/src/llvm.git/out/z/./bin/clang -fPIC -fno-builtin -fno-exceptions -fomit-frame-pointer -funwind-tables -fno-stack-protector -fno-sanitize=safe-stack -fvisibility=hidden -fno-lto -O3 -gline-tables-only -Wno-gnu -Wno-variadic-macros -Wno-c99-extensions -Wno-non-virtual-dtor -nostdinc++ -fPIE -fno-rtti -Wno-covered-switch-default -DGTEST_NO_LLVM_SUPPORT=1 -DGTEST_HAS_RTTI=0 -I/usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/llvm/utils/unittest/googletest/include -I/usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/llvm/utils/unittest/googletest -I/usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/compiler-rt/include -I/usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/compiler-rt/lib -I/usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/compiler-rt/lib/tsan/rtl -DGTEST_HAS_RTTI=0 -m64 -c -o TsanUnitTestsObjects.tsan_clock_test.cpp.x86_64.o /usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/compiler-rt/lib/tsan/tests/unit/tsan_clock_test.cpp
In file included from /usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/compiler-rt/lib/tsan/tests/unit/tsan_clock_test.cpp:14:
/usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/llvm/utils/unittest/googletest/include/gtest/gtest.h:54:10: fatal error: 'limits' file not found
#include <limits>
         ^~~~~~~~
1 error generated.

[phosek]

In D88922#2331435, @vitalybuka wrote:

ninja check-tsan

1 error generated.
[18/23] Generating TsanUnitTestsObjects.tsan_clock_test.cpp.x86_64.o
FAILED: projects/compiler-rt/lib/tsan/tests/unit/TsanUnitTestsObjects.tsan_clock_test.cpp.x86_64.o 
cd /usr/local/google/home/vitalybuka/src/llvm.git/out/z/projects/compiler-rt/lib/tsan/tests/unit && /usr/local/google/home/vitalybuka/src/llvm.git/out/z/./bin/clang -fPIC -fno-builtin -fno-exceptions -fomit-frame-pointer -funwind-tables -fno-stack-protector -fno-sanitize=safe-stack -fvisibility=hidden -fno-lto -O3 -gline-tables-only -Wno-gnu -Wno-variadic-macros -Wno-c99-extensions -Wno-non-virtual-dtor -nostdinc++ -fPIE -fno-rtti -Wno-covered-switch-default -DGTEST_NO_LLVM_SUPPORT=1 -DGTEST_HAS_RTTI=0 -I/usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/llvm/utils/unittest/googletest/include -I/usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/llvm/utils/unittest/googletest -I/usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/compiler-rt/include -I/usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/compiler-rt/lib -I/usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/compiler-rt/lib/tsan/rtl -DGTEST_HAS_RTTI=0 -m64 -c -o TsanUnitTestsObjects.tsan_clock_test.cpp.x86_64.o /usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/compiler-rt/lib/tsan/tests/unit/tsan_clock_test.cpp
In file included from /usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/compiler-rt/lib/tsan/tests/unit/tsan_clock_test.cpp:14:
/usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/llvm/utils/unittest/googletest/include/gtest/gtest.h:54:10: fatal error: 'limits' file not found
#include <limits>
         ^~~~~~~~
1 error generated.

Reverted, I'll update the change to avoid using -nostdinc++ for tests.

[vitalybuka]

Also android bot is likely will complain. You can reproduce according to:
https://github.com/google/sanitizers/wiki/SanitizerBotReproduceBuild
BUILDBOT_REVISION= BUILDBOT_MONO_REPO_PATH=<my llvm checkout path>/llvm-project BUILDBOT_CLOBBER= zorg/zorg/buildbot/builders/sanitizers/buildbot_android.sh

Or just ping me and I try myself.

[phosek]

In D88922#2331493, @vitalybuka wrote:

Also android bot is likely will complain. You can reproduce according to:
https://github.com/google/sanitizers/wiki/SanitizerBotReproduceBuild
BUILDBOT_REVISION= BUILDBOT_MONO_REPO_PATH=<my llvm checkout path>/llvm-project BUILDBOT_CLOBBER= zorg/zorg/buildbot/builders/sanitizers/buildbot_android.sh

Or just ping me and I try myself.

@vitalybuka I tried it locally but that script failed with CMake Error: The source directory "/src/clang-llvm/llvm_build_android_i686/llvm-project/llvm" does not exist. error, would it be possible to run it on your side?

[smeenai]

compiler-rt/lib/tsan/tests/CMakeLists.txt

17 ↗

(On Diff #298308)

Won't this also need the cxx-headers dep?

[vitalybuka]

In D88922#2331729, @phosek wrote:

In D88922#2331493, @vitalybuka wrote:

Also android bot is likely will complain. You can reproduce according to:
https://github.com/google/sanitizers/wiki/SanitizerBotReproduceBuild
BUILDBOT_REVISION= BUILDBOT_MONO_REPO_PATH=<my llvm checkout path>/llvm-project BUILDBOT_CLOBBER= zorg/zorg/buildbot/builders/sanitizers/buildbot_android.sh

Or just ping me and I try myself.

@vitalybuka I tried it locally but that script failed with CMake Error: The source directory "/src/clang-llvm/llvm_build_android_i686/llvm-project/llvm" does not exist. error, would it be possible to run it on your side?

Probably earier step failed. It does not stop on errors.

I still see errors.
Probably related to compiler-rt/lib/sanitizer_common/tests/CMakeLists.txt:214

[219/440] Building CXX object lib/sanitizer_common/tests/CMakeFiles/SanitizerTest.dir/sanitizer_stacktrace_printer_test.cpp.o
FAILED: lib/sanitizer_common/tests/CMakeFiles/SanitizerTest.dir/sanitizer_stacktrace_printer_test.cpp.o 
/usr/local/google/home/vitalybuka/slow/bbot/llvm_build64/bin/clang++   -I/usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/compiler-rt/lib/sanitizer_common/.. -I/usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/compiler-rt/lib/sanitizer_common/tests/.. -I/usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/compiler-rt/lib/sanitizer_common/tests/../.. --target=i686-linux-android --sysroot=/usr/local/google/home/vitalybuka/slow/bbot/android_ndk/standalone-i686/sysroot -B/usr/local/google/home/vitalybuka/slow/bbot/android_ndk/standalone-i686  -Wall -Werror -std=c++14 -Wno-unused-parameter -O3 -DNDEBUG    -fPIC -fno-builtin -fno-exceptions -fomit-frame-pointer -funwind-tables -fno-stack-protector -fno-sanitize=safe-stack -fvisibility=hidden -fno-lto -O3 -gline-tables-only -Wno-gnu -Wno-variadic-macros -Wno-c99-extensions -Wno-non-virtual-dtor -nostdinc++ --target=i686-linux-android --sysroot=/usr/local/google/home/vitalybuka/slow/bbot/android_ndk/standalone-i686/sysroot -B/usr/local/google/home/vitalybuka/slow/bbot/android_ndk/standalone-i686 -Wno-covered-switch-default -Wno-suggest-override -DGTEST_NO_LLVM_SUPPORT=1 -DGTEST_HAS_RTTI=0 -I/usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/llvm/utils/unittest/googletest/include -I/usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/llvm/utils/unittest/googletest -I/usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/compiler-rt/include -I/usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/compiler-rt/lib -I/usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/compiler-rt/lib/sanitizer_common -fno-rtti -O2 -Werror=sign-compare -Wno-non-virtual-dtor -Wno-gnu-zero-variadic-macro-arguments -gline-tables-only -MD -MT lib/sanitizer_common/tests/CMakeFiles/SanitizerTest.dir/sanitizer_stacktrace_printer_test.cpp.o -MF lib/sanitizer_common/tests/CMakeFiles/SanitizerTest.dir/sanitizer_stacktrace_printer_test.cpp.o.d -o lib/sanitizer_common/tests/CMakeFiles/SanitizerTest.dir/sanitizer_stacktrace_printer_test.cpp.o -c /usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/compiler-rt/lib/sanitizer_common/tests/sanitizer_stacktrace_printer_test.cpp
In file included from /usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/compiler-rt/lib/sanitizer_common/tests/sanitizer_stacktrace_printer_test.cpp:14:
/usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/llvm/utils/unittest/googletest/include/gtest/gtest.h:54:10: fatal error: 'limits' file not found
#include <limits>

[vitalybuka]

this helped to fix sanitizer_common

diff --git a/compiler-rt/lib/sanitizer_common/tests/CMakeLists.txt b/compiler-rt/lib/sanitizer_common/tests/CMakeLists.txt
index 96c845d81cf4..d8cc089c6c25 100644
--- a/compiler-rt/lib/sanitizer_common/tests/CMakeLists.txt
+++ b/compiler-rt/lib/sanitizer_common/tests/CMakeLists.txt
@@ -202,6 +202,12 @@ if(COMPILER_RT_CAN_EXECUTE_TESTS AND NOT ANDROID)
   endforeach()
 endif()
 
+set(SANITIZER_UNITTEST_CFLAGS
+  ${SANITIZER_COMMON_CFLAGS}
+  ${SANITIZER_TEST_CFLAGS_COMMON}
+  -stdlib=libstdc++)
+list_filter(SANITIZER_UNITTEST_CFLAGS "-nostdinc++")
+
 if(ANDROID)
   foreach(arch ${SANITIZER_COMMON_SUPPORTED_ARCH})
     add_executable(SanitizerTest
@@ -211,8 +217,7 @@ if(ANDROID)
       $<TARGET_OBJECTS:RTSanitizerCommonLibc.${arch}>
       $<TARGET_OBJECTS:RTSanitizerCommonSymbolizer.${arch}>)
     set_target_compile_flags(SanitizerTest
-      ${SANITIZER_COMMON_CFLAGS}
-      ${SANITIZER_TEST_CFLAGS_COMMON})
+      ${SANITIZER_UNITTEST_CFLAGS})
     # Setup correct output directory and link flags.
     set_target_properties(SanitizerTest PROPERTIES
       RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})

then libFuzzer fails

FAILED: lib/fuzzer/CMakeFiles/RTfuzzer.i386.dir/FuzzerFork.cpp.o 
/usr/local/google/home/vitalybuka/slow/bbot/llvm_build64/bin/clang++   -I/usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/compiler-rt/lib/fuzzer/../../include --target=i686-linux-android --sysroot=/usr/local/google/home/vitalybuka/slow/bbot/android_ndk/standalone-i686/sysroot -B/usr/local/google/home/vitalybuka/slow/bbot/android_ndk/standalone-i686  -Wall -Werror -std=c++14 -Wno-unused-parameter -O3 -DNDEBUG    -fPIC -fno-builtin -fno-exceptions -fomit-frame-pointer -funwind-tables -fno-stack-protector -fno-sanitize=safe-stack -fvisibility=hidden -fno-lto -O3 -gline-tables-only -Wno-gnu -Wno-variadic-macros -Wno-c99-extensions -Wno-non-virtual-dtor -Dthread_local=__thread -MD -MT lib/fuzzer/CMakeFiles/RTfuzzer.i386.dir/FuzzerFork.cpp.o -MF lib/fuzzer/CMakeFiles/RTfuzzer.i386.dir/FuzzerFork.cpp.o.d -o lib/fuzzer/CMakeFiles/RTfuzzer.i386.dir/FuzzerFork.cpp.o -c /usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/compiler-rt/lib/fuzzer/FuzzerFork.cpp
In file included from /usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/compiler-rt/lib/fuzzer/FuzzerFork.cpp:11:
In file included from /usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/compiler-rt/lib/fuzzer/FuzzerCommand.h:15:
/usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/compiler-rt/lib/fuzzer/FuzzerDefs.h:14:10: fatal error: 'cassert' file not found
#include <cassert>

[phosek]

In D88922#2331869, @vitalybuka wrote:

FAILED: lib/fuzzer/CMakeFiles/RTfuzzer.i386.dir/FuzzerFork.cpp.o 
/usr/local/google/home/vitalybuka/slow/bbot/llvm_build64/bin/clang++   -I/usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/compiler-rt/lib/fuzzer/../../include --target=i686-linux-android --sysroot=/usr/local/google/home/vitalybuka/slow/bbot/android_ndk/standalone-i686/sysroot -B/usr/local/google/home/vitalybuka/slow/bbot/android_ndk/standalone-i686  -Wall -Werror -std=c++14 -Wno-unused-parameter -O3 -DNDEBUG    -fPIC -fno-builtin -fno-exceptions -fomit-frame-pointer -funwind-tables -fno-stack-protector -fno-sanitize=safe-stack -fvisibility=hidden -fno-lto -O3 -gline-tables-only -Wno-gnu -Wno-variadic-macros -Wno-c99-extensions -Wno-non-virtual-dtor -Dthread_local=__thread -MD -MT lib/fuzzer/CMakeFiles/RTfuzzer.i386.dir/FuzzerFork.cpp.o -MF lib/fuzzer/CMakeFiles/RTfuzzer.i386.dir/FuzzerFork.cpp.o.d -o lib/fuzzer/CMakeFiles/RTfuzzer.i386.dir/FuzzerFork.cpp.o -c /usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/compiler-rt/lib/fuzzer/FuzzerFork.cpp
In file included from /usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/compiler-rt/lib/fuzzer/FuzzerFork.cpp:11:
In file included from /usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/compiler-rt/lib/fuzzer/FuzzerCommand.h:15:
/usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/compiler-rt/lib/fuzzer/FuzzerDefs.h:14:10: fatal error: 'cassert' file not found
#include <cassert>

I couldn't reproduce this failure locally. There's also no -nostdinc++ flag being used here so it's not clear to me why this is failing. Do you know if Android provides C++ standard library as part of its sysroot?

[vitalybuka]

In D88922#2334076, @phosek wrote:

In D88922#2331869, @vitalybuka wrote:

FAILED: lib/fuzzer/CMakeFiles/RTfuzzer.i386.dir/FuzzerFork.cpp.o 
/usr/local/google/home/vitalybuka/slow/bbot/llvm_build64/bin/clang++   -I/usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/compiler-rt/lib/fuzzer/../../include --target=i686-linux-android --sysroot=/usr/local/google/home/vitalybuka/slow/bbot/android_ndk/standalone-i686/sysroot -B/usr/local/google/home/vitalybuka/slow/bbot/android_ndk/standalone-i686  -Wall -Werror -std=c++14 -Wno-unused-parameter -O3 -DNDEBUG    -fPIC -fno-builtin -fno-exceptions -fomit-frame-pointer -funwind-tables -fno-stack-protector -fno-sanitize=safe-stack -fvisibility=hidden -fno-lto -O3 -gline-tables-only -Wno-gnu -Wno-variadic-macros -Wno-c99-extensions -Wno-non-virtual-dtor -Dthread_local=__thread -MD -MT lib/fuzzer/CMakeFiles/RTfuzzer.i386.dir/FuzzerFork.cpp.o -MF lib/fuzzer/CMakeFiles/RTfuzzer.i386.dir/FuzzerFork.cpp.o.d -o lib/fuzzer/CMakeFiles/RTfuzzer.i386.dir/FuzzerFork.cpp.o -c /usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/compiler-rt/lib/fuzzer/FuzzerFork.cpp
In file included from /usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/compiler-rt/lib/fuzzer/FuzzerFork.cpp:11:
In file included from /usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/compiler-rt/lib/fuzzer/FuzzerCommand.h:15:
/usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/compiler-rt/lib/fuzzer/FuzzerDefs.h:14:10: fatal error: 'cassert' file not found
#include <cassert>

I couldn't reproduce this failure locally. There's also no -nostdinc++ flag being used here so it's not clear to me why this is failing. Do you know if Android provides C++ standard library as part of its sysroot?

did you try zorg script ?

[phosek]

In D88922#2334106, @vitalybuka wrote:

In D88922#2334076, @phosek wrote:

In D88922#2331869, @vitalybuka wrote:

FAILED: lib/fuzzer/CMakeFiles/RTfuzzer.i386.dir/FuzzerFork.cpp.o 
/usr/local/google/home/vitalybuka/slow/bbot/llvm_build64/bin/clang++   -I/usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/compiler-rt/lib/fuzzer/../../include --target=i686-linux-android --sysroot=/usr/local/google/home/vitalybuka/slow/bbot/android_ndk/standalone-i686/sysroot -B/usr/local/google/home/vitalybuka/slow/bbot/android_ndk/standalone-i686  -Wall -Werror -std=c++14 -Wno-unused-parameter -O3 -DNDEBUG    -fPIC -fno-builtin -fno-exceptions -fomit-frame-pointer -funwind-tables -fno-stack-protector -fno-sanitize=safe-stack -fvisibility=hidden -fno-lto -O3 -gline-tables-only -Wno-gnu -Wno-variadic-macros -Wno-c99-extensions -Wno-non-virtual-dtor -Dthread_local=__thread -MD -MT lib/fuzzer/CMakeFiles/RTfuzzer.i386.dir/FuzzerFork.cpp.o -MF lib/fuzzer/CMakeFiles/RTfuzzer.i386.dir/FuzzerFork.cpp.o.d -o lib/fuzzer/CMakeFiles/RTfuzzer.i386.dir/FuzzerFork.cpp.o -c /usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/compiler-rt/lib/fuzzer/FuzzerFork.cpp
In file included from /usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/compiler-rt/lib/fuzzer/FuzzerFork.cpp:11:
In file included from /usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/compiler-rt/lib/fuzzer/FuzzerCommand.h:15:
/usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/compiler-rt/lib/fuzzer/FuzzerDefs.h:14:10: fatal error: 'cassert' file not found
#include <cassert>

I couldn't reproduce this failure locally. There's also no -nostdinc++ flag being used here so it's not clear to me why this is failing. Do you know if Android provides C++ standard library as part of its sysroot?

did you try zorg script ?

Yes, I have finally managed to get it working. Turned you have to pass all paths as absolute. I think I understand what the problem is now.

[sylvestre.ledru]

I can reproduce the build issue on apt.llvm.org
Full log:
https://llvm-jenkins.debian.net/job/llvm-toolchain-xenial-binaries/architecture=amd64,distribution=xenial/2554/consoleFull

[phosek]

After many experiments, I finally got something that seems to be building with the buildbot_android.sh script.

[vitalybuka]

it fails check-tsan on linux with -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra;compiler-rt;lld;libcxx;libcxxabi"

[23/32] Generating TsanUnitTestsObjects.tsan_clock_test.cpp.x86_64.o
FAILED: projects/compiler-rt/lib/tsan/tests/unit/TsanUnitTestsObjects.tsan_clock_test.cpp.x86_64.o 
cd /usr/local/google/home/vitalybuka/src/llvm.git/out/z/projects/compiler-rt/lib/tsan/tests/unit && /usr/local/google/home/vitalybuka/src/llvm.git/out/z/./bin/clang -fPIC -fno-builtin -fno-exceptions -fomit-frame-pointer -funwind-tables -fno-stack-protector -fno-sanitize=safe-stack -fvisibility=hidden -fno-lto -O3 -gline-tables-only -Wno-gnu -Wno-variadic-macros -Wno-c99-extensions -Wno-non-virtual-dtor -nostdinc++ -fPIE -fno-rtti -Wno-covered-switch-default -DGTEST_NO_LLVM_SUPPORT=1 -DGTEST_HAS_RTTI=0 -I/usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/llvm/utils/unittest/googletest/include -I/usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/llvm/utils/unittest/googletest -I/usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/compiler-rt/include -I/usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/compiler-rt/lib -I/usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/compiler-rt/lib/tsan/rtl -DGTEST_HAS_RTTI=0 -m64 -c -o TsanUnitTestsObjects.tsan_clock_test.cpp.x86_64.o /usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/compiler-rt/lib/tsan/tests/unit/tsan_clock_test.cpp
In file included from /usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/compiler-rt/lib/tsan/tests/unit/tsan_clock_test.cpp:14:
/usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/llvm/utils/unittest/googletest/include/gtest/gtest.h:54:10: fatal error: 'limits' file not found
#include <limits>

and Android script fails to run tests on emulator

******************** TEST 'cfi-standalone-thinlto-newpm-i386 :: vtable-may-alias.cpp' FAILED ********************
Script:
--
: 'RUN: at line 1';     /usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/compiler-rt/test/sanitizer_common/android_commands/android_compile.py  /usr/local/google/home/vitalybuka/slow/bbot/llvm_build64/bin/clang   -pie -fuse-ld=gold --target=i686-linux-android;--sysroot=/usr/local/google/home/vitalybuka/slow/bbot/android_ndk/standalone-i686/sysroot;-B/usr/local/google/home/vitalybuka/slow/bbot/android_ndk/standalone-i686 -fuse-ld=gold -flto=thin -fexperimental-new-pass-manager  -fsanitize=cfi --driver-mode=g++ -stdlib=libstdc++ -fvisibility=hidden -o /usr/local/google/home/vitalybuka/slow/bbot/compiler_rt_build_android_i686/test/cfi/Standalone-thinlto-newpm-i386/Output/vtable-may-alias.cpp.tmp /usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/compiler-rt/test/cfi/vtable-may-alias.cpp
: 'RUN: at line 2';    /usr/local/google/home/vitalybuka/slow/bbot/compiler_rt_build_android_i686/test/cfi/Standalone-thinlto-newpm-i386/Output/vtable-may-alias.cpp.tmp
--
Exit Code: 127

Command Output (stdout):
--
No output file name!

--
Command Output (stderr):
--
/usr/local/google/home/vitalybuka/slow/bbot/compiler_rt_build_android_i686/test/cfi/Standalone-thinlto-newpm-i386/Output/vtable-may-alias.cpp.script: line 1: --sysroot=/usr/local/google/home/vitalybuka/slow/bbot/android_ndk/standalone-i686/sysroot: No such file or directory
/usr/local/google/home/vitalybuka/slow/bbot/compiler_rt_build_android_i686/test/cfi/Standalone-thinlto-newpm-i386/Output/vtable-may-alias.cpp.script: line 1: -B/usr/local/google/home/vitalybuka/slow/bbot/android_ndk/standalone-i686: No such file or directory

Maybe we can try to land obviously safe pieces?

[vitalybuka]

rebase on master

[vitalybuka]

a lot of these, something wrong with regex

: 'RUN: at line 1';     /usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/compiler-rt/test/sanitizer_common/android_commands/android_compile.py  /usr/local/google/home/vitalybuka/slow/bbot/llvm_build64/bin/clang   -pie -fuse-ld=gold --target=i686-linux-android;--sysroot=/usr/local/google/home/vitalybuka/slow/bbot/android_ndk/standalone-i686/sysroot;-B/usr/local/google/home/vitalybuka/slow/bbot/android_ndk/standalone-i686 -fuse-ld=gold -flto=thin -fexperimental-new-pass-manager  -fsanitize=cfi --driver-mode=g++ -stdlib=libstdc++ -fvisibility=hidden -o /usr/local/google/home/vitalybuka/slow/bbot/compiler_rt_build_android_i686/test/cfi/Standalone-thinlto-newpm-i386/Output/vtable-may-alias.cpp.tmp /usr/local/google/home/vitalybuka/src/llvm.git/llvm-project/compiler-rt/test/cfi/vtable-may-alias.cpp
: 'RUN: at line 2';    /usr/local/google/home/vitalybuka/slow/bbot/compiler_rt_build_android_i686/test/cfi/Standalone-thinlto-newpm-i386/Output/vtable-may-alias.cpp.tmp
--
Exit Code: 127

Command Output (stdout):
--
No output file name!

--
Command Output (stderr):
--
/usr/local/google/home/vitalybuka/slow/bbot/compiler_rt_build_android_i686/test/cfi/Standalone-thinlto-newpm-i386/Output/vtable-may-alias.cpp.script: line 1: --sysroot=/usr/local/google/home/vitalybuka/slow/bbot/android_ndk/standalone-i686/sysroot: No such file or directory
/usr/local/google/home/vitalybuka/slow/bbot/compiler_rt_build_android_i686/test/cfi/Standalone-thinlto-newpm-i386/Output/vtable-may-alias.cpp.script: line 1: -B/usr/local/google/home/vitalybuka/slow/bbot/android_ndk/standalone-i686: No such file or directory

[vitalybuka]

rebase

[vitalybuka]

rebase

[vitalybuka]

fix android

[vitalybuka]

compiler-rt/CMakeLists.txt

504

this line converted COMPILER_RT_TEST_COMPILER_CFLAGS into a list which caused problems on android

[phosek]

Thanks a lot for landing this!

compiler-rt/CMakeLists.txt

504

Thanks for catching that.

[mstorsjo]

This still broke building for mingw targets:

../lib/ubsan/ubsan_type_hash_win.cpp:20:10: fatal error: 'typeinfo' file not found
#include <typeinfo>
         ^~~~~~~~~~
1 error generated.

It looks like mingw targets maybe should use the code from ubsan_type_hash_itanium.cpp instead (how do I exercise this bit of ubsan?

But even with that changed, I'm getting this:

lld-link: error: undefined symbol: ___dynamic_cast
lld-link: error: undefined symbol: vtable for __cxxabiv1::__class_type_info
lld-link: error: undefined symbol: vtable for __cxxabiv1::__si_class_type_info

Is this a case where the SO is left with undefined references to those, on ELF platforms? On windows, a DLL can't have undefined references.

[mstorsjo]

In D88922#2366850, @mstorsjo wrote:

But even with that changed, I'm getting this:

lld-link: error: undefined symbol: ___dynamic_cast
lld-link: error: undefined symbol: vtable for __cxxabiv1::__class_type_info
lld-link: error: undefined symbol: vtable for __cxxabiv1::__si_class_type_info

Is this a case where the SO is left with undefined references to those, on ELF platforms? On windows, a DLL can't have undefined references.

Ok, I can fix that by setting SANITIZER_CXX_ABI=libc++ when building, if the ifdefs are changed to use the itanium implementation.

But the base issue remains - ubsan_type_hash_win.cpp can't be built with -nostdinc++ as it includes typeinfo.

[thakis]

As a side effect of this (well, 6db314e86b26741c2e29ce51d88a6a5dca35336c), ninja all after configuring with compiler-rt, clang, and libcxx enabled, the libcxx headers no longer get copied to where clang looks for them, which means clang can't compile programs like #include <string> after this change on macOS.

This mostly worked by accident since the compiler-rt build files had targets that depended on cxx-headers, but it did work for years and it seems like something that should work. I guess the Right Fix is to make the all target depend on cxx-headers. It's not clear to me why it doesn't.

[thakis]

In D88922#2367446, @thakis wrote:

As a side effect of this (well, 6db314e86b26741c2e29ce51d88a6a5dca35336c), ninja all after configuring with compiler-rt, clang, and libcxx enabled, the libcxx headers no longer get copied to where clang looks for them, which means clang can't compile programs like #include <string> after this change on macOS.

This mostly worked by accident since the compiler-rt build files had targets that depended on cxx-headers, but it did work for years and it seems like something that should work. I guess the Right Fix is to make the all target depend on cxx-headers. It's not clear to me why it doesn't.

8954fd436c729796615bac11b3553c4341f01a82 should fix this.

[pjeeva01]

Commit 6db314e86b26741c2e29ce51d88a6a5dca35336c causes following failure:

Generating TsanUnitTestsObjects.tsan_clock_test.cpp.powerpc64le.o
FAILED: compiler-rt/lib/tsan/tests/unit/TsanUnitTestsObjects.tsan_clock_test.cpp.powerpc64le.o
cd …/runtimes/runtimes-bins/compiler-rt/lib/tsan/tests/unit && …/bin/clang -fPIC -fvisibility-inlines-hidden -Werror -Werror=date-time -Werror=unguarded-availability-new -Wall -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wmissing-field-initializers -Wimplicit-fallthrough -Wcovered-switch-default -Wno-noexcept-type -Wnon-virtual-dtor -Wdelete-non-virtual-dtor -Wsuggest-override -Wno-comment -Wstring-conversion -fdiagnostics-color -ffunction-sections -fdata-sections -Wall -Werror -std=c++14 -Wno-unused-parameter -Wno-unknown-warning-option -Wno-covered-switch-default -Wno-suggest-override -DGTEST_NO_LLVM_SUPPORT=1 -DGTEST_HAS_RTTI=0 -I/…/llvm-project/llvm/utils/unittest/googletest/include -I/…/llvm-project/llvm/utils/unittest/googletest -I/…/llvm-project/compiler-rt/include -I/…/llvm-project/compiler-rt/lib -I/…/llvm-project/compiler-rt/lib/tsan/rtl -DGTEST_HAS_RTTI=0 -fno-rtti -m64 -fno-function-sections -c -o TsanUnitTestsObjects.tsan_clock_test.cpp.powerpc64le.o …/llvm-project/compiler-rt/lib/tsan/tests/unit/tsan_clock_test.cpp
In file included from …/llvm-project/compiler-rt/lib/tsan/tests/unit/tsan_clock_test.cpp:13:
In file included from …/llvm-project/compiler-rt/lib/tsan/rtl/tsan_rtl.h:32:
…/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_deadlock_detector_interface.h:63:8: error: '__sanitizer::DDCallback' has virtual functions but non-virtual destructor [-Werror,-Wnon-virtual-dtor]
struct DDCallback {

…/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_deadlock_detector_interface.h:71:8: error: '__sanitizer::DDetector' has virtual functions but non-virtual destructor [-Werror,-Wnon-virtual-dtor]
struct DDetector {

In file included from …/llvm-project/compiler-rt/lib/tsan/tests/unit/tsan_clock_test.cpp:13:
In file included from …/llvm-project/compiler-rt/lib/tsan/rtl/tsan_rtl.h:35:
…/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_thread_registry.h:42:3: error: '__sanitizer::ThreadContextBase' has virtual functions but non-virtual destructor [-Werror,-Wnon-virtual-dtor]

~ThreadContextBase();  // Should never be called.

In file included from …/llvm-project/compiler-rt/lib/tsan/tests/unit/tsan_clock_test.cpp:13:
…/llvm-project/compiler-rt/lib/tsan/rtl/tsan_rtl.h:483:3: error: '__tsan::ThreadContext' has virtual functions but non-virtual destructor [-Werror,-Wnon-virtual-dtor]

~ThreadContext();

4 errors generated.

[vitalybuka]

This should help https://github.com/llvm/llvm-project/commit/8b37a4e6caac61c55bc413ab43c1becf906474d6

In D88922#2369432, @pjeeva01 wrote:

Commit 6db314e86b26741c2e29ce51d88a6a5dca35336c causes following failure:

Generating TsanUnitTestsObjects.tsan_clock_test.cpp.powerpc64le.o
FAILED: compiler-rt/lib/tsan/tests/unit/TsanUnitTestsObjects.tsan_clock_test.cpp.powerpc64le.o
cd …/runtimes/runtimes-bins/compiler-rt/lib/tsan/tests/unit && …/bin/clang -fPIC -fvisibility-inlines-hidden -Werror -Werror=date-time -Werror=unguarded-availability-new -Wall -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wmissing-field-initializers -Wimplicit-fallthrough -Wcovered-switch-default -Wno-noexcept-type -Wnon-virtual-dtor -Wdelete-non-virtual-dtor -Wsuggest-override -Wno-comment -Wstring-conversion -fdiagnostics-color -ffunction-sections -fdata-sections -Wall -Werror -std=c++14 -Wno-unused-parameter -Wno-unknown-warning-option -Wno-covered-switch-default -Wno-suggest-override -DGTEST_NO_LLVM_SUPPORT=1 -DGTEST_HAS_RTTI=0 -I/…/llvm-project/llvm/utils/unittest/googletest/include -I/…/llvm-project/llvm/utils/unittest/googletest -I/…/llvm-project/compiler-rt/include -I/…/llvm-project/compiler-rt/lib -I/…/llvm-project/compiler-rt/lib/tsan/rtl -DGTEST_HAS_RTTI=0 -fno-rtti -m64 -fno-function-sections -c -o TsanUnitTestsObjects.tsan_clock_test.cpp.powerpc64le.o …/llvm-project/compiler-rt/lib/tsan/tests/unit/tsan_clock_test.cpp
In file included from …/llvm-project/compiler-rt/lib/tsan/tests/unit/tsan_clock_test.cpp:13:
In file included from …/llvm-project/compiler-rt/lib/tsan/rtl/tsan_rtl.h:32:
…/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_deadlock_detector_interface.h:63:8: error: '__sanitizer::DDCallback' has virtual functions but non-virtual destructor [-Werror,-Wnon-virtual-dtor]
struct DDCallback {

…/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_deadlock_detector_interface.h:71:8: error: '__sanitizer::DDetector' has virtual functions but non-virtual destructor [-Werror,-Wnon-virtual-dtor]
struct DDetector {

In file included from …/llvm-project/compiler-rt/lib/tsan/tests/unit/tsan_clock_test.cpp:13:
In file included from …/llvm-project/compiler-rt/lib/tsan/rtl/tsan_rtl.h:35:
…/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_thread_registry.h:42:3: error: '__sanitizer::ThreadContextBase' has virtual functions but non-virtual destructor [-Werror,-Wnon-virtual-dtor]

~ThreadContextBase();  // Should never be called.

In file included from …/llvm-project/compiler-rt/lib/tsan/tests/unit/tsan_clock_test.cpp:13:
…/llvm-project/compiler-rt/lib/tsan/rtl/tsan_rtl.h:483:3: error: '__tsan::ThreadContext' has virtual functions but non-virtual destructor [-Werror,-Wnon-virtual-dtor]

~ThreadContext();

4 errors generated.

[mstorsjo]

Any update regarding the fact that it now builds ubsan_type_hash_win.cpp with -nostdinc++, despite the fact that the file does include <typeinfo>?

[phosek]

In D88922#2372946, @mstorsjo wrote:

Any update regarding the fact that it now builds ubsan_type_hash_win.cpp with -nostdinc++, despite the fact that the file does include <typeinfo>?

We currently use just C++ ABI for UBSan but it seems like we really need full C++ library there. So two thing we probably need to do there is to filter out -stdinc++ and -nostdlib++ from flags and require full C++ library in https://github.com/llvm/llvm-project/blob/71e108cd86e70b06c5fa3a63689dcb3555c3d13f/compiler-rt/CMakeLists.txt#L212.

@vitalybuka do you know if anyone uses libcxxabi as SANITIZER_CXX_ABI? Could we remove libcxxabi from the list and rename SANITIZER_CXX_ABI to SANITIZER_CXX_LIBRARY (and potentially even combine it with SANITIZER_TEST_CXX)?

[vitalybuka]

In D88922#2377242, @phosek wrote:

In D88922#2372946, @mstorsjo wrote:

Any update regarding the fact that it now builds ubsan_type_hash_win.cpp with -nostdinc++, despite the fact that the file does include <typeinfo>?

We currently use just C++ ABI for UBSan but it seems like we really need full C++ library there. So two thing we probably need to do there is to filter out -stdinc++ and -nostdlib++ from flags and require full C++ library in https://github.com/llvm/llvm-project/blob/71e108cd86e70b06c5fa3a63689dcb3555c3d13f/compiler-rt/CMakeLists.txt#L212.

@vitalybuka do you know if anyone uses libcxxabi as SANITIZER_CXX_ABI? Could we remove libcxxabi from the list and rename SANITIZER_CXX_ABI to SANITIZER_CXX_LIBRARY (and potentially even combine it with SANITIZER_TEST_CXX)?

@eugenis @oontvoo Android NDK uses SANITIZER_CXX_ABI=libcxxabi, so we are on http://lab.llvm.org:8011/#/builders/77. Builder is easy to change, but not sure who to ask about actual NDK.

[oontvoo]

@eugenis @oontvoo Android NDK uses SANITIZER_CXX_ABI=libcxxabi, so we are on http://lab.llvm.org:8011/#/builders/77. Builder is easy to change, but not sure who to ask about actual NDK.

The NDK build uses it here[0]. I suppose you could send them a patch to add a new defines[SANITIZER_CXX_LIBRARY]

[0] https://android.googlesource.com/toolchain/llvm_android/+/master/builders.py#266

[mstorsjo]

In D88922#2377242, @phosek wrote:

@vitalybuka do you know if anyone uses libcxxabi as SANITIZER_CXX_ABI? Could we remove libcxxabi from the list and rename SANITIZER_CXX_ABI to SANITIZER_CXX_LIBRARY (and potentially even combine it with SANITIZER_TEST_CXX)?

If renaming cmake options, please keep the old name around for at least one major release, for build script compatibility.

[stella.stamenova]

compiler-rt/CMakeLists.txt

458

This does not work correctly when CMAKE_CXX_FLAGS is not set. The solution that other projects use is to quote the property like so:

string(REGEX MATCHALL "-stdlib=[a-zA-Z+]*" stdlib_flag "${CMAKE_CXX_FLAGS}")
string(REGEX REPLACE "-stdlib=[a-zA-Z+]*" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")

I can send a separate review for this if you can't, just let me know.

compiler-rt/CMakeLists.txt

 
 set(SANITIZE_CAN_USE_CXXABI OFF)
 if (cxxabi_supported AND SANITIZER_ALLOW_CXXABI)
   set(SANITIZER_CAN_USE_CXXABI ON)
 endif()
 pythonize_bool(SANITIZER_CAN_USE_CXXABI)
 
 macro(handle_default_cxx_lib var)
-  if (${var} STREQUAL "default")
+  # Specifying -stdlib= in CMAKE_CXX_FLAGS overrides the defaults.
+  if (CMAKE_CXX_FLAGS MATCHES "-stdlib=([a-zA-Z+]*)")
+    set(${var}_LIBNAME "${CMAKE_MATCH_1}")
+    set(${var}_SYSTEM 1)
+  elseif (${var} STREQUAL "default")
     if (APPLE OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
       set(${var}_LIBNAME "libc++")
       set(${var}_SYSTEM 1)
     elseif (FUCHSIA)
       set(${var}_LIBNAME "libc++")
       set(${var}_INTREE 1)
     else()
       set(${var}_LIBNAME "libstdc++")

 
 append_list_if(COMPILER_RT_HAS_LIBC c SANITIZER_COMMON_LINK_LIBS)
 
 if("${CMAKE_SYSTEM_NAME}" STREQUAL "Fuchsia")
   list(APPEND SANITIZER_COMMON_LINK_FLAGS -Wl,-z,defs,-z,now,-z,relro)
   list(APPEND SANITIZER_COMMON_LINK_LIBS zircon)
 endif()
 
+# TODO: COMPILER_RT_COMMON_CFLAGS and COMPILER_RT_COMMON_LINK_FLAGS are
+# intended for use in non-sanitizer runtimes such as libFuzzer, profile or XRay,
+# move these higher to include common flags, then derive SANITIZER_COMMON_CFLAGS
+# and SANITIZER_COMMON_LINK_FLAGS from those and append sanitizer-specific flags.
+set(COMPILER_RT_COMMON_CFLAGS ${SANITIZER_COMMON_CFLAGS})
+set(COMPILER_RT_COMMON_LINK_FLAGS ${SANITIZER_COMMON_LINK_FLAGS})
+
+# We don't use the C++ standard library, so avoid including it by mistake.
+append_list_if(COMPILER_RT_HAS_NOSTDINCXX_FLAG -nostdinc++ SANITIZER_COMMON_CFLAGS)
+append_list_if(COMPILER_RT_HAS_NOSTDLIBXX_FLAG -nostdlib++ SANITIZER_COMMON_LINK_FLAGS)
+
+# Remove -stdlib= which is unused when passing -nostdinc++...
+string(REGEX MATCHALL "-stdlib=[a-zA-Z+]*" stdlib_flag ${CMAKE_CXX_FLAGS})
+string(REGEX REPLACE "-stdlib=[a-zA-Z+]*" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+
+# ...we need it to build some runtimes and tests so readd it where appropriate.
+list(APPEND COMPILER_RT_COMMON_CFLAGS ${stdlib_flag})
+list(APPEND COMPILER_RT_COMMON_LINK_FLAGS ${stdlib_flag})
+
 macro(append_libcxx_libs var)
   if (${var}_INTREE)
     if (SANITIZER_USE_STATIC_LLVM_UNWINDER AND (TARGET unwind_static OR HAVE_LIBUNWIND))
       list(APPEND ${var}_LIBRARIES unwind_static)
     elseif (TARGET unwind_shared OR HAVE_LIBUNWIND)
       list(APPEND ${var}_LIBRARIES unwind_shared)
     endif()
 

 endif()
 
 if (SANITIZER_TEST_CXX_LIBNAME STREQUAL "libc++")
   append_libcxx_libs(SANITIZER_TEST_CXX)
 elseif (SANITIZER_TEST_CXX_LIBNAME STREQUAL "libstdc++")
   append_list_if(COMPILER_RT_HAS_LIBSTDCXX stdc++ SANITIZER_TEST_CXX_LIBRARIES)
 endif()
 
+# TODO: There's a lot of duplication across lib/*/tests/CMakeLists.txt files,
+# move some of the common flags to COMPILER_RT_UNITTEST_CFLAGS.
+
+# Unittests need access to C++ standard library.
+list(APPEND COMPILER_RT_UNITTEST_CFLAGS ${stdlib_flag})
+
+# When cross-compiling, COMPILER_RT_TEST_COMPILER_CFLAGS help in compilation
+# and linking of unittests.
+string(REPLACE " " ";" COMPILER_RT_TEST_COMPILER_CFLAGS "${COMPILER_RT_TEST_COMPILER_CFLAGS}")
+list(APPEND COMPILER_RT_UNITTEST_CFLAGS ${COMPILER_RT_TEST_COMPILER_CFLAGS})
+set(COMPILER_RT_UNITTEST_LINK_FLAGS ${COMPILER_RT_UNITTEST_CFLAGS})
+
+# Unittests support.
+set(COMPILER_RT_GTEST_PATH ${LLVM_MAIN_SRC_DIR}/utils/unittest/googletest)
+set(COMPILER_RT_GTEST_SOURCE ${COMPILER_RT_GTEST_PATH}/src/gtest-all.cc)
+set(COMPILER_RT_GTEST_CFLAGS
+  -DGTEST_NO_LLVM_SUPPORT=1
+  -DGTEST_HAS_RTTI=0
+  -I${COMPILER_RT_GTEST_PATH}/include
+  -I${COMPILER_RT_GTEST_PATH}
+)
+
+# Mocking support.
+set(COMPILER_RT_GMOCK_PATH ${LLVM_MAIN_SRC_DIR}/utils/unittest/googlemock)
+set(COMPILER_RT_GMOCK_SOURCE ${COMPILER_RT_GMOCK_PATH}/src/gmock-all.cc)
+set(COMPILER_RT_GMOCK_CFLAGS
+  -DGTEST_NO_LLVM_SUPPORT=1
+  -DGTEST_HAS_RTTI=0
+  -I${COMPILER_RT_GMOCK_PATH}/include
+  -I${COMPILER_RT_GMOCK_PATH}
+)
+
+append_list_if(COMPILER_RT_DEBUG -DSANITIZER_DEBUG=1 COMPILER_RT_UNITTEST_CFLAGS)
+append_list_if(COMPILER_RT_HAS_WCOVERED_SWITCH_DEFAULT_FLAG -Wno-covered-switch-default COMPILER_RT_UNITTEST_CFLAGS)
+append_list_if(COMPILER_RT_HAS_WSUGGEST_OVERRIDE_FLAG -Wno-suggest-override COMPILER_RT_UNITTEST_CFLAGS)
+
+if(MSVC)
+  # gtest use a lot of stuff marked as deprecated on Windows.
+  list(APPEND COMPILER_RT_GTEST_CFLAGS -Wno-deprecated-declarations)
+endif()
+
 # Warnings to turn off for all libraries, not just sanitizers.
 append_string_if(COMPILER_RT_HAS_WUNUSED_PARAMETER_FLAG -Wno-unused-parameter CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
 
 if (CMAKE_LINKER MATCHES "link.exe$")
   # Silence MSVC linker warnings caused by empty object files. The
   # sanitizer libraries intentionally use ifdefs that result in empty
   # files, rather than skipping these files in the build system.
   # Ideally, we would pass this flag only for the libraries that need

compiler-rt/cmake/Modules/AddCompilerRT.cmake

if(type STREQUAL "SHARED")
       rt_externalize_debuginfo(${libname})
     endif()
   endforeach()
   if(LIB_PARENT_TARGET)
     add_dependencies(${LIB_PARENT_TARGET} ${libnames})
   endif()
 endfunction()
 
-# when cross compiling, COMPILER_RT_TEST_COMPILER_CFLAGS help
-# in compilation and linking of unittests.
-string(REPLACE " " ";" COMPILER_RT_UNITTEST_CFLAGS "${COMPILER_RT_TEST_COMPILER_CFLAGS}")
-set(COMPILER_RT_UNITTEST_LINK_FLAGS ${COMPILER_RT_UNITTEST_CFLAGS})
-
-# Unittests support.
-set(COMPILER_RT_GTEST_PATH ${LLVM_MAIN_SRC_DIR}/utils/unittest/googletest)
-set(COMPILER_RT_GTEST_SOURCE ${COMPILER_RT_GTEST_PATH}/src/gtest-all.cc)
-set(COMPILER_RT_GTEST_CFLAGS
-  -DGTEST_NO_LLVM_SUPPORT=1
-  -DGTEST_HAS_RTTI=0
-  -I${COMPILER_RT_GTEST_PATH}/include
-  -I${COMPILER_RT_GTEST_PATH}
-)
-
-# Mocking support.
-set(COMPILER_RT_GMOCK_PATH ${LLVM_MAIN_SRC_DIR}/utils/unittest/googlemock)
-set(COMPILER_RT_GMOCK_SOURCE ${COMPILER_RT_GMOCK_PATH}/src/gmock-all.cc)
-set(COMPILER_RT_GMOCK_CFLAGS
-  -DGTEST_NO_LLVM_SUPPORT=1
-  -DGTEST_HAS_RTTI=0
-  -I${COMPILER_RT_GMOCK_PATH}/include
-  -I${COMPILER_RT_GMOCK_PATH}
-)
-
-append_list_if(COMPILER_RT_DEBUG -DSANITIZER_DEBUG=1 COMPILER_RT_UNITTEST_CFLAGS)
-append_list_if(COMPILER_RT_HAS_WCOVERED_SWITCH_DEFAULT_FLAG -Wno-covered-switch-default COMPILER_RT_UNITTEST_CFLAGS)
-append_list_if(COMPILER_RT_HAS_WSUGGEST_OVERRIDE_FLAG -Wno-suggest-override COMPILER_RT_UNITTEST_CFLAGS)
-
-if(MSVC)
-  # gtest use a lot of stuff marked as deprecated on Windows.
-  list(APPEND COMPILER_RT_GTEST_CFLAGS -Wno-deprecated-declarations)
-endif()
-
 # Compile and register compiler-rt tests.
 # generate_compiler_rt_tests(<output object files> <test_suite> <test_name>
 #                           <test architecture>
 #                           KIND <custom prefix>
 #                           SUBDIR <subdirectory for testing binary>
 #                           SOURCES <sources to compile>
 #                           RUNTIME <tests runtime to link in>
 #                           CFLAGS <compile-time flags>

compiler-rt/lib/fuzzer/CMakeLists.txt

 
 CHECK_CXX_SOURCE_COMPILES("
   static thread_local int blah;
   int main() {
   return 0;
   }
   " HAS_THREAD_LOCAL)
 
-set(LIBFUZZER_CFLAGS ${SANITIZER_COMMON_CFLAGS})
+set(LIBFUZZER_CFLAGS ${COMPILER_RT_COMMON_CFLAGS})
 
 if(OS_NAME MATCHES "Linux|Fuchsia" AND
    COMPILER_RT_LIBCXX_PATH AND
    COMPILER_RT_LIBCXXABI_PATH)
-  list(APPEND LIBFUZZER_CFLAGS -nostdinc++ -D_LIBCPP_ABI_VERSION=Fuzzer)
-  # Remove -stdlib= which is unused when passing -nostdinc++.
-  string(REGEX REPLACE "-stdlib=[a-zA-Z+]*" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+  list(APPEND LIBFUZZER_CFLAGS -D_LIBCPP_ABI_VERSION=Fuzzer)
+  append_list_if(COMPILER_RT_HAS_NOSTDINCXX_FLAG -nostdinc++ LIBFUZZER_CFLAGS)
 elseif(TARGET cxx-headers OR HAVE_LIBCXX)
   # libFuzzer uses C++ standard library headers.
   set(LIBFUZZER_DEPS cxx-headers)
 endif()
 
 append_list_if(COMPILER_RT_HAS_OMIT_FRAME_POINTER_FLAG -fno-omit-frame-pointer LIBFUZZER_CFLAGS)
 
 if (CMAKE_CXX_FLAGS MATCHES "fsanitize-coverage")

compiler-rt/lib/sanitizer_common/tests/CMakeLists.txt

 if(ANDROID)
   foreach(arch ${SANITIZER_COMMON_SUPPORTED_ARCH})
     add_executable(SanitizerTest
       ${SANITIZER_UNITTESTS}
       ${COMPILER_RT_GTEST_SOURCE}
       $<TARGET_OBJECTS:RTSanitizerCommon.${arch}>
       $<TARGET_OBJECTS:RTSanitizerCommonLibc.${arch}>
       $<TARGET_OBJECTS:RTSanitizerCommonSymbolizer.${arch}>)
-    set_target_compile_flags(SanitizerTest
-      ${SANITIZER_COMMON_CFLAGS}
-      ${SANITIZER_TEST_CFLAGS_COMMON})
+    set_target_compile_flags(SanitizerTest ${SANITIZER_TEST_CFLAGS_COMMON})
     # Setup correct output directory and link flags.
     set_target_properties(SanitizerTest PROPERTIES
       RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
     set_target_link_flags(SanitizerTest ${SANITIZER_TEST_LINK_FLAGS_COMMON})
     target_link_libraries(SanitizerTest ${SANITIZER_TEST_LINK_LIBS})
     # Add unit test to test suite.
     add_dependencies(SanitizerUnitTests SanitizerTest)
   endforeach()
 endif()

compiler-rt/lib/xray/CMakeLists.txt

list(APPEND
     "${CMAKE_CURRENT_SOURCE_DIR}/${src_file}")
 endforeach()
 
 
 # Now put it all together...
 include_directories(..)
 include_directories(../../include)
 
-set(XRAY_CFLAGS ${SANITIZER_COMMON_CFLAGS})
+set(XRAY_CFLAGS ${COMPILER_RT_COMMON_CFLAGS})
 set(XRAY_COMMON_DEFINITIONS XRAY_HAS_EXCEPTIONS=1)
 
 # We don't need RTTI in XRay, so turn that off.
 append_rtti_flag(OFF XRAY_CFLAGS)
 
 append_list_if(
   COMPILER_RT_HAS_XRAY_COMPILER_FLAG XRAY_SUPPORTED=1 XRAY_COMMON_DEFINITIONS)
 append_list_if(