maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Tools.cpp: Update getLinuxDynamicLinker() to return Twine instead of StringRef, since r211598 has introduced manipulation of return string. 

llvm-svn: 211663
This commit is contained in:
NAKAMURA Takumi 2014-06-25 04:34:20 +00:00
parent 4669bd49a2
commit 4286651821
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clang/lib/Driver/Tools.cpp
View File

@ -6929,8 +6929,8 @@ static void AddLibgcc(const llvm::Triple &Triple, const Driver &D,
CmdArgs.push_back("-ldl");
}
static StringRef getLinuxDynamicLinker(const ArgList &Args,
const toolchains::Linux &ToolChain) {
static Twine getLinuxDynamicLinker(const ArgList &Args,
const toolchains::Linux &ToolChain) {
if (ToolChain.getTriple().getEnvironment() == llvm::Triple::Android) {
if (ToolChain.getTriple().isArch64Bit())
return "/system/bin/linker64";
@ -6964,7 +6964,7 @@ static StringRef getLinuxDynamicLinker(const ArgList &Args,
return "/lib/ld.so.1";
} else if (ToolChain.getArch() == llvm::Triple::mips64 ||
ToolChain.getArch() == llvm::Triple::mips64el) {
std::string LinkerFile =
Twine LinkerFile =
mips::isNaN2008(Args) ? "ld-linux-mipsn8.so.1" : "ld.so.1";
if (mips::hasMipsAbiArg(Args, "n32"))
return "/lib32/" + LinkerFile;