summaryrefslogtreecommitdiffstats
path: root/clang/lib/Driver/ToolChains/Fuchsia.cpp
diff options
context:
space:
mode:
authorPetr Hosek <phosek@chromium.org>2018-10-29 20:37:52 +0000
committerPetr Hosek <phosek@chromium.org>2018-10-29 20:37:52 +0000
commit4b9940b50aeba72a351495d8c4550f966a30c587 (patch)
tree941108daed1470a207b9ed38d98fa20181fdf969 /clang/lib/Driver/ToolChains/Fuchsia.cpp
parentd2bfe4b73e1d639e011e38608763d1180a276241 (diff)
downloadbcm5719-llvm-4b9940b50aeba72a351495d8c4550f966a30c587.tar.gz
bcm5719-llvm-4b9940b50aeba72a351495d8c4550f966a30c587.zip
[Driver] Support sanitized libraries on Fuchsia
When using sanitizers, add <resource_dir>/<target>/lib/<sanitizer> to the list of library paths to support using sanitized version of runtime libraries if available. Differential Revision: https://reviews.llvm.org/D53487 llvm-svn: 345537
Diffstat (limited to 'clang/lib/Driver/ToolChains/Fuchsia.cpp')
-rw-r--r--clang/lib/Driver/ToolChains/Fuchsia.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/clang/lib/Driver/ToolChains/Fuchsia.cpp b/clang/lib/Driver/ToolChains/Fuchsia.cpp
index 54c34ff159b..94441fce7cd 100644
--- a/clang/lib/Driver/ToolChains/Fuchsia.cpp
+++ b/clang/lib/Driver/ToolChains/Fuchsia.cpp
@@ -76,10 +76,11 @@ void fuchsia::Linker::ConstructJob(Compilation &C, const JobAction &JA,
else if (Args.hasArg(options::OPT_shared))
CmdArgs.push_back("-shared");
+ const SanitizerArgs &SanArgs = ToolChain.getSanitizerArgs();
+
if (!Args.hasArg(options::OPT_shared)) {
std::string Dyld = D.DyldPrefix;
- if (ToolChain.getSanitizerArgs().needsAsanRt() &&
- ToolChain.getSanitizerArgs().needsSharedRt())
+ if (SanArgs.needsAsanRt() && SanArgs.needsSharedRt())
Dyld += "asan/";
Dyld += "ld.so.1";
CmdArgs.push_back("-dynamic-linker");
@@ -98,6 +99,8 @@ void fuchsia::Linker::ConstructJob(Compilation &C, const JobAction &JA,
Args.AddAllArgs(CmdArgs, options::OPT_L);
Args.AddAllArgs(CmdArgs, options::OPT_u);
+ addSanitizerPathLibArgs(ToolChain, Args, CmdArgs);
+
ToolChain.AddFilePathLibArgs(Args, CmdArgs);
if (D.isUsingLTO()) {
OpenPOWER on IntegriCloud