summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--compiler-rt/lib/asan/lit_tests/lit.cfg3
-rw-r--r--compiler-rt/lib/lit.common.cfg2
-rw-r--r--compiler-rt/lib/tsan/lit_tests/lit.cfg2
3 files changed, 3 insertions, 4 deletions
diff --git a/compiler-rt/lib/asan/lit_tests/lit.cfg b/compiler-rt/lib/asan/lit_tests/lit.cfg
index 96a8f148869..14ae142a338 100644
--- a/compiler-rt/lib/asan/lit_tests/lit.cfg
+++ b/compiler-rt/lib/asan/lit_tests/lit.cfg
@@ -58,8 +58,7 @@ lit.load_config(config, compiler_rt_lit_cfg)
# Setup default compiler flags used with -faddress-sanitizer option.
# FIXME: Review the set of required flags and check if it can be reduced.
-clang_asan_cxxflags = ("-ccc-clang-cxx "
- + "-ccc-cxx "
+clang_asan_cxxflags = ("-ccc-cxx "
+ "-faddress-sanitizer "
+ "-mno-omit-leaf-frame-pointer "
+ "-fno-omit-frame-pointer "
diff --git a/compiler-rt/lib/lit.common.cfg b/compiler-rt/lib/lit.common.cfg
index 4c148b21e8e..428554ac77a 100644
--- a/compiler-rt/lib/lit.common.cfg
+++ b/compiler-rt/lib/lit.common.cfg
@@ -45,7 +45,7 @@ config.environment['PATH'] = path
# Define %clang and %clangxx substitutions to use in test RUN lines.
config.substitutions.append( ("%clang ", (" " + config.clang + " ")) )
config.substitutions.append( ("%clangxx ", (" " + config.clang +
- " -ccc-clang-cxx -ccc-cxx ")) )
+ " -ccc-cxx ")) )
# Use ugly construction to explicitly prohibit "clang", "clang++" etc.
# in RUN lines.
diff --git a/compiler-rt/lib/tsan/lit_tests/lit.cfg b/compiler-rt/lib/tsan/lit_tests/lit.cfg
index f5e5230efae..acfc74473b3 100644
--- a/compiler-rt/lib/tsan/lit_tests/lit.cfg
+++ b/compiler-rt/lib/tsan/lit_tests/lit.cfg
@@ -69,7 +69,7 @@ clang_tsan_cflags = ("-fthread-sanitizer "
+ "-pie "
+ "-lpthread "
+ "-ldl ")
-clang_tsan_cxxflags = "-ccc-clang-cxx -ccc-cxx " + clang_tsan_cflags
+clang_tsan_cxxflags = "-ccc-cxx " + clang_tsan_cflags
config.substitutions.append( ("%clangxx_tsan ", (" " + config.clang + " " +
clang_tsan_cxxflags + " ")) )
config.substitutions.append( ("%clang_tsan ", (" " + config.clang + " " +
OpenPOWER on IntegriCloud