Fix TEXTREL on ppc, patch by and thanks to Kimura Masaru <hiyuh.root@gmail.com> in bug #403519

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

4 files changed, 42 insertions, 8 deletions

diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index e97df64053ae..553d8d22c7e1 100644
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/llvm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.65 2012/03/27 08:06:03 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.66 2012/04/13 10:52:10 voyageur Exp $
+
+  13 Apr 2012; Bernard Cafarelli <voyageur@gentoo.org> llvm-3.0-r2.ebuild,
+  +files/llvm-3.0-PPCCompilationCallbackC_static.patch:
+  Fix TEXTREL on ppc, patch by and thanks to Kimura Masaru
+  <hiyuh.root@gmail.com> in bug #403519
 
 *llvm-3.0-r2 (27 Mar 2012)
 
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 07023a302a39..4a69aac637c1 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -7,6 +7,7 @@ AUX llvm-2.8-alignof.patch 2522 RMD160 6a359ba15b1943929541c5e7bbd6a2a6480e85bc
 AUX llvm-2.8-darwin8.patch 576 RMD160 ed1d9c8d9eda3fecf55b7848eee76cdd92a59a13 SHA1 60d0772513d66e7a79d70f0a98f03c67ab1d1d0f SHA256 6db04d9bb5fe65f8a92972988477328a7358e325abca32f30a716ff454d0fe21
 AUX llvm-2.9-Operator.h-c++0x.patch 2062 RMD160 3f137dc80cac2d77b978a332a731e443a15e6a7c SHA1 8bc7357b793cb5cc83e54f056d54d311ec93853d SHA256 1c37346b0f412556dc979fd510585f3e20d2d45319ec095dbdec37a582d590c7
 AUX llvm-2.9-nodoctargz.patch 1569 RMD160 6589aa0a41f47e915ce93fe6dcf68dd601c3bcdc SHA1 19795ec9c34e6ec5539ec6a77944ceb51abdef72 SHA256 62f1b080364d94e528bb34f0063562d16a59395aa7f97277bba88fbd93e00b84
+AUX llvm-3.0-PPCCompilationCallbackC_static.patch 1046 RMD160 8c6fde4d798f1e6a6c356589c2eee793a51f6083 SHA1 4ff7cebce881544d4bbb2c8a891d31a49b5f642a SHA256 f197920fb1ffbebeb2f43689619d637c5102bfc73295a8edb139cca46094ec5b
 AUX llvm-3.0-PPC_macro.patch 1825 RMD160 d991c5c8c05cdc6e4ce6bf4b43059f54822d69b8 SHA1 11a5439873ed00152f2ee2635313aec22ec58452 SHA256 e56947d9744549ef6903238653c6569b5f91a1eb1bd84ec5d69d32ce5b20d6e4
 AUX llvm-3.0-gold_LTO_link.patch 442 RMD160 f480458cc7ef79bbfb948c2f6d2e4122eb55c564 SHA1 a92ac6454a751daf6643c1b402d102ce3c304b73 SHA256 62dc70a1d1f581b7f768ca728dcca688a741e03e64566d5f38e02e33c6372ab8
 AUX llvm-3.0-ocaml_install.patch 664 RMD160 c439931f952e7e053b726435ae0a8e502ebe5080 SHA1 15c8a81baa0e6e78d734f5451b319bf6d896eb2a SHA256 6f451130ed8fcced98691361d33d4d44d8866e703673c293cf7f88af8362e694
@@ -17,14 +18,14 @@ DIST llvm-3.0.tar.gz 10350539 RMD160 85211cafbed1c5d838ac54669017b5298613f975 SH
 EBUILD llvm-2.8-r2.ebuild 6222 RMD160 34c51d4deb8ba605df908542a581099af7043a7f SHA1 c86b4cfe710b65ffedd934096df8394da9a8798f SHA256 4e9fc704a4aa3b1a8e07bf9807f1f3fbdc429d1ab075edf025dd6b96e003d852
 EBUILD llvm-2.9-r2.ebuild 6179 RMD160 47fd4981eb19d1abd644f6a4b268b04f04b1a77c SHA1 03be220126b66435115c9b90606728aca9eebf25 SHA256 3118e5514d5f0adf026e8bab1dd6b13c07702480dd1b475c6861c0696c0f2dd9
 EBUILD llvm-3.0-r1.ebuild 5543 RMD160 860ad59020e55c3445440e1dd893fd41fb6fd515 SHA1 0986229f6c58511557cce95992d0923d53b71ff7 SHA256 c836d9526ba40127a1edcd133b3f406f1e7b6852f860f75884279d593e5d639b
-EBUILD llvm-3.0-r2.ebuild 5587 RMD160 eb1e0f21ff58e56df0d93f4487dbd824f8fb9d6b SHA1 561018833ba7c43aa7fe54742df3d6d5018e3cee SHA256 906bf20fd2c191ef3815d9fa837a886a4058c6285c217cc90871c93ecd4f2e33
+EBUILD llvm-3.0-r2.ebuild 5651 RMD160 017c63a2ff24d529492e6dcb244747d9d763389b SHA1 9b5635e57ad2eda9900329b3823ae7cb56700557 SHA256 80445e7919e7a1cdbf245259d741d12a67db957851d9f5f91476aa95926883ac
 EBUILD llvm-9999.ebuild 5478 RMD160 f407f5954642bbe4b856e5e6f19a72af045005fb SHA1 1d0ff0dba02496539562e49a844b59f32672be49 SHA256 fd16d34a829f7e3afd98aec8837c395d2e3c59bcbe4b85b55a87af29f7fc8868
-MISC ChangeLog 11003 RMD160 fdd6f4d6c36493fea7e3c8d2f0813b5a24d71b59 SHA1 10e4d06dd62f7ddb4dd2fbdd23c274d30421b982 SHA256 e22b4a63b982c0ed078428018b6790459c70f19782de50b4cc76eddfda243694
+MISC ChangeLog 11234 RMD160 cfeb415bf24de7b3df10ec09548aa9bddb424c15 SHA1 ab916370f975f32fa49497912d0a8fe4697508b3 SHA256 6ba9a3cbddecae817b5a387d14b9d7c7f5df8b964cdbff6cbd418b1a575ac204
 MISC metadata.xml 2290 RMD160 3c36b274b863158d4a53be2c99ea5f42ede2bb80 SHA1 d608d42b2a831a4b9025fa1d2fd68fb11996293b SHA256 fd3cd6846072dbcacb0a3461a3d1a47bb09b858562df26fb9fc0769f0a292bf4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk9xdPgACgkQFYEBGcdFJfI77QD/XJlo60wrD2RGKeL/TFfRPibZ
-fjMvm8OJ5+8HEFWCsVcBAICr0nsaRO4gD+ks9aT5E6b9Yx0fG7kMWaCYEcr0jBZ/
-=sSE2
+iF4EAREIAAYFAk+IBWUACgkQFYEBGcdFJfKdbAD6ArIsxHOS1wcuKcXDg83YCSom
+68uCElU0H1R/qbUI9a4BAIp1tnWSg2VuwhKtcu61eUe1IIVK4IzU9GaeCWDCDWhB
+=2X5H
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/llvm/files/llvm-3.0-PPCCompilationCallbackC_static.patch b/sys-devel/llvm/files/llvm-3.0-PPCCompilationCallbackC_static.patch
new file mode 100644
index 000000000000..04e40245c671
--- /dev/null
+++ b/sys-devel/llvm/files/llvm-3.0-PPCCompilationCallbackC_static.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/show_bug.cgi?id=403519
+http://llvm.org/viewvc/llvm-project?view=rev&revision=153938
+
+--- llvm/trunk/lib/Target/PowerPC/PPCJITInfo.cpp	2011/06/15 15:29:47	133059
++++ llvm/trunk/lib/Target/PowerPC/PPCJITInfo.cpp	2012/04/03 06:59:28	153938
+@@ -291,9 +291,10 @@
+ }
+ #endif
+ 
+-extern "C" void *PPCCompilationCallbackC(unsigned *StubCallAddrPlus4,
+-                                         unsigned *OrigCallAddrPlus4,
+-                                         bool is64Bit) {
++extern "C" {
++static void* LLVM_ATTRIBUTE_USED PPCCompilationCallbackC(unsigned *StubCallAddrPlus4,
++                                                         unsigned *OrigCallAddrPlus4,
++                                                         bool is64Bit) {
+   // Adjust the pointer to the address of the call instruction in the stub
+   // emitted by emitFunctionStub, rather than the instruction after it.
+   unsigned *StubCallAddr = StubCallAddrPlus4 - 1;
+@@ -337,6 +338,7 @@
+   // stack after we restore all regs.
+   return Target;
+ }
++}
+ 
+ 
+ 
diff --git a/sys-devel/llvm/llvm-3.0-r2.ebuild b/sys-devel/llvm/llvm-3.0-r2.ebuild
index 4af0b33980c7..86e940e520c9 100644
--- a/sys-devel/llvm/llvm-3.0-r2.ebuild
+++ b/sys-devel/llvm/llvm-3.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.0-r2.ebuild,v 1.1 2012/03/27 08:06:03 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.0-r2.ebuild,v 1.2 2012/04/13 10:52:10 voyageur Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -94,6 +94,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.9-nodoctargz.patch
 	epatch "${FILESDIR}"/${P}-ocaml_install.patch
 	epatch "${FILESDIR}"/${P}-PPC_macro.patch
+	epatch "${FILESDIR}"/${P}-PPCCompilationCallbackC_static.patch
 	epatch "${FILESDIR}"/${P}-gold_LTO_link.patch
 	epatch "${FILESDIR}"/${P}-set_soname.patch
 }