diff options
| author | Eric Christopher <echristo@gmail.com> | 2012-11-29 18:51:05 +0000 |
|---|---|---|
| committer | Eric Christopher <echristo@gmail.com> | 2012-11-29 18:51:05 +0000 |
| commit | 04997785179cb90afc96b806290d8ecfb6355c84 (patch) | |
| tree | 2af60eac2211fd97e8a6c0767504e2172bdc15d7 /clang/lib/Driver/Tools.cpp | |
| parent | e1e835c62692997091c0cd9531736bdd853ce511 (diff) | |
| download | bcm5719-llvm-04997785179cb90afc96b806290d8ecfb6355c84.tar.gz bcm5719-llvm-04997785179cb90afc96b806290d8ecfb6355c84.zip | |
Make sure that we put the rest of the sanitizer libraries on the link line
before libstdc++ like we do with ubsan.
llvm-svn: 168918
Diffstat (limited to 'clang/lib/Driver/Tools.cpp')
| -rw-r--r-- | clang/lib/Driver/Tools.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index 4d562d3f8bd..f9cb5eff533 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -5423,9 +5423,13 @@ void linuxtools::Link::ConstructJob(Compilation &C, const JobAction &JA, SanitizerArgs Sanitize(D, Args); - // Call this before we add the C++ ABI library. + // Call these before we add the C++ ABI library. if (Sanitize.needsUbsanRt()) addUbsanRTLinux(getToolChain(), Args, CmdArgs); + if (Sanitize.needsAsanRt()) + addAsanRTLinux(getToolChain(), Args, CmdArgs); + if (Sanitize.needsTsanRt()) + addTsanRTLinux(getToolChain(), Args, CmdArgs); if (D.CCCIsCXX && !Args.hasArg(options::OPT_nostdlib) && @@ -5440,12 +5444,6 @@ void linuxtools::Link::ConstructJob(Compilation &C, const JobAction &JA, CmdArgs.push_back("-lm"); } - // Call this before we add the C run-time. - if (Sanitize.needsAsanRt()) - addAsanRTLinux(getToolChain(), Args, CmdArgs); - if (Sanitize.needsTsanRt()) - addTsanRTLinux(getToolChain(), Args, CmdArgs); - if (!Args.hasArg(options::OPT_nostdlib)) { if (!Args.hasArg(options::OPT_nodefaultlibs)) { if (Args.hasArg(options::OPT_static)) |
