This is an archive of the discontinued LLVM Phabricator instance.

Differential D25740

[tsan] Always use -std=c++11 in TSan tests
ClosedPublic

Authored by kubamracek on Oct 18 2016, 11:12 AM.

Details

Reviewers
kcc
dvyukov
eugenis
Commits
rGefdc36c80202: [tsan] Always use -std=c++11 in TSan tests
rCRT284512: [tsan] Always use -std=c++11 in TSan tests
rL284512: [tsan] Always use -std=c++11 in TSan tests
Summary

We currently only pass -std=c++11 when we have an instrumented libcxx.

Diff Detail

Repository
rL LLVM

Event Timeline

kubamracek updated this revision to Diff 75042.Oct 18 2016, 11:12 AM
kubamracek retitled this revision from to [tsan] Always use -std=c++11 in TSan tests.
kubamracek updated this object.
kubamracek added reviewers: dvyukov, kcc, eugenis.
kubamracek added a project: Restricted Project.
kubamracek added subscribers: llvm-commits, zaks.anna.
dvyukov accepted this revision.Oct 18 2016, 11:15 AM
dvyukov edited edge metadata.
This revision is now accepted and ready to land.Oct 18 2016, 11:15 AM
Closed by commit rL284512: [tsan] Always use -std=c++11 in TSan tests (authored by kuba.brecka). · Explain WhyOct 18 2016, 11:42 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
compiler-rt/
trunk/
test/
tsan/
5 lines

Diff 75052

compiler-rt/trunk/test/tsan/lit.cfg

Show All 38 Lineselse:
extra_cflags = [] extra_cflags = []
# Setup default compiler flags used with -fsanitize=thread option. # Setup default compiler flags used with -fsanitize=thread option.
clang_tsan_cflags = (["-fsanitize=thread", clang_tsan_cflags = (["-fsanitize=thread",
"-Wall"] + "-Wall"] +
[config.target_cflags] + [config.target_cflags] +
config.debug_info_flags + config.debug_info_flags +
extra_cflags) extra_cflags)
clang_tsan_cxxflags = config.cxx_mode_flags + clang_tsan_cflags clang_tsan_cxxflags = config.cxx_mode_flags + clang_tsan_cflags + ["-std=c++11"]
# Add additional flags if we're using instrumented libc++. # Add additional flags if we're using instrumented libc++.
# Instrumented libcxx currently not supported on Darwin. # Instrumented libcxx currently not supported on Darwin.
if config.has_libcxx and config.host_os != 'Darwin': if config.has_libcxx and config.host_os != 'Darwin':
# FIXME: Dehardcode this path somehow. # FIXME: Dehardcode this path somehow.
libcxx_path = os.path.join(config.compiler_rt_obj_root, "lib", libcxx_path = os.path.join(config.compiler_rt_obj_root, "lib",
"tsan", "libcxx_tsan_" + config.target_arch) "tsan", "libcxx_tsan_" + config.target_arch)
libcxx_incdir = os.path.join(libcxx_path, "include", "c++", "v1") libcxx_incdir = os.path.join(libcxx_path, "include", "c++", "v1")
libcxx_libdir = os.path.join(libcxx_path, "lib") libcxx_libdir = os.path.join(libcxx_path, "lib")
libcxx_so = os.path.join(libcxx_libdir, "libc++.so") libcxx_so = os.path.join(libcxx_libdir, "libc++.so")
clang_tsan_cxxflags += ["-std=c++11", clang_tsan_cxxflags += ["-nostdinc++",
"-nostdinc++",
"-I%s" % libcxx_incdir, "-I%s" % libcxx_incdir,
libcxx_so, libcxx_so,
"-Wl,-rpath=%s" % libcxx_libdir] "-Wl,-rpath=%s" % libcxx_libdir]
def build_invocation(compile_flags): def build_invocation(compile_flags):
return " " + " ".join([config.clang] + compile_flags) + " " return " " + " ".join([config.clang] + compile_flags) + " "
config.substitutions.append( ("%clang_tsan ", build_invocation(clang_tsan_cflags)) ) config.substitutions.append( ("%clang_tsan ", build_invocation(clang_tsan_cflags)) )
Show All 18 Lines