From: Filipe Cabecinhas <me@filcab.net>
Date: Fri, 16 Oct 2015 15:07:48 +0000 (+0000)
Subject: PS4: Make sure to add the sanitizer runtime before any linker input
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=390d9b3e925b9ed385a698f0e09f252b882fa8d0;p=clang

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

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@250514 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index a72e85e4e4..6708f4b48f 100644
--- a/lib/Driver/Tools.cpp
+++ b/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