diff options
| author | Vedant Kumar <vsk@apple.com> | 2017-10-07 01:42:09 +0000 |
|---|---|---|
| committer | Vedant Kumar <vsk@apple.com> | 2017-10-07 01:42:09 +0000 |
| commit | 358d642f65243b45eca0ae33d698a0d50b071e59 (patch) | |
| tree | 1e56f1860f6d57cddf00448e5c13ae3ba5d9fc54 /clang/lib/Driver | |
| parent | 8bd0c45c7a90a1322a2fc642fa683ae991ee6987 (diff) | |
| download | bcm5719-llvm-358d642f65243b45eca0ae33d698a0d50b071e59.tar.gz bcm5719-llvm-358d642f65243b45eca0ae33d698a0d50b071e59.zip | |
[Driver] Fix -static-libsan / -shared-libsan on Darwin
Don't ignore these flags on Darwin. The old behavior of using the
dynamic runtime when neither flag is passed is preserved.
llvm-svn: 315142
Diffstat (limited to 'clang/lib/Driver')
| -rw-r--r-- | clang/lib/Driver/SanitizerArgs.cpp | 3 | ||||
| -rw-r--r-- | clang/lib/Driver/ToolChains/Darwin.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/clang/lib/Driver/SanitizerArgs.cpp b/clang/lib/Driver/SanitizerArgs.cpp index ceb5bbad7ef..7e9ee023098 100644 --- a/clang/lib/Driver/SanitizerArgs.cpp +++ b/clang/lib/Driver/SanitizerArgs.cpp @@ -612,7 +612,8 @@ SanitizerArgs::SanitizerArgs(const ToolChain &TC, SharedRuntime = Args.hasFlag(options::OPT_shared_libsan, options::OPT_static_libsan, - TC.getTriple().isAndroid() || TC.getTriple().isOSFuchsia()); + TC.getTriple().isAndroid() || TC.getTriple().isOSFuchsia() || + TC.getTriple().isOSDarwin()); if (AllAddedKinds & Address) { NeedPIE |= TC.getTriple().isAndroid() || TC.getTriple().isOSFuchsia(); diff --git a/clang/lib/Driver/ToolChains/Darwin.cpp b/clang/lib/Driver/ToolChains/Darwin.cpp index 29fae0019ae..78d7bf4b3dc 100644 --- a/clang/lib/Driver/ToolChains/Darwin.cpp +++ b/clang/lib/Driver/ToolChains/Darwin.cpp @@ -1049,7 +1049,8 @@ void DarwinClang::AddLinkRuntimeLibArgs(const ArgList &Args, if (Sanitize.needsUbsanRt()) AddLinkSanitizerLibArgs(Args, CmdArgs, Sanitize.requiresMinimalRuntime() ? "ubsan_minimal" - : "ubsan"); + : "ubsan", + Sanitize.needsSharedRt()); if (Sanitize.needsTsanRt()) AddLinkSanitizerLibArgs(Args, CmdArgs, "tsan"); if (Sanitize.needsFuzzer() && !Args.hasArg(options::OPT_dynamiclib)) { |
