Fix compilation with USE=debug and VIDEO_CARDS=radeon, thanks klondike in bug #474096

Package-Manager: portage-2.2.0_alpha184/cvs/Linux x86_64
Manifest-Sign-Key: 0xC74525F2

4 files changed, 36 insertions, 7 deletions

diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index 12043b1e1c18..3cb30ff525e3 100644
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/llvm
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.114 2013/06/22 22:57:49 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.115 2013/06/24 14:43:00 voyageur Exp $
+
+  24 Jun 2013; Bernard Cafarelli <voyageur@gentoo.org> llvm-3.3.ebuild,
+  +files/llvm-3.3-R600_debug.patch:
+  Fix compilation with USE=debug and VIDEO_CARDS=radeon, thanks klondike in bug
+  #474096
 
   22 Jun 2013; Bernard Cafarelli <voyageur@gentoo.org> llvm-3.3.ebuild,
   llvm-9999.ebuild:
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 9f68793fb744..5536c99cf9ba 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -19,6 +19,7 @@ AUX llvm-3.1-ExecutionEngine_tests_xfail_arm.patch 1357 SHA256 392a5e752623a9e01
 AUX llvm-3.1-fix_debug_line_info.patch 2620 SHA256 db1f1aadebbc4c4232bdad49fb9b7dc61eac727085c63154b870fa9ce64fd18d SHA512 0b8bdde081dc7eddcc3556a0220f0a47565c6b95afb31560a835abe630d641c43e3acd0f0d0ba177809495f3208c17aa1a0fd267da3a34d71039c846b03253e8 WHIRLPOOL 47decb374e7109cee7eca7ccfcae5a2bd01a837d9daf6d201f20eb0d2ded14a66e737532c033ca128b049557cd0977dee811a4c54c15036e050d7383c586b5bd
 AUX llvm-3.1-ivybridge_support.patch 405 SHA256 cc91a69be3d0f7f216a4d0484284fd054d4b0273f1c4dda7afcc005564867725 SHA512 7ec84a127eda4cbec0aaeb1e34f0606ff76e070bf1f3eb71334219b6a2e21299f30f157d022952e6f23c5e4180903239f5a4323f214041decd4ccc21f1a285d7 WHIRLPOOL 443c57305f1c9676e7191042c0ab7491a2a789433e32b5cc12050cece38eebe9ae62fd1d54200fbc32d2c7d22aedc7f6776fd250ae53e7d2afad0a325c1ba919
 AUX llvm-3.2-nodoctargz.patch 1761 SHA256 e17494aef638d2fe3fb0b669516ffcc9e560161903e1e165de0eecba684c8c1b SHA512 d12a8996d8a1160f7bad4ce3b3a9ddfb2d29d91fc160876c145f9241927b0cf4413f3b29bc2bf291f0421f61a512de8057e8f3d0029a8a09ba3f1d93582723b5 WHIRLPOOL be273271db8293829a63120cfc917711c99d8893cae6f95af2583def735131f629ee67b5a1515df007477f34abeaf5f2729d689eefdc61eb3aae6b1959971507
+AUX llvm-3.3-R600_debug.patch 909 SHA256 84ebe63a557e3734dc8ed4545f098e2496d815e6bf4a99dfcb65d649a23d2c1b SHA512 cd1b92c713edf895ab7a15494c6092e44082b40b9bb5b0fdfdc438e919456c7fcafab9a840adb165c191454948c0b42bc78ce2b4d2cfbdf371917b16351c6928 WHIRLPOOL 0f08c58c78c1d04b8e701b0b817956a37271115c1fc83ea8f0f54bf965fbc659e418abf7f429c2a29581351050346cb783f0aa9147757d4cfdfa24fd8b28d09e
 DIST llvm-2.8-r1.tgz 9112527 SHA256 25addb742f1c6cc12877ed0ee924dda962d848368ee095be8e48342ae613d43b SHA512 8688d5cf415e8aef74cca6a14587af36234a6347e2238ac2c0d66805c42926b9399f36390e1a58a4081e902b0904adb818c1a360d5df572dfa893d6f79f5e35a WHIRLPOOL 0da9250e31242b55586c9138089e742aab5d414d5f3412ebf917ae8b9506f984c6134a932be93ec7e4c01c79f6c21d508cb0b2e0ec283419bd4ae4db745430ae
 DIST llvm-2.9.tgz 9574781 SHA256 661236cfa17428b48cfa9cbb9909f7569c64b8ecd219fd91dbc00e3b557b3779 SHA512 9cb0fa0bb8ac02661fd6f926001a15e0ad4a9660683421dc86b03f1cf5184142c5815f9f9283ee7cdf8d474e01177f83406122253342e0e95ddc878821660070 WHIRLPOOL f7b445b6b5d455f29ca68c342511b8b5e6eedec525af1cc60440c4de544df2332aa241bffca29eda5d2428a3f518e093a626bd45c7f8a9e0656d0f68aef5d9d1
 DIST llvm-3.0.tar.gz 10350539 SHA256 519eb11d3499ce99c6ffdb8718651fc91425ed7690eac91c8d6853474f7c0477 SHA512 602bb5590b70cb9138bc19d8c630c62bbabdcb2132215c921fe4bce4e3f74dfc66440b9dcd458ff55a86047cc9cc0417c6563715c133e0db222e4b88f07c13bb WHIRLPOOL 6f4ece3ec747352cd78b08d25c5b1cda91140eb6957d509161e45395e47c074f8d2102bfcaeabcdef8c1f6672f2cf06d88e290667666122da029391b3528d440
@@ -32,14 +33,14 @@ EBUILD llvm-2.9-r2.ebuild 6380 SHA256 e95d4d6c0fefb602a04197b10d31fff3c4ef997ff7
 EBUILD llvm-3.0-r2.ebuild 5767 SHA256 62fca1169c63516f29102a3a1bb4ea74408dfd151d97a9edbfb165a2def317c3 SHA512 f7ee2bbf8b31d86c11ab07f530278e3240ec21f3c58144a9e627aef3c1fb7690935786f33368a6f56062b5daf501adebfc164fd6712985a91076897b89cdd85f WHIRLPOOL be1a6edd697e2504df033705c2cb8e37f6c17a13d77558d231172c00f91ec247785469b6e1265e25c42eb3f6f394614cf516e0e422cb54094d9ba25669c8406c
 EBUILD llvm-3.1-r2.ebuild 6033 SHA256 9b9a587d30419fa646764a96e12fc6272f73f7246138c76ba577f0d6ab3afe59 SHA512 8b969084210af4203c029bb33d5b984e0b17f6770fd489dad818154ac9f6a87bfad069eff71776f678d9eb5d5136af472d3008d5bc73fab9dc1f36811af906c4 WHIRLPOOL 928459551d7cf6e8d18244026ba82cc3dbaf2b65bd6eac8adb617695c95535ba65bd013909730d5922de5764e9d6c6c4cf007aa6acd0b493826aa938d0389a5d
 EBUILD llvm-3.2.ebuild 6534 SHA256 5532d849a32e9f7a02f6bf6d16b01cc734132fdc9a192c46ec0e25cd8b3da7cf SHA512 bc8d3a7726a7cefc1de40e3e1be0bc06d89bdad9b3462e6ad1ef96f6d850fef3e708ebef3af20fc05a66b55f2837601ccff15b528bc088c8ceb715ed12212b25 WHIRLPOOL 5105558b2422e1d01d5aab4a52a8b434f357d481156d3885375987e9b34b001b427403407349ea82511a4230dcdfad60b08a30a20b6dc5ce4839ceb035e1163a
-EBUILD llvm-3.3.ebuild 6697 SHA256 275cd33974ffa54568c3b4c5c7da8c5bce03bd8f7d77a7898e8f4b5af3ed01a8 SHA512 cc9193c6ee1502dc232e309288339816d1df113b80bb66e69c7ebec2a5652482361c24be49318eeda6bd9fed7cd5575159807e738c6155e6f1fe25242c754ef9 WHIRLPOOL 9891f479c3a1d8e7ce14caa6120975f20be8b66697d6aa330ebd82c228d311655ebdd03d64edc33a042e2b783cec7f7148bc2ea41625d722529549f2aa476773
+EBUILD llvm-3.3.ebuild 6741 SHA256 e1f89537832dfd507c15880aee4e50ff5ac9163b2e0318783efd9470f83cab5e SHA512 bdf380643739a73fccae18abda3268912d8639b1dcf06f2c62e2832026ef82183fc736e7bdeb6582934b852ab70def1ce1b649d0128b9a680fd971db822b53fa WHIRLPOOL aad005b5d0c5f117b23cb9e365f967f928c09a75c58992dbd04b6545e9ce9020f2187fbc3071b2acf85f8e5a4092ef0fd75a34008228ca4d7441b638b4ce0cb4
 EBUILD llvm-9999.ebuild 6403 SHA256 0bf8cf6152efca605f4dae6d2ff8dd50741a4b982df3a6a5dd983eb2084aea81 SHA512 522af6dc0e657f7a3b7b53662c540a1618e229f30f47169542675a26bea9024da234eb6b265d93cd68bc3ecb95b5c2d16997d83faf8a55d2514a99a62ab021c9 WHIRLPOOL 0b59232b99db28eb39e5bfcf00447dcc8213247691ed7942648c3bbfd1ca091c98d8f9c1b5b06dd04aefcd6612fe03c38d30fc1df2c5d84ab85c0afa0554da8f
-MISC ChangeLog 18927 SHA256 326bbe4915de70752ef64cc0a2b3750dc313fcd5882490cb8f4647662679e65b SHA512 218e7cdc65178490000247ebc6ce90701e1c6c0d7edb419a8e506a7237b3ec365999cb8602b40de6f1ee59c9c1f10be09c42740f8adee6359dd59c61bdd3c568 WHIRLPOOL a2bc36cf3e398992de21c003661d66387df202c7dccabe69d28fe1fb9678f11c51c6b698a87c7b1dec68196a5c24b933e1947920f76aa2b9c37ac021c4cb5411
+MISC ChangeLog 19126 SHA256 f01fe4c4183b4a91b567341cc4258232c6555d6a7924e9194d7f46a77e475357 SHA512 d0cea5de1193aeec32b80f708e16da9c0aece78710e8042692af69c7e42bfcc6fa3dffe59578e11665edce8d2c2ed2499732037ac2a5fe31b43650954602f118 WHIRLPOOL e0dc717dc73ad79d9916bede92453d5ebe2d1c5c2dd916e5dca4b733c0fab96a6cd35837d97c43902ec11e46dcdc79e6d6874f9da0b99587ca24ce6ea6b77350
 MISC metadata.xml 2480 SHA256 7900bb9405502b6fca3ddf84e4927a9353d2f70fa7be4a32b674cad604e01c24 SHA512 42093ff40389c310ca3e316d8ea63d751e530f7af4efa7820f14a8979d337dcedaa61ef35f2e8dc226d7c55177c70e0bb8512e434e8d4b1c050aefd2914dcb02 WHIRLPOOL 695127371c9fa28f1b44517d8b6b123e1479048578adb84673f41b1a1fa5bdb7a3d424635ace6f08ad41eda1207a6d46ebe03f4b1be604adf2947af155bef3bd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlHGK/IACgkQFYEBGcdFJfJ0JQD/REoTkjSvVF5orv6ikKSVPDSw
-AjbNxNm+kOCxDQ7Va28BAKtPPh34FGpF+rUU8obR5k+J+bWhkgQTBZSJA1LkisCO
-=bFSx
+iF4EAREIAAYFAlHIWvwACgkQFYEBGcdFJfKPLQD+PHVy9ihOiQVMkb3Bm/rTSHd3
+F6FKFDhirt2F8pI2+XAA/138gT1ivIFEZjAZ+f+r3falIPxi9MlpY9S/Vr7lobhB
+=qwQx
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/llvm/files/llvm-3.3-R600_debug.patch b/sys-devel/llvm/files/llvm-3.3-R600_debug.patch
new file mode 100644
index 000000000000..b104273fb43c
--- /dev/null
+++ b/sys-devel/llvm/files/llvm-3.3-R600_debug.patch
@@ -0,0 +1,22 @@
+Fixes compilation of llvm-3.3 on gcc-4.6 and 4.7 when VIDEO_CARDS=radeon
+
+This issue is caused because although Q is a multiset the original code tries to get
+a set iterator which can't be converted in a multiset one.
+
+The fix is as simple as just using a multiset iterator.
+
+Patch by Francisco Blas Izquierdo Riera (klondike)
+Consider the changes in the Public Domain
+https://bugs.gentoo.org/show_bug.cgi?id=474096
+
+--- lib/Target/R600/R600MachineScheduler.cpp
++++ lib/Target/R600/R600MachineScheduler.cpp
+@@ -290,7 +290,7 @@
+ SUnit *R600SchedStrategy::PopInst(std::multiset<SUnit *, CompareSUnit> &Q) {
+   if (Q.empty())
+     return NULL;
+-  for (std::set<SUnit *, CompareSUnit>::iterator It = Q.begin(), E = Q.end();
++  for (std::multiset<SUnit *, CompareSUnit>::iterator It = Q.begin(), E = Q.end();
+       It != E; ++It) {
+     SUnit *SU = *It;
+     InstructionsGroupCandidate.push_back(SU->getInstr());
diff --git a/sys-devel/llvm/llvm-3.3.ebuild b/sys-devel/llvm/llvm-3.3.ebuild
index c1d014eef10c..adcae05f1dc9 100644
--- a/sys-devel/llvm/llvm-3.3.ebuild
+++ b/sys-devel/llvm/llvm-3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.3.ebuild,v 1.2 2013/06/22 22:57:49 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.3.ebuild,v 1.3 2013/06/24 14:43:00 voyageur Exp $
 
 EAPI=5
 
@@ -102,6 +102,7 @@ src_prepare() {
 		|| die "FileCheck Makefile sed failed"
 
 	epatch "${FILESDIR}"/${PN}-3.2-nodoctargz.patch
+	epatch "${FILESDIR}"/${P}-R600_debug.patch
 
 	# User patches
 	epatch_user