Eliminate ICE in ssp's sweep_string_variable (bug #74457), and stop vanilla and hardenednossp compiler variants from auto-upgrading fstack-protector to fstack-protector-all (bug #104754)

(Portage version: 2.1.1_pre2-r2)

3 files changed, 166 insertions, 1 deletions

diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog
index 0fa14fcc5636..842a9e64ca0b 100644
--- a/sys-devel/gcc/ChangeLog
+++ b/sys-devel/gcc/ChangeLog
@@ -1,6 +1,13 @@
 # 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.560 2006/06/30 02:48:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.561 2006/07/06 18:40:08 kevquinn Exp $
+
+*gcc-3.4.6-r2 (06 Jul 2006)
+
+  06 Jul 2006; Kevin F. Quinn <kevquinn@gentoo.org> +gcc-3.4.6-r2.ebuild:
+  Eliminate ICE in ssp's sweep_string_variable (bug #74457), and stop
+  vanilla and hardenednossp compiler variants from auto-upgrading
+  fstack-protector to fstack-protector-all (bug #104754)
 
   30 Jun 2006; Mike Frysinger <vapier@gentoo.org> gcc-4.0.2-r3.ebuild,
   gcc-4.0.3.ebuild, gcc-4.1.0-r1.ebuild, gcc-4.1.1.ebuild,
diff --git a/sys-devel/gcc/files/digest-gcc-3.4.6-r2 b/sys-devel/gcc/files/digest-gcc-3.4.6-r2
new file mode 100644
index 000000000000..fb85105200bd
--- /dev/null
+++ b/sys-devel/gcc/files/digest-gcc-3.4.6-r2
@@ -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 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 fe9514353eaf5a09ab16790b7714481b gcc-3.4.6-patches-1.2.tar.bz2 54757
+RMD160 d4e1240b9e45b7661b7f8bf4f57bb2c9cac17686 gcc-3.4.6-patches-1.2.tar.bz2 54757
+SHA256 43253a8defa6111bd6f107178cc46f425ec81efe0eb26b730c11c422a4d4de26 gcc-3.4.6-patches-1.2.tar.bz2 54757
+MD5 d910efcf734c3ffab0c242976eabfd7f gcc-3.4.6-piepatches-v8.7.9.tar.bz2 8261
+RMD160 3f95e205bc688a579e153801c6517cccdf054ab0 gcc-3.4.6-piepatches-v8.7.9.tar.bz2 8261
+SHA256 dbe98e3ca74658d233ae5821236934dd8468657b54f391d01517fb2a2cc71cae gcc-3.4.6-piepatches-v8.7.9.tar.bz2 8261
+MD5 848cdf2c21c3374c8f066ae051260afb gcc-3.4.6-ssp-1.0.tar.bz2 34468
+RMD160 0f668e3ffc08297b5ebe3d5cbb9575426008e096 gcc-3.4.6-ssp-1.0.tar.bz2 34468
+SHA256 27ff25099ca8617fe2a76cf8ea06acaab39cff9eb91ef64c84971ba324a664e9 gcc-3.4.6-ssp-1.0.tar.bz2 34468
+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-r2.ebuild b/sys-devel/gcc/gcc-3.4.6-r2.ebuild
new file mode 100644
index 000000000000..775c825f2de3
--- /dev/null
+++ b/sys-devel/gcc/gcc-3.4.6-r2.ebuild
@@ -0,0 +1,140 @@
+# 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-r2.ebuild,v 1.1 2006/07/06 18:40:08 kevquinn Exp $
+
+MAN_VER=""
+PATCH_VER="1.2"
+UCLIBC_VER="1.1"
+UCLIBC_GCC_VER="3.4.5"
+PIE_VER="8.7.9"
+PIE_GCC_VER="3.4.6"
+PP_VER="1.0"
+PP_GCC_VER="3.4.6"
+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 sh"
+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
+	virtual/libiconv
+	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
+}