mgorny 14/06/14 18:49:46 Modified: clang-3.4-gentoo-install.patch Log: Fix fixing LLVMgold.so plugin path for GNU linker, bug #508838. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.2 sys-devel/llvm/files/clang-3.4-gentoo-install.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/files/clang-3.4-gentoo-install.patch?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/files/clang-3.4-gentoo-install.patch?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/files/clang-3.4-gentoo-install.patch?r1=1.1&r2=1.2 Index: clang-3.4-gentoo-install.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/files/clang-3.4-gentoo-install.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- clang-3.4-gentoo-install.patch 30 Nov 2013 10:33:58 -0000 1.1 +++ clang-3.4-gentoo-install.patch 14 Jun 2014 18:49:46 -0000 1.2 @@ -1,19 +1,19 @@ -From 1a539a8868070e49966c6b5f5e4b9f1257acd7dc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <gen...@mgorny.alt.pl> -Date: Fri, 19 Jul 2013 10:23:57 +0200 -Subject: [PATCH] clang gentoo install +From a12fc090b3b43fe25c7de50c09782611e3834aeb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgo...@gentoo.org> +Date: Sat, 14 Jun 2014 19:35:33 +0200 +Subject: [PATCH] clang gentoo fixes --- - tools/clang/lib/Driver/Tools.cpp | 4 ++-- + tools/clang/lib/Driver/Tools.cpp | 6 +++--- tools/clang/tools/scan-build/scan-build | 4 ++-- tools/clang/tools/scan-view/scan-view | 2 +- - 3 files changed, 5 insertions(+), 5 deletions(-) + 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/clang/lib/Driver/Tools.cpp b/tools/clang/lib/Driver/Tools.cpp -index e014980..6e60513 100644 +index b013eb5..dbbcacb 100644 --- a/tools/clang/lib/Driver/Tools.cpp +++ b/tools/clang/lib/Driver/Tools.cpp -@@ -219,7 +219,7 @@ static void addProfileRT(const ToolChain &TC, const ArgList &Args, +@@ -222,7 +222,7 @@ static void addProfileRT(const ToolChain &TC, const ArgList &Args, // libprofile_rt.so. We used to use the -l:libprofile_rt.a syntax, but that is // not supported by old linkers. std::string ProfileRT = @@ -22,9 +22,18 @@ CmdArgs.push_back(Args.MakeArgString(ProfileRT)); } -@@ -6177,7 +6177,7 @@ void gnutools::Link::ConstructJob(Compilation &C, const JobAction &JA, +@@ -5911,7 +5911,7 @@ void freebsd::Link::ConstructJob(Compilation &C, const JobAction &JA, // forward. - if (D.IsUsingLTO(Args) || Args.hasArg(options::OPT_use_gold_plugin)) { + if (D.IsUsingLTO(Args)) { + CmdArgs.push_back("-plugin"); +- std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so"; ++ std::string Plugin = ToolChain.getDriver().Dir + "/../@libdir@/LLVMgold.so"; + CmdArgs.push_back(Args.MakeArgString(Plugin)); + + // Try to pass driver level flags relevant to LTO code generation down to +@@ -6534,7 +6534,7 @@ void gnutools::Link::ConstructJob(Compilation &C, const JobAction &JA, + // forward. + if (D.IsUsingLTO(Args)) { CmdArgs.push_back("-plugin"); - std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so"; + std::string Plugin = ToolChain.getDriver().Dir + "/../@libdir@/LLVMgold.so"; @@ -32,10 +41,10 @@ // Try to pass driver level flags relevant to LTO code generation down to diff --git a/tools/clang/tools/scan-build/scan-build b/tools/clang/tools/scan-build/scan-build -index 22d5289..dcb4822 100755 +index 0f119f6..58f78d9 100755 --- a/tools/clang/tools/scan-build/scan-build +++ b/tools/clang/tools/scan-build/scan-build -@@ -410,7 +410,7 @@ sub CopyFiles { +@@ -419,7 +419,7 @@ sub CopyFiles { my $Dir = shift; @@ -44,7 +53,7 @@ DieDiag("Cannot find 'sorttable.js'.\n") if (! -r $JS); -@@ -420,7 +420,7 @@ sub CopyFiles { +@@ -429,7 +429,7 @@ sub CopyFiles { DieDiag("Could not copy 'sorttable.js' to '$Dir'.\n") if (! -r "$Dir/sorttable.js"); @@ -67,5 +76,5 @@ print 'Starting scan-view at: http://%s:%d'%(options.host, port) -- -1.8.3.2 +2.0.0
