commit 82cd6af6906d48cc954e67b698d43c6ce5402959
author Filipe Cabecinhas <me@filcab.net> Fri Oct 16 15:07:48 2015 +0000
committer Filipe Cabecinhas <me@filcab.net> Fri Oct 16 15:07:48 2015 +0000
tree 59c8073ec5a8823328abd3d0f3860bf6f32d0d58
parent 17b6f531336f7355640b9d3012bb217c50289294

PS4: Make sure to add the sanitizer runtime before any linker input

llvm-svn: 250514

clang/lib/Driver/Tools.cpp

diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index a72e85e..6708f4b 100644
--- a/clang/lib/Driver/Tools.cpp
+++ b/clang/lib/Driver/Tools.cpp
@@ -10017,6 +10017,8 @@
     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 @@
   }
 
   AddPS4ProfileRT(ToolChain, Args, CmdArgs);
-  AddPS4SanitizerArgs(ToolChain, CmdArgs);
 
   const char *Exec = Args.MakeArgString(ToolChain.GetProgramPath("ps4-ld"));
 
@@ -10087,6 +10088,8 @@
     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 @@
   }
 
   AddPS4ProfileRT(ToolChain, Args, CmdArgs);
-  AddPS4SanitizerArgs(ToolChain, CmdArgs);
 
   const char *Exec =
 #ifdef LLVM_ON_WIN32