From d22b68a6758c4f29a8e50a7be467374a53c68415 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 9 Dec 2011 23:14:52 +0000 Subject: Fri Dec 9 23:14:52 UTC 2011 --- extra/llvm/enable-lto.patch | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'extra/llvm/enable-lto.patch') diff --git a/extra/llvm/enable-lto.patch b/extra/llvm/enable-lto.patch index 40d93104a..3c8691b17 100644 --- a/extra/llvm/enable-lto.patch +++ b/extra/llvm/enable-lto.patch @@ -2,17 +2,12 @@ Index: lib/Driver/ToolChains.cpp =================================================================== --- lib/Driver/ToolChains.cpp (revision 123373) +++ lib/Driver/ToolChains.cpp (working copy) -@@ -1398,11 +1398,11 @@ - Lib = Lib64; - } +@@ -1398,7 +1398,7 @@ + PPaths.push_back(Twine(GCCInstallation.getParentLibPath() + "/../" + + GCCInstallation.getTriple() + "/bin").str()); -- llvm::sys::Path LinkerPath(Base + "/../../../../" + GccTriple + "/bin/ld"); -+ llvm::sys::Path LinkerPath(Base + "/../../../../" + GccTriple + "/bin/ld.gold"); - if (!llvm::sys::fs::exists(LinkerPath.str(), Exists) && Exists) - Linker = LinkerPath.str(); - else -- Linker = GetProgramPath("ld"); -+ Linker = GetProgramPath("ld.gold"); +- Linker = GetProgramPath("ld"); ++ Linker = GetProgramPath("ld.gold"); LinuxDistro Distro = DetectLinuxDistro(Arch); @@ -27,7 +22,8 @@ Index: lib/Driver/Tools.cpp - if (Args.hasArg(options::OPT_use_gold_plugin)) { + // if (Args.hasArg(options::OPT_use_gold_plugin)) { CmdArgs.push_back("-plugin"); - std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so"; +- std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so"; ++ std::string Plugin = ToolChain.getDriver().Dir + "/../lib/llvm/LLVMgold.so"; CmdArgs.push_back(Args.MakeArgString(Plugin)); - } + // } -- cgit v1.2.3-54-g00ecf