diff options
| author | Filipe Cabecinhas <me@filcab.net> | 2015-10-16 15:07:48 +0000 |
|---|---|---|
| committer | Filipe Cabecinhas <me@filcab.net> | 2015-10-16 15:07:48 +0000 |
| commit | 82cd6af6906d48cc954e67b698d43c6ce5402959 (patch) | |
| tree | 59c8073ec5a8823328abd3d0f3860bf6f32d0d58 | |
| parent | 17b6f531336f7355640b9d3012bb217c50289294 (diff) | |
| download | bcm5719-llvm-82cd6af6906d48cc954e67b698d43c6ce5402959.tar.gz bcm5719-llvm-82cd6af6906d48cc954e67b698d43c6ce5402959.zip | |
PS4: Make sure to add the sanitizer runtime before any linker input
llvm-svn: 250514
| -rw-r--r-- | clang/lib/Driver/Tools.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index a72e85e4e42..6708f4b48fe 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -10017,6 +10017,8 @@ static void ConstructPS4LinkJob(const Tool &T, Compilation &C, assert(Output.isNothing() && "Invalid output."); } + AddPS4SanitizerArgs(ToolChain, CmdArgs); + Args.AddAllArgs(CmdArgs, options::OPT_L); Args.AddAllArgs(CmdArgs, options::OPT_T_Group); Args.AddAllArgs(CmdArgs, options::OPT_e); @@ -10034,7 +10036,6 @@ static void ConstructPS4LinkJob(const Tool &T, Compilation &C, } AddPS4ProfileRT(ToolChain, Args, CmdArgs); - AddPS4SanitizerArgs(ToolChain, CmdArgs); const char *Exec = Args.MakeArgString(ToolChain.GetProgramPath("ps4-ld")); @@ -10087,6 +10088,8 @@ static void ConstructGoldLinkJob(const Tool &T, Compilation &C, assert(Output.isNothing() && "Invalid output."); } + AddPS4SanitizerArgs(ToolChain, CmdArgs); + if (!Args.hasArg(options::OPT_nostdlib) && !Args.hasArg(options::OPT_nostartfiles)) { const char *crt1 = NULL; @@ -10214,7 +10217,6 @@ static void ConstructGoldLinkJob(const Tool &T, Compilation &C, } AddPS4ProfileRT(ToolChain, Args, CmdArgs); - AddPS4SanitizerArgs(ToolChain, CmdArgs); const char *Exec = #ifdef LLVM_ON_WIN32 |
