GCC 4.5 support for 2.6, bug #317467

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 31 insertions, 4 deletions

diff --git a/sys-devel/clang/ChangeLog b/sys-devel/clang/ChangeLog
index 15ae80a41a8d..c9e22c89e832 100644
--- a/sys-devel/clang/ChangeLog
+++ b/sys-devel/clang/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/clang
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.12 2010/04/27 12:08:55 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.13 2010/04/28 08:40:06 voyageur Exp $
+
+  28 Apr 2010; Bernard Cafarelli <voyageur@gentoo.org> clang-2.6-r3.ebuild,
+  +files/clang-2.6-gcc45.patch:
+  GCC 4.5 support for 2.6, bug #317467
 
 *clang-2.7 (27 Apr 2010)
 
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index e56ebb9b7bc0..624a2aa464a7 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -1,11 +1,12 @@
 AUX clang-2.6-fixdoc.patch 1885 RMD160 40512b1dcbb245c959b77408bcb7c02a590ac7d9 SHA1 67be72160a5733c251bcf9cead453353e0359394 SHA256 b0f5bf5de8af96ea92ee39701feb5131e7c98a21ccf52be53650cce63d1af052
+AUX clang-2.6-gcc45.patch 1030 RMD160 e59735e8b3b75af2168bbc4a7ccee85204ea1288 SHA1 0103078a91c6a30bd6b26c438ee2d7b3f7b47bea SHA256 23a5d03112995b7a2045d66b51cdc1b44fd5ee829adea0e62c2eb1f9c5b67a7e
 AUX clang-2.7-fixdoc.patch 1977 RMD160 62f52e5580baa396d93c56735c0039c8691b43b6 SHA1 351c1d2cf86b6da75a6ed19083d7a857333f007c SHA256 36c2214e575ed3fd78938279739e82c4f750f8726f8387e1414c18532501314a
 AUX llvm-2.6-cflags.patch 1177 RMD160 9c9061834d87357930d3ea1ef9f56a355885acb9 SHA1 4472b00a4d22b29e690e69fa0c2a365858634484 SHA256 f666995873ab6fe987229c941efb168de2bf9353115248ae37942a2d30d67182
 DIST clang-2.6.tar.gz 3857138 RMD160 b7e44abbf28902ff8e3fd4578a5ff9dd34f40817 SHA1 188f29ad3b2c64fcdc791aa34b323ed06452d7ae SHA256 98e22f4f5877fb3c73abb9ddcb3065ba9c94a21146387da7f905e6fd559d39ea
 DIST clang-2.7.tgz 4953739 RMD160 177fdcf59be4a60c37cf0dfb058535c9cdbbad4e SHA1 4d8326bfe2308a7355a5e4ca2eb172bffd761e1e SHA256 fb349471947f155c1cda1c8a4a3bbc7fa437b86f6875d9978f86c915dfed623a
 DIST llvm-2.6.tar.gz 7790380 RMD160 24d58cb052ab5879aae59eaf4885ec41186ee22a SHA1 547471147cbf6d3e49539e01196ffada2c79c250 SHA256 4cd9257350c5ff8b9b139d19497e2396c0604eef0e5d6504f5c1463b09bf2d84
 DIST llvm-2.7.tgz 8374297 RMD160 0fa2f362dd6a45efec35ce8fa0f8d36d98f32c8f SHA1 059fc21b0ec1b649c4a3dec81756e5f92aa131a2 SHA256 99664bdc8503a306038166af33f28eb426d99e297575a59d74a1a0dcbddbbca5
-EBUILD clang-2.6-r3.ebuild 4015 RMD160 333fa2955e6107c2ede5b6e3e9f1dd858fa91cbe SHA1 90df79453f19d3b93f3fa771c7a71e2991688492 SHA256 d3930b82440df0623ff0a42b3077978dac7bc4d1937142a16b46e7e2b1f81f41
+EBUILD clang-2.6-r3.ebuild 4086 RMD160 ce3deb403f9235a60cf961f70daabe94cfe1cd36 SHA1 9a01ffe2c872e09d80930c0c71ea4bbc4f3b4b39 SHA256 5809228390d1f4423f58b03c53eaad2df41a0861d9332f8213e07c00dc1a7707
 EBUILD clang-2.7.ebuild 3957 RMD160 58ee1b5fee888f1140fe531b69e1384daff924b2 SHA1 8c93df183c694fa262f6d471065c7cb52eae9e24 SHA256 c80168384d384bd7ce1a790b67bdb17b6268e862b12b7e78f4d6883ce0a67dff
-MISC ChangeLog 2178 RMD160 833ff4a2d43d53b03a1f213cdd31bc0c6a0fffbe SHA1 ef5e18a108a115661b247ceb8eca536c8531ef72 SHA256 2ad90d5540261dc10a3a0c3fafe2798c690b64eb4f171689f77fab5ddd51c127
+MISC ChangeLog 2326 RMD160 51af95c8def196cc0bf8a8ef1967ef89bc090cd8 SHA1 5703a3390beae518fb637b4ebdbdf7b9314b0595 SHA256 1286d9adaa8e6dea7c17ef8e0b734702180827a7c9b6b88e2f140a233788b204
 MISC metadata.xml 1098 RMD160 472ed702bea452e68447b59908bc9279bbb890dd SHA1 ef26faea642b17778814391ccd3016f933ec8e12 SHA256 2d18687396a420ad6aa7179f1104b90962514d2fcf94e3838ce82cd109b359c0
diff --git a/sys-devel/clang/clang-2.6-r3.ebuild b/sys-devel/clang/clang-2.6-r3.ebuild
index 919cd9dc6c73..ded55814727f 100644
--- a/sys-devel/clang/clang-2.6-r3.ebuild
+++ b/sys-devel/clang/clang-2.6-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-2.6-r3.ebuild,v 1.1 2010/04/26 21:46:54 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-2.6-r3.ebuild,v 1.2 2010/04/28 08:40:06 voyageur Exp $
 
 EAPI=2
 
@@ -62,6 +62,8 @@ src_prepare() {
 
 	# Do not force -O3 -fomit-frame-pointer on users, from llvm ebuild
 	epatch "${FILESDIR}"/llvm-2.6-cflags.patch
+	# GCC 4.5 support, bug #317467
+	epatch "${FILESDIR}"/${P}-gcc45.patch
 }
 
 src_configure() {
diff --git a/sys-devel/clang/files/clang-2.6-gcc45.patch b/sys-devel/clang/files/clang-2.6-gcc45.patch
new file mode 100644
index 000000000000..b9f000a498f7
--- /dev/null
+++ b/sys-devel/clang/files/clang-2.6-gcc45.patch
@@ -0,0 +1,20 @@
+--- llvm-2.6/tools/clang/lib/CodeGen/CGObjCGNU.cpp.bak	2010-04-27 15:07:20.000000000 +0300
++++ llvm-2.6/tools/clang/lib/CodeGen/CGObjCGNU.cpp	2010-04-27 15:08:26.000000000 +0300
+@@ -1170,7 +1170,7 @@
+     Elements.push_back(llvm::ConstantInt::get(LongTy, RuntimeVersion));
+   }
+   // sizeof(ModuleTy)
+-  llvm::TargetData td = llvm::TargetData::TargetData(&TheModule);
++  llvm::TargetData td = llvm::TargetData(&TheModule);
+   Elements.push_back(llvm::ConstantInt::get(LongTy,
+                      td.getTypeSizeInBits(ModuleTy)/8));
+   //FIXME: Should be the path to the file where this module was declared
+@@ -1320,7 +1320,7 @@
+   CGF.EmitBlock(TryHandler);
+ 
+   // Get the correct versions of the exception handling intrinsics
+-  llvm::TargetData td = llvm::TargetData::TargetData(&TheModule);
++  llvm::TargetData td = llvm::TargetData(&TheModule);
+   int PointerWidth = td.getTypeSizeInBits(PtrTy);
+   assert((PointerWidth == 32 || PointerWidth == 64) &&
+     "Can't yet handle exceptions if pointers are not 32 or 64 bits");