Bump 3.4.6 patchset to fix bugs #127190 #126279 and #126871

(Portage version: 2.1_pre7-r5)

4 files changed, 175 insertions, 10 deletions

diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog
index d84141be2ce7..08907d123993 100644
--- a/sys-devel/gcc/ChangeLog
+++ b/sys-devel/gcc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/gcc
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.523 2006/04/17 21:00:45 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.524 2006/04/18 00:21:09 halcy0n Exp $
+
+*gcc-3.4.6-r1 (18 Apr 2006)
+
+  18 Apr 2006; Mark Loeser <halcy0n@gentoo.org> +gcc-3.4.6-r1.ebuild:
+  Bump 3.4.6 patchset to fix bugs #127190 #126279 and #126871
 
   17 Apr 2006; Konstantin Arkhipov <voxus@gentoo.org>
   +gcc-4.2.0_alpha20060415.ebuild:
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index b25e46c773fd..f1ea36f97872 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,6 +1,6 @@
-MD5 ad7389befaa2970d5f944b2fe4c4bf15 ChangeLog 105129
-RMD160 d069273c7a9274225c03962168c4e25e59d4166f ChangeLog 105129
-SHA256 a543a6af3c0e85b1400edc32fddc4e9928065fddc2363751d0720328ea1d39c6 ChangeLog 105129
+MD5 ca8f36fa4d2dbf56ce2dd004d844a465 ChangeLog 105127
+RMD160 6a400f7e2c3952c79950d13a97f9bebee2c5c426 ChangeLog 105127
+SHA256 8a6b1975d2223c9555de3a240ecd748c9317b6dc3933cebb026dc22946565047 ChangeLog 105127
 MD5 8ec9b0352d226e4693cabffe0fa5bba6 files/3.2.1/gcc31-loop-load-final-value.patch 3324
 RMD160 8bb0e9133923821daf2e9d10a27a0a1930e00bbd files/3.2.1/gcc31-loop-load-final-value.patch 3324
 SHA256 70aa8433fb19c95f334b6cbc155cae22a3b61a6892ed9e18f95860509d0091a8 files/3.2.1/gcc31-loop-load-final-value.patch 3324
@@ -205,9 +205,9 @@ SHA256 e5f752026105b0a2abc75e34cd5536950aefb53fe4fc9ab49fb0b847f1798581 files/di
 MD5 73c94d11f8da2cdcc2ce56f227ac72c9 files/digest-gcc-3.4.5-r1 1623
 RMD160 b5a153cbc9bc263b396bf7625af321fa5677a32c files/digest-gcc-3.4.5-r1 1623
 SHA256 bd25d4b50dc342d11e5f4f260df4151c0d691b2fcb17da20ebd93f5a039e2531 files/digest-gcc-3.4.5-r1 1623
-MD5 e242bcd2b21f89c0e71338e2e7c0a5d0 files/digest-gcc-3.4.6 1623
-RMD160 9cb39ff8871b3192f90e865aa19799351eb27d6a files/digest-gcc-3.4.6 1623
-SHA256 7772b2d8bd9b56746d23614ce24b0e956b5ead8e72f82f5f46f9f54bd1973bb1 files/digest-gcc-3.4.6 1623
+MD5 b002e9b3cac36e48f1cda2dafef428a3 files/digest-gcc-3.4.6-r1 1623
+RMD160 e0e7e9ad7790ec2663d800ba5db95356be29b71e files/digest-gcc-3.4.6-r1 1623
+SHA256 fb653b5fa54dd45be7d01a042775f1b814debb9a3e5992abcdf36d1b72406ce7 files/digest-gcc-3.4.6-r1 1623
 MD5 ed7eb202165a8e45a94d12517178586b files/digest-gcc-4.0.2-r3 1373
 RMD160 41645e2e8777113bda2b59affcc3bf4914016ece files/digest-gcc-4.0.2-r3 1373
 SHA256 f5f406d4cc94f1da96b28617d82de671736b2b4cde870fe5edcaabbfbd7e04ec files/digest-gcc-4.0.2-r3 1373
@@ -292,6 +292,9 @@ SHA256 76294313a14085f0c156a18aa2697d824db1845ebe5d29382f6d42d173b6d689 gcc-3.4.
 MD5 6903d912f2f3858ff91b15657bc04d58 gcc-3.4.5.ebuild 5015
 RMD160 e7e5c9910801a156ed7f8537b22f076e9e48b677 gcc-3.4.5.ebuild 5015
 SHA256 7c2bb48fc3a905ff47d184b301561d2a2b57c787bdc4bddd76f46e9f0b9529a0 gcc-3.4.5.ebuild 5015
+MD5 f68d5fc2c6bf85fcb3451dad7b39cb0f gcc-3.4.6-r1.ebuild 5096
+RMD160 17863d08cd3a3824a22c9d60a19ba3bceab103d0 gcc-3.4.6-r1.ebuild 5096
+SHA256 06dd4f6fc53679879f1b05be63e5543edf962deceb006c6f84a0ddf5865dcc9f gcc-3.4.6-r1.ebuild 5096
 MD5 9cd624e5441af6ef55f370171da3d445 gcc-3.4.6.ebuild 5096
 RMD160 498f7d241822cc12a55a280a212b98d392c292b6 gcc-3.4.6.ebuild 5096
 SHA256 cf1204ef2833b80c33dc8c65f697ee8a97e26a2ed62dde38a46c6518643c153e gcc-3.4.6.ebuild 5096
@@ -304,9 +307,9 @@ SHA256 94c41954685650f11aadc6bdc4c1742d6cd1955f0fec1ddd24dd14dbf37b4367 gcc-4.0.
 MD5 6356bb64539ca15d81ccf0682146fc51 gcc-4.1.0.ebuild 1842
 RMD160 9034211a97b90a4ecb0de40a4d120aeab199a843 gcc-4.1.0.ebuild 1842
 SHA256 6a29b183e832a03eb3b6109d951ccdf319de042e56f20570a715eef37db9d969 gcc-4.1.0.ebuild 1842
-MD5 7a7ab75f7a229c14753e8ffda5017747 gcc-4.2.0_alpha20060415.ebuild 2035
-RMD160 06aa4fe3ee24ee266d5f0534ab25c9fe59d96f9c gcc-4.2.0_alpha20060415.ebuild 2035
-SHA256 a06a414519579b0f7ce933570be807cd070b14cbad2ca2289cfd66241abfb851 gcc-4.2.0_alpha20060415.ebuild 2035
+MD5 d05f5a52c1688b5d62235b7f399fb4dc gcc-4.2.0_alpha20060415.ebuild 2033
+RMD160 b6355f4a7fcb80114abcece4171d4c5f1dc8aab4 gcc-4.2.0_alpha20060415.ebuild 2033
+SHA256 c5e3dc406376b0de45d1557997a1c736ed2961ac11127ddc0c8f7a0242da09df gcc-4.2.0_alpha20060415.ebuild 2033
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162
 SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a metadata.xml 162
diff --git a/sys-devel/gcc/files/digest-gcc-3.4.6-r1 b/sys-devel/gcc/files/digest-gcc-3.4.6-r1
new file mode 100644
index 000000000000..7da6628190f9
--- /dev/null
+++ b/sys-devel/gcc/files/digest-gcc-3.4.6-r1
@@ -0,0 +1,18 @@
+MD5 d5da59b788f30b6e31488cdae51ca822 bounds-checking-gcc-3.4.4-1.00.patch.bz2 815608
+RMD160 b5e1d4716a5ab881b5d7742bb6650e0492edce93 bounds-checking-gcc-3.4.4-1.00.patch.bz2 815608
+SHA256 a29adc9260071f5928f2e491803b73117ee176e4b19b56ce421aa3ca461370b2 bounds-checking-gcc-3.4.4-1.00.patch.bz2 815608
+MD5 c9403328cea26d2582310d7c821eb95a gcc-3.4.5-piepatches-v8.7.9.tar.bz2 8140
+RMD160 66aaa00b8261646cff64e7deabb6315dd9f39109 gcc-3.4.5-piepatches-v8.7.9.tar.bz2 8140
+SHA256 4af3c5671cbba9e015a6843ad646ba979fc91226cdaba8a074fbbc8dacfa07ad gcc-3.4.5-piepatches-v8.7.9.tar.bz2 8140
+MD5 cb9fda1432fb18b239935c9e23c0b637 gcc-3.4.5-ssp-1.0.tar.bz2 31589
+RMD160 24bfe531556455bd58833d589b84d09941af615a gcc-3.4.5-ssp-1.0.tar.bz2 31589
+SHA256 30036c39dc0b885c273ec4cbe57042ce6f458fa37ce6cbea58dd5ddeee0e2409 gcc-3.4.5-ssp-1.0.tar.bz2 31589
+MD5 90aa9cb64d7edcd9a2306abe910cbe3b gcc-3.4.5-uclibc-patches-1.1.tar.bz2 70923
+RMD160 89e42889420fbab22e418261d248a89ee2bbbe9b gcc-3.4.5-uclibc-patches-1.1.tar.bz2 70923
+SHA256 5b92fac2afe835a127976fdb6602fb5628cf28e67dd19e8289768a3bb8631ec2 gcc-3.4.5-uclibc-patches-1.1.tar.bz2 70923
+MD5 7fcccefdeb1119bc487048da01366c3d gcc-3.4.6-patches-1.1.tar.bz2 54521
+RMD160 a9109ed61c7a1cb4a8d282f0f03b860f1f9ab6c3 gcc-3.4.6-patches-1.1.tar.bz2 54521
+SHA256 7de10c1ad401dd628dfb3e620b409f11151be3789feb5ac2c9611b50983b07b1 gcc-3.4.6-patches-1.1.tar.bz2 54521
+MD5 4a21ac777d4b5617283ce488b808da7b gcc-3.4.6.tar.bz2 28193401
+RMD160 b15003368cedc7964f6ceaee0c39ddc43a46c442 gcc-3.4.6.tar.bz2 28193401
+SHA256 7791a601878b765669022b8b3409fba33cc72f9e39340fec8af6d0e6f72dec39 gcc-3.4.6.tar.bz2 28193401
diff --git a/sys-devel/gcc/gcc-3.4.6-r1.ebuild b/sys-devel/gcc/gcc-3.4.6-r1.ebuild
new file mode 100644
index 000000000000..09e4e08e14d0
--- /dev/null
+++ b/sys-devel/gcc/gcc-3.4.6-r1.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.6-r1.ebuild,v 1.1 2006/04/18 00:21:09 halcy0n Exp $
+
+MAN_VER=""
+PATCH_VER="1.1"
+UCLIBC_VER="1.1"
+UCLIBC_GCC_VER="3.4.5"
+PIE_VER="8.7.9"
+PIE_GCC_VER="3.4.5"
+PP_VER="1.0"
+PP_GCC_VER="3.4.5"
+HTB_VER="1.00"
+HTB_GCC_VER="3.4.4"
+
+GCC_LIBSSP_SUPPORT="true"
+
+ETYPE="gcc-compiler"
+
+# arch/libc configurations known to be stable with {PIE,SSP}-by-default
+SSP_STABLE="x86 sparc amd64 ppc ppc64"
+SSP_UCLIBC_STABLE="arm mips ppc x86"
+PIE_GLIBC_STABLE="x86 sparc amd64 ppc ppc64"
+PIE_UCLIBC_STABLE="x86 mips ppc"
+
+# arch/libc configurations known to be broken with {PIE,SSP}-by-default
+SSP_UNSUPPORTED="hppa"
+SSP_UCLIBC_UNSUPPORTED="${SSP_UNSUPPORTED}"
+PIE_UCLIBC_UNSUPPORTED="alpha amd64 arm hppa ia64 m68k ppc64 s390 sh sparc"
+PIE_GLIBC_UNSUPPORTED="hppa"
+
+# whether we should split out specs files for multiple {PIE,SSP}-by-default
+# and vanilla configurations.
+SPLIT_SPECS=${SPLIT_SPECS-true}
+
+#GENTOO_PATCH_EXCLUDE=""
+#PIEPATCH_EXCLUDE=""
+
+inherit toolchain eutils
+
+DESCRIPTION="The GNU Compiler Collection.  Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking"
+
+KEYWORDS="-* ~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+
+# we need a proper glibc version for the Scrt1.o provided to the pie-ssp specs
+# NOTE: we SHOULD be using at least binutils 2.15.90.0.1 everywhere for proper
+# .eh_frame ld optimisation and symbol visibility support, but it hasnt been
+# well tested in gentoo on any arch other than amd64!!
+RDEPEND="|| ( app-admin/eselect-compiler >=sys-devel/gcc-config-1.3.12-r4 )
+	>=sys-libs/zlib-1.1.4
+	elibc_glibc? (
+		>=sys-libs/glibc-2.3.3_pre20040420-r1
+		hardened? ( >=sys-libs/glibc-2.3.3_pre20040529 )
+	)
+	!build? (
+		gcj? (
+			gtk? (
+				|| ( ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto ) virtual/x11 )
+				>=x11-libs/gtk+-2.2
+			)
+			>=media-libs/libart_lgpl-2.1
+		)
+		>=sys-libs/ncurses-5.2-r2
+		nls? ( sys-devel/gettext )
+	)"
+
+if [[ ${CATEGORY/cross-} != ${CATEGORY} ]]; then
+	RDEPEND="${RDEPEND} ${CATEGORY}/binutils"
+fi
+
+DEPEND="${RDEPEND}
+	>=sys-apps/texinfo-4.2-r4
+	>=sys-devel/bison-1.875
+	>=sys-devel/binutils-2.14.90.0.8-r1
+	amd64? ( >=sys-devel/binutils-2.15.90.0.1.1-r1 )"
+PDEPEND="|| ( app-admin/eselect-compiler sys-devel/gcc-config )
+	x86? ( !nocxx? ( !elibc_uclibc? ( !build? ( || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* ) ) ) ) )"
+
+src_unpack() {
+	gcc_src_unpack
+
+	# misc patches that havent made it into a patch tarball yet
+	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch
+
+	# nothing in the tree provides libssp.so, so nothing will ever trigger this
+	# logic, but having the patch in the tree makes life so much easier for me
+	# since I dont have to also have an overlay for this.
+	want_libssp && epatch "${FILESDIR}"/3.4.3/libssp.patch
+
+	# Anything useful and objc will require libffi. Seriously. Lets just force
+	# libffi to install with USE="objc", even though it normally only installs
+	# if you attempt to build gcj.
+	if ! use build && use objc && ! use gcj ; then
+		epatch "${FILESDIR}"/3.4.3/libffi-without-libgcj.patch
+		#epatch ${FILESDIR}/3.4.3/libffi-nogcj-lib-path-fix.patch
+	fi
+
+	# Fix cross-compiling
+	epatch "${FILESDIR}"/3.4.4/gcc-3.4.4-cross-compile.patch
+
+	[[ ${CTARGET} == *-softfloat-* ]] && epatch "${FILESDIR}"/3.4.4/gcc-3.4.4-softfloat.patch
+
+	# Arch stuff
+	case $(tc-arch) in
+		mips)
+			# If mips, and we DON'T want multilib, then rig gcc to only use n32 OR n64
+			if ! is_multilib; then
+				use n32 && epatch ${FILESDIR}/3.4.1/gcc-3.4.1-mips-n32only.patch
+				use n64 && epatch ${FILESDIR}/3.4.1/gcc-3.4.1-mips-n64only.patch
+			fi
+
+			# Patch forward-ported from a gcc-3.0.x patch that adds -march=r10000 and
+			# -mtune=r10000 support to gcc (Allows the compiler to generate code to
+			# take advantage of R10k's second ALU, perform shifts, etc..
+			#
+			# Needs re-porting to DFA in gcc-4.0 - Any Volunteers? :)
+			epatch ${FILESDIR}/3.4.2/gcc-3.4.x-mips-add-march-r10k.patch
+
+			# This is a very special patch -- it allows us to build semi-usable kernels
+			# on SGI IP28 (Indigo2 Impact R10000) systems.  The patch is henceforth
+			# regarded as a kludge by upstream, and thus, it will never get accepted upstream,
+			# but for our purposes of building a kernel, it works.
+			# Unless you're building an IP28 kernel, you really don't need care about what
+			# this patch does, because if you are, you are probably already aware of what
+			# it does.
+			# All that said, the abilities of this patch are disabled by default and need
+			# to be enabled by passing -mip28-cache-barrier.  Only used to build kernels, 
+			# There is the possibility it may be used for very specific userland apps too.
+			if use ip28 or use ip32r10k; then
+				epatch ${FILESDIR}/3.4.2/gcc-3.4.2-mips-ip28_cache_barriers-v4.patch
+			fi
+			;;
+		amd64)
+			if is_multilib ; then
+				sed -i -e '/GLIBCXX_IS_NATIVE=/s:false:true:' libstdc++-v3/configure || die
+			fi
+			;;
+	esac
+}