summaryrefslogtreecommitdiff
path: root/test/tsan/lit.cfg
diff options
context:
space:
mode:
Diffstat (limited to 'test/tsan/lit.cfg')
-rw-r--r--test/tsan/lit.cfg12
1 files changed, 7 insertions, 5 deletions
diff --git a/test/tsan/lit.cfg b/test/tsan/lit.cfg
index 2be10dae1..d141fc228 100644
--- a/test/tsan/lit.cfg
+++ b/test/tsan/lit.cfg
@@ -12,7 +12,7 @@ def get_required_attr(config, attr_name):
return attr_value
# Setup config name.
-config.name = 'ThreadSanitizer'
+config.name = 'ThreadSanitizer' + config.name_suffix
# Setup source root.
config.test_source_root = os.path.dirname(__file__)
@@ -39,16 +39,18 @@ else:
extra_cflags = []
# Setup default compiler flags used with -fsanitize=thread option.
-clang_tsan_cflags = ["-fsanitize=thread",
- "-Wall",
- "-m64"] + config.debug_info_flags + extra_cflags
+clang_tsan_cflags = (["-fsanitize=thread",
+ "-Wall"] +
+ [config.target_cflags] +
+ config.debug_info_flags +
+ extra_cflags)
clang_tsan_cxxflags = config.cxx_mode_flags + clang_tsan_cflags
# Add additional flags if we're using instrumented libc++.
# Instrumented libcxx currently not supported on Darwin.
if config.has_libcxx and config.host_os != 'Darwin':
# FIXME: Dehardcode this path somehow.
libcxx_path = os.path.join(config.compiler_rt_obj_root, "lib",
- "tsan", "libcxx_tsan")
+ "tsan", "libcxx_tsan_" + config.arch)
libcxx_incdir = os.path.join(libcxx_path, "include", "c++", "v1")
libcxx_libdir = os.path.join(libcxx_path, "lib")
libcxx_so = os.path.join(libcxx_libdir, "libc++.so")