Also apply llvm r600 patches, should fix bug #427206

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

8 files changed, 126 insertions, 9 deletions

diff --git a/sys-devel/clang/ChangeLog b/sys-devel/clang/ChangeLog
index 6fbd36f7b4ca..ed27df84ebe1 100644
--- a/sys-devel/clang/ChangeLog
+++ b/sys-devel/clang/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for sys-devel/clang
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.76 2012/08/05 14:07:08 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.77 2012/08/30 09:41:16 voyageur Exp $
+
+  30 Aug 2012; Bernard Cafarelli <voyageur@gentoo.org>
+  -files/cl-patches/0001-Add-r600-TargetInfo.patch,
+  +files/cl-patches/clang-0001-Add-r600-TargetInfo.patch,
+  -files/cl-patches/0002-r600-Add-some-target-builtins.patch,
+  +files/cl-patches/llvm-0001-r600-Add-some-intrinsic-definitions.patch,
+  +files/cl-patches/llvm-0002-r600-Add-get_global_size-and-get_local_size-intri
+  nsi.patch, +files/cl-patches/clang-0002-r600-Add-some-target-builtins.patch,
+  +files/cl-patches/clang-0003-r600-Add-read_global_size-and-read_local_size-bu
+  ilti.patch, clang-3.1-r5.ebuild,
+  -files/cl-patches/0003-r600-Add-read_global_size-and-read_local_size-builti.p
+  atch:
+  Also apply llvm r600 patches, should fix bug #427206
 
   05 Aug 2012; Richard Yao <ryao@gentoo.org> clang-3.1-r4.ebuild:
   Keyword ~x64-freebsd
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 7b9ae35077e0..95438b17f12f 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -1,6 +1,11 @@
-AUX cl-patches/0001-Add-r600-TargetInfo.patch 2801 SHA256 619a510c819ee4033e00ce4e42ab9f73409346edc3bba6243c3d0868face826c SHA512 41159ce46525878fbead0a64582fd522d5643c4ce9841f7a1259d6fcee2c0382babf8f734bf47c0c32c8d9e54633c8e2d3eef67b85426ac4f873d47fd8dd6ac1 WHIRLPOOL 074aae16c6e23f7db036a3e13f4c8ba976d0f27adae2e05c957a10d1931098d04f766a0ac35bf1589541e710acd18370bdee18205f612fd7da4aab926e306ace
-AUX cl-patches/0002-r600-Add-some-target-builtins.patch 3535 SHA256 620411208e4609ac2b77412f31774b2d6fb7403b0d8fccd250a4d613cfc1a5ca SHA512 872156d6e4721b01aef05ac4c829f5635abd205c5f05dc66f20a9e59e7f8165464c55f730a0890af5220b917bc8ebede58e63ca401165e6cef77a8c2d0fd40ab WHIRLPOOL 8bd671a6cca645bae6d9888345319ed3f5476991716f0cf909435d988ed4c6db4b06d8b8e93e07baffe83b741fc58ea4dc67aac7203e7d4e2d71e71190e05cd7
-AUX cl-patches/0003-r600-Add-read_global_size-and-read_local_size-builti.patch 1132 SHA256 cf9888b9bd13e5daff6c2806c4324c99a20c3ce16570e7e0d6776baeb512bc2c SHA512 cff65845acedd72c2066e568bdf7da9a5b2e5d98737b8bb99be1b2dceefd096470e17b86ee04795339ab7cebbc72ea54c465a9a3640d2daafce9ddad1d5444e7 WHIRLPOOL 054b159e7e4d07acfea74ff8b1f79acf1b29de300903d4ae69a0f9ce5ad77495ce772a5bd1ce244badd8fe3502b1e6f833353478ee68252bf616fc81d251a8a7
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX cl-patches/clang-0001-Add-r600-TargetInfo.patch 2801 SHA256 619a510c819ee4033e00ce4e42ab9f73409346edc3bba6243c3d0868face826c SHA512 41159ce46525878fbead0a64582fd522d5643c4ce9841f7a1259d6fcee2c0382babf8f734bf47c0c32c8d9e54633c8e2d3eef67b85426ac4f873d47fd8dd6ac1 WHIRLPOOL 074aae16c6e23f7db036a3e13f4c8ba976d0f27adae2e05c957a10d1931098d04f766a0ac35bf1589541e710acd18370bdee18205f612fd7da4aab926e306ace
+AUX cl-patches/clang-0002-r600-Add-some-target-builtins.patch 3535 SHA256 620411208e4609ac2b77412f31774b2d6fb7403b0d8fccd250a4d613cfc1a5ca SHA512 872156d6e4721b01aef05ac4c829f5635abd205c5f05dc66f20a9e59e7f8165464c55f730a0890af5220b917bc8ebede58e63ca401165e6cef77a8c2d0fd40ab WHIRLPOOL 8bd671a6cca645bae6d9888345319ed3f5476991716f0cf909435d988ed4c6db4b06d8b8e93e07baffe83b741fc58ea4dc67aac7203e7d4e2d71e71190e05cd7
+AUX cl-patches/clang-0003-r600-Add-read_global_size-and-read_local_size-builti.patch 1132 SHA256 cf9888b9bd13e5daff6c2806c4324c99a20c3ce16570e7e0d6776baeb512bc2c SHA512 cff65845acedd72c2066e568bdf7da9a5b2e5d98737b8bb99be1b2dceefd096470e17b86ee04795339ab7cebbc72ea54c465a9a3640d2daafce9ddad1d5444e7 WHIRLPOOL 054b159e7e4d07acfea74ff8b1f79acf1b29de300903d4ae69a0f9ce5ad77495ce772a5bd1ce244badd8fe3502b1e6f833353478ee68252bf616fc81d251a8a7
+AUX cl-patches/llvm-0001-r600-Add-some-intrinsic-definitions.patch 2450 SHA256 b0a718800c8969e174f3a22e61c15a370376f477e031fe97fff6aaab152f9867 SHA512 d23f9645d3e3364b1e9ce522eb15022fd3f2a685741db88b117b409ee33a07344a8e9ba9d89dc3535e5289edf79c6beb7ff144659f4e725b1a8f2c4256f9aad0 WHIRLPOOL c549806dbe5309dc441b65c942de488c6afc8c511d060d5c1459a4f99b97a357acbec51ce51bd704e5e1e74437cd413755f15377ad6b96c235242bc370af096f
+AUX cl-patches/llvm-0002-r600-Add-get_global_size-and-get_local_size-intrinsi.patch 1189 SHA256 172bbb3cb1214e61ee2684c133317bb997e94a34c91dae94d4848cbd0c216436 SHA512 cf711149c421b4258bc64b81018d0a9474d8b4e4128d0cc0cea788b54c93e9512397b2310db8a1834c3507b4d893d5743dbc53183ac0daca23da55601b976c16 WHIRLPOOL 8e6bd9f005a6a941c55d7c8d9b127826191944fab9e404f8ed958efd07017f5f9301273739f869a73f15fc2a79af9dc18687ff85403acf24e175a464838b3f2e
 AUX clang-2.7-fixdoc.patch 1977 SHA256 36c2214e575ed3fd78938279739e82c4f750f8726f8387e1414c18532501314a SHA512 598c793bd817cfdd32499fd94bf5628683fa037ec54174cac5896528c40601addd8e4d8d0bbe13820aa5df6158151f648fcb0ede826058e75c19174466ee85ae WHIRLPOOL 765493b0630a552d51e202e3d062ffa5972babde0762610c3881daf106603d3f75c8aa52106c70bac257656b908913cb3f5d26468593046ae50541f5ff5912f4
 AUX clang-2.8-alignof.patch 11984 SHA256 2c1d648c64cc6582a00b0adbc5c65e3ac89a1bb1816e0691902866730a332fa2 SHA512 9e92ac4767f6b3cb06d90a4e0609a679737c3e17f615002f301a82e1857c94097647aa74fe61b09576fc925cc165155de6f257bed73ee5f54fdf670506067be5 WHIRLPOOL 4a5174228d495190730d4d06838913f41777fde2b2a98a82ab04ee3916f771e9cca41b0af7577784b918e7d696299958c6181fbf5a5601cf932520a875275d23
 AUX clang-2.8-darwin-prefix.patch 4989 SHA256 808d6d47b7eb133a4e1091bf24b64690fe14d3f5b66fec7a9ed3d91aeb1f03d7 SHA512 08eeeaf45a1e8efc2f7303222635cff8c6c2e5a2d1dc9bb61c08350148e24a3b8e111247dbc08ef05b20bd0ee57bf5370f8c7c4f8b8ebf3ea43a1ed0a333432a WHIRLPOOL 04ab05b832643cf6285c96a8705ea46e2cdc80fe03b84ab7e40054ceaac4ce3dce31cac56c08b48e7c16d393f1fbe5bb71b434eccae9b6acd1f914642ed651a5
@@ -35,7 +40,14 @@ EBUILD clang-3.0-r4.ebuild 7155 SHA256 012f34451fdaaf2cc6947e013ba584a8df07bd37b
 EBUILD clang-3.1-r1.ebuild 6078 SHA256 92f13108a43de981b35437e9b7b68861fce5be395f313d4298b53d2e7e6999fe SHA512 185df75946c41cbf500d57f585d56e77ebfb3f605e88be6b74ab72f4198364c6bf3b428074663e5ea661b087e102787869a69bbc07c0e5e74ecba08adf5c78bc WHIRLPOOL 631caa58a08e0e73b1d79301bd4e4862f8f5f41bd21e516ad09e4993be628348d25b08d8051a6bae0953e8cc87c4c0768fc509a0537e103367b6c4f430128cac
 EBUILD clang-3.1-r2.ebuild 6504 SHA256 572e92bfffd67eda07839a6a4f46469187cd5067ec98884cdc656688ea304849 SHA512 555881e1a44aac42c1a09cae4096248f9bd3505d22d8d7b55e5bb4fae5c2f820ca7e678e404a492cd2955c399878c0b59a14584c2ab5dc998bc9bc04fe70901e WHIRLPOOL fac6278d9bb6815d8a447140c14384da4efe4398337a5b083828ad59fc63adf2df22242e623e9ec6d16bb62f0298e38f6c49eb13e2937729f333f746b1268e92
 EBUILD clang-3.1-r4.ebuild 6479 SHA256 3350273d41082e44287de207424c850b874bb82a15b488045e540835a268f2a4 SHA512 b986b50d5cf1db3a0a4da9844f6a7da100d0f1ee5451150356c67b3b7956a87d6da928904b8fa47a4fd87b981300338e6cc00289e478c7128e5524892bc77dd3 WHIRLPOOL fc9425c05a4a2d38853602f413fe994aedc88f209081c9051c3ba5c8cbce9712972ce5c2514d269aba6ab419792c416203e0bda6e7068cd12351dda0781c1bf6
-EBUILD clang-3.1-r5.ebuild 6622 SHA256 b22f7f39a9c7692f2cff9ec615bdac116674695857065afe715bdb49f33dcdeb SHA512 e80c42a2487fea93a80ba931fb13417cd900d35df7aa5d72b553a28550e24b7a357acb967aca165f50e7b6f1c5a07aa31e30f693de7fd1d597e20b85b72027db WHIRLPOOL b4e0e9c6efe8a03aca5f192d928579d53f4e760638d3b7143a147778911aa3fc5a178203c77f0c11adea4e87a266334c66b9bff2d31d7373fcf1f850fd12dce1
+EBUILD clang-3.1-r5.ebuild 6689 SHA256 942c3998d4689361a7da40205645fbfd2a25e761c09fcdf3b578a46da09a44b7 SHA512 e111f8695f0098469775a389e4449b090071f0d6a06f11400dee6ad0d1e06ea6a05f620082aee567dce06c1bba8502e67470b8cf8efc82d416cdbc67497cba82 WHIRLPOOL 9045f99532d04f6a738b08710249a4d584e6b436e2f05221851f99501bed205f0a52f18bcf6262e9617d1866060b436b642a42e5e31aa96abeaf9c8b48b1b297
 EBUILD clang-9999.ebuild 5731 SHA256 8a071633ae8f7fc933999e45211aeb2aeb9a8067fd621740d7f8da59c1f8a049 SHA512 054853289a760aa5eefd1c98bf35007719f417744b376d8ba16f367960e50c4de510537c7dc91941d357c10f0217753607ebc181fa849533a521efaf3eee5379 WHIRLPOOL 0a847869caca0414e11574a61cb8293142de6debdffc09e5bf5b6aaf118620f91b3cd6332151b475588656bcf6c3cbeb5db698d37d7654ddc50a0e41a76ca9f9
-MISC ChangeLog 14694 SHA256 770b0f0eda016971c79ad84258bdc4f528b9c4064e5511e87b7be339830423ab SHA512 3fc06a837068d9acf44560d99c0169c0ee74850fbe025189646dff1ef8dd42614cb5a2b191f1467ad257f27d751d37dfb008dcbaf1c0480ded2e43391d013184 WHIRLPOOL cd2b96797c58f268482b21a0a78b03320df0c7949dadaa69df27a018ceb05fc6fc0c15091cd7e06bb182702691845984e3117b0fb4100a4bccdc528998b99ccf
+MISC ChangeLog 15416 SHA256 91ec63389711dac191447bc3641d3bb40c86b81a34224a7a6b43eb4ebf7e7e85 SHA512 466cd12172289afb2717f36e735dcda3cd6166f00c44f011c5080f7cb1cda1410bc7a1f588478a5d0e2ffef2c31a6494f3020dde492a8e29a97b2086dc24dfa6 WHIRLPOOL 7ab22c5fe7621bc2b50e33022ee9b7fdcecb2384bd0f834ae08447df1d565f0e7f12cdf94f68fe4b49758fe219fd959ab6d61f3b1e9fae6658f662a39aefc207
 MISC metadata.xml 1526 SHA256 142d229331f82d741b95b794866ca22b753722efd86d5d0e054f69cb5286f4bb SHA512 f27a7a8514b393dfc1d275ae76e31abf7e201eab1a86592a50ca619853646bd0a10837cc47f8ec621d4c36d32877beb6a3b6536df3b1dc0c4fe9b9920d901a07 WHIRLPOOL 10889bee96e18aea92d6c9bdf48095ad2b04eece1d9a8e2a6bf5df1a28467941b697cc922adbecbc4f8da73cdc45654f99cb4acf216d8f772117efa2291af3f9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlA/NUgACgkQFYEBGcdFJfIErAD+KaTvTF0s9UdZsYaIMV9qG4Px
+eWtKjzzc/0ItvyBns24A/3HXZFZns0skBzyW7trKjRD6OGm5RaAjwDFh1WYXjKSQ
+=a1GL
+-----END PGP SIGNATURE-----
diff --git a/sys-devel/clang/clang-3.1-r5.ebuild b/sys-devel/clang/clang-3.1-r5.ebuild
index e0c2aa61bcbe..15c9734079c0 100644
--- a/sys-devel/clang/clang-3.1-r5.ebuild
+++ b/sys-devel/clang/clang-3.1-r5.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/clang/clang-3.1-r5.ebuild,v 1.2 2012/07/27 18:22:45 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-3.1-r5.ebuild,v 1.3 2012/08/30 09:41:16 voyageur Exp $
 
 EAPI=4
 
@@ -18,7 +18,7 @@ SRC_URI="http://llvm.org/releases/${PV}/llvm-${PV}.src.tar.gz
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug kernel_FreeBSD multitarget +static-analyzer test"
 
 DEPEND="static-analyzer? ( dev-lang/perl )"
@@ -87,8 +87,9 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-increase-parser-recursion-limit.patch
 
 	# Apply r600 OpenCL-related patches, bug #425688
+	epatch "${FILESDIR}"/cl-patches/llvm-*.patch
 	pushd tools/clang &>/dev/null || die
-	epatch "${FILESDIR}"/cl-patches/*.patch
+	epatch "${FILESDIR}"/cl-patches/clang-*.patch
 	popd &>/dev/null || die
 
 	# User patches
diff --git a/sys-devel/clang/files/cl-patches/0001-Add-r600-TargetInfo.patch b/sys-devel/clang/files/cl-patches/clang-0001-Add-r600-TargetInfo.patch
index 929b5d37028f..929b5d37028f 100644
--- a/sys-devel/clang/files/cl-patches/0001-Add-r600-TargetInfo.patch
+++ b/sys-devel/clang/files/cl-patches/clang-0001-Add-r600-TargetInfo.patch
diff --git a/sys-devel/clang/files/cl-patches/0002-r600-Add-some-target-builtins.patch b/sys-devel/clang/files/cl-patches/clang-0002-r600-Add-some-target-builtins.patch
index 0003a8d53560..0003a8d53560 100644
--- a/sys-devel/clang/files/cl-patches/0002-r600-Add-some-target-builtins.patch
+++ b/sys-devel/clang/files/cl-patches/clang-0002-r600-Add-some-target-builtins.patch
diff --git a/sys-devel/clang/files/cl-patches/0003-r600-Add-read_global_size-and-read_local_size-builti.patch b/sys-devel/clang/files/cl-patches/clang-0003-r600-Add-read_global_size-and-read_local_size-builti.patch
index e0c2d3bb6116..e0c2d3bb6116 100644
--- a/sys-devel/clang/files/cl-patches/0003-r600-Add-read_global_size-and-read_local_size-builti.patch
+++ b/sys-devel/clang/files/cl-patches/clang-0003-r600-Add-read_global_size-and-read_local_size-builti.patch
diff --git a/sys-devel/clang/files/cl-patches/llvm-0001-r600-Add-some-intrinsic-definitions.patch b/sys-devel/clang/files/cl-patches/llvm-0001-r600-Add-some-intrinsic-definitions.patch
new file mode 100644
index 000000000000..9d99c9cff350
--- /dev/null
+++ b/sys-devel/clang/files/cl-patches/llvm-0001-r600-Add-some-intrinsic-definitions.patch
@@ -0,0 +1,64 @@
+From e25389b66b5ced3a2b5461077dcc9a505d334e3d Mon Sep 17 00:00:00 2001
+From: Tom Stellard <thomas.stellard@amd.com>
+Date: Tue, 13 Mar 2012 14:12:21 -0400
+Subject: [PATCH 1/2] r600: Add some intrinsic definitions
+
+---
+ include/llvm/Intrinsics.td     |    1 +
+ include/llvm/IntrinsicsR600.td |   35 +++++++++++++++++++++++++++++++++++
+ 2 files changed, 36 insertions(+), 0 deletions(-)
+ create mode 100644 include/llvm/IntrinsicsR600.td
+
+diff --git a/include/llvm/Intrinsics.td b/include/llvm/Intrinsics.td
+index 069f907..e90dd85 100644
+--- a/include/llvm/Intrinsics.td
++++ b/include/llvm/Intrinsics.td
+@@ -441,3 +441,4 @@ include "llvm/IntrinsicsCellSPU.td"
+ include "llvm/IntrinsicsXCore.td"
+ include "llvm/IntrinsicsPTX.td"
+ include "llvm/IntrinsicsHexagon.td"
++include "llvm/IntrinsicsR600.td"
+diff --git a/include/llvm/IntrinsicsR600.td b/include/llvm/IntrinsicsR600.td
+new file mode 100644
+index 0000000..789fecb
+--- /dev/null
++++ b/include/llvm/IntrinsicsR600.td
+@@ -0,0 +1,35 @@
++//===- IntrinsicsR600.td - Defines R600 intrinsics ---------*- tablegen -*-===//
++//
++//                     The LLVM Compiler Infrastructure
++//
++// This file is distributed under the University of Illinois Open Source
++// License. See LICENSE.TXT for details.
++//
++//===----------------------------------------------------------------------===//
++//
++// This file defines all of the R600-specific intrinsics.
++//
++//===----------------------------------------------------------------------===//
++//
++// Authors: Tom Stellard <thomas.stellard@amd.com>
++//
++
++let TargetPrefix = "r600" in {
++
++class R600ReadPreloadRegisterIntrinsic<string name>
++  : Intrinsic<[llvm_i32_ty], [], [IntrNoMem]>,
++    GCCBuiltin<name>;
++
++multiclass R600ReadPreloadRegisterIntrinsic_xyz<string prefix> {
++  def _x : R600ReadPreloadRegisterIntrinsic<!strconcat(prefix, "_x")>;
++  def _y : R600ReadPreloadRegisterIntrinsic<!strconcat(prefix, "_y")>;
++  def _z : R600ReadPreloadRegisterIntrinsic<!strconcat(prefix, "_z")>;
++}
++
++defm int_r600_read_ngroups : R600ReadPreloadRegisterIntrinsic_xyz <
++                                       "__builtin_r600_read_ngroups">;
++defm int_r600_read_tgid : R600ReadPreloadRegisterIntrinsic_xyz <
++                                       "__builtin_r600_read_tgid">;
++defm int_r600_read_tidig : R600ReadPreloadRegisterIntrinsic_xyz <
++                                       "__builtin_r600_read_tidig">;
++} // End TargetPrefix = "r600"
+-- 
+1.7.7.6
+
diff --git a/sys-devel/clang/files/cl-patches/llvm-0002-r600-Add-get_global_size-and-get_local_size-intrinsi.patch b/sys-devel/clang/files/cl-patches/llvm-0002-r600-Add-get_global_size-and-get_local_size-intrinsi.patch
new file mode 100644
index 000000000000..db176dd56a1b
--- /dev/null
+++ b/sys-devel/clang/files/cl-patches/llvm-0002-r600-Add-get_global_size-and-get_local_size-intrinsi.patch
@@ -0,0 +1,27 @@
+From 17667fa3450470f7c89fc2ba4631d908cf510749 Mon Sep 17 00:00:00 2001
+From: Tom Stellard <thomas.stellard@amd.com>
+Date: Wed, 14 Mar 2012 11:19:35 -0400
+Subject: [PATCH 2/2] r600: Add get_global_size and get_local_size intrinsics
+
+---
+ include/llvm/IntrinsicsR600.td |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/include/llvm/IntrinsicsR600.td b/include/llvm/IntrinsicsR600.td
+index 789fecb..0473acb 100644
+--- a/include/llvm/IntrinsicsR600.td
++++ b/include/llvm/IntrinsicsR600.td
+@@ -26,6 +26,10 @@ multiclass R600ReadPreloadRegisterIntrinsic_xyz<string prefix> {
+   def _z : R600ReadPreloadRegisterIntrinsic<!strconcat(prefix, "_z")>;
+ }
+ 
++defm int_r600_read_global_size : R600ReadPreloadRegisterIntrinsic_xyz <
++                                       "__builtin_r600_read_global_size">;
++defm int_r600_read_local_size : R600ReadPreloadRegisterIntrinsic_xyz <
++                                       "__builtin_r600_read_local_size">;
+ defm int_r600_read_ngroups : R600ReadPreloadRegisterIntrinsic_xyz <
+                                        "__builtin_r600_read_ngroups">;
+ defm int_r600_read_tgid : R600ReadPreloadRegisterIntrinsic_xyz <
+-- 
+1.7.7.6
+