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

llvm-svn: 250514
This commit is contained in:
Filipe Cabecinhas 2015-10-16 15:07:48 +00:00
parent 17b6f53133
commit 82cd6af690
1 changed files with 4 additions and 2 deletions

View File

@ -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