has_version "=sys-devel/gcc-3.4*" && CFLAGS="-O2"

11 files changed, 76 insertions, 11 deletions

diff --git a/sys-devel/binutils/ChangeLog b/sys-devel/binutils/ChangeLog
index a9a7ebc1d197..1b635e9d52d0 100644
--- a/sys-devel/binutils/ChangeLog
+++ b/sys-devel/binutils/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-devel/binutils
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/ChangeLog,v 1.112 2004/04/23 19:22:59 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/ChangeLog,v 1.113 2004/04/24 14:00:06 lv Exp $
+
+  24 Apr 2004; Travis Tilley <lv@gentoo.org> binutils-2.14.90.0.7-r1.ebuild,
+  binutils-2.14.90.0.7-r2.ebuild, binutils-2.14.90.0.7-r3.ebuild,
+  binutils-2.14.90.0.7-r4.ebuild, binutils-2.14.90.0.7.ebuild,
+  binutils-2.14.90.0.8-r1.ebuild, binutils-2.14.90.0.8.ebuild,
+  binutils-2.15.90.0.1.1.ebuild, binutils-2.15.90.0.3-r1.ebuild,
+  binutils-2.15.90.0.3.ebuild:
+  GCC 3.4 breaks binutils if CFLAGS arent conservative. Adding fix for bug #47581
 
   23 Apr 2004; Travis Tilley <lv@gentoo.org> binutils-2.15.90.0.1.1.ebuild:
   added ~amd64 keyword for testing
diff --git a/sys-devel/binutils/binutils-2.14.90.0.7-r1.ebuild b/sys-devel/binutils/binutils-2.14.90.0.7-r1.ebuild
index aeb6815d9de4..ce8fba38b0bd 100644
--- a/sys-devel/binutils/binutils-2.14.90.0.7-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.14.90.0.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.14.90.0.7-r1.ebuild,v 1.4 2004/01/18 10:02:12 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.14.90.0.7-r1.ebuild,v 1.5 2004/04/24 14:00:06 lv Exp $
 
 IUSE="nls bootstrap build"
 
@@ -92,6 +92,12 @@ src_compile() {
 		CFLAGS="$(echo "${CFLAGS}" | sed -e 's,-O[2-9] ,-O1 ,')"
 	fi
 
+	# GCC 3.4 miscompiles binutils unless CFLAGS are conservative. See
+	# bug #47581 for more information.
+	# Travis Tilley <lv@gentoo.org>
+	has_version "=sys-devel/gcc-3.4*" && CFLAGS="-O2"
+
+
 	# Fix /usr/lib/libbfd.la
 	elibtoolize --portage
 
diff --git a/sys-devel/binutils/binutils-2.14.90.0.7-r2.ebuild b/sys-devel/binutils/binutils-2.14.90.0.7-r2.ebuild
index 1d32561d57aa..d162739c5479 100644
--- a/sys-devel/binutils/binutils-2.14.90.0.7-r2.ebuild
+++ b/sys-devel/binutils/binutils-2.14.90.0.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.14.90.0.7-r2.ebuild,v 1.5 2004/02/23 00:18:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.14.90.0.7-r2.ebuild,v 1.6 2004/04/24 14:00:06 lv Exp $
 
 IUSE="nls bootstrap build"
 
@@ -106,6 +106,12 @@ src_compile() {
 		CFLAGS="$(echo "${CFLAGS}" | sed -e 's,-O[2-9] ,-O1 ,')"
 	fi
 
+	# GCC 3.4 miscompiles binutils unless CFLAGS are conservative. See
+	# bug #47581 for more information.
+	# Travis Tilley <lv@gentoo.org>
+	has_version "=sys-devel/gcc-3.4*" && CFLAGS="-O2"
+
+
 	# Fix /usr/lib/libbfd.la
 	elibtoolize --portage
 
diff --git a/sys-devel/binutils/binutils-2.14.90.0.7-r3.ebuild b/sys-devel/binutils/binutils-2.14.90.0.7-r3.ebuild
index cffa8318a8dd..3f232913eaa8 100644
--- a/sys-devel/binutils/binutils-2.14.90.0.7-r3.ebuild
+++ b/sys-devel/binutils/binutils-2.14.90.0.7-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.14.90.0.7-r3.ebuild,v 1.10 2004/02/23 00:18:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.14.90.0.7-r3.ebuild,v 1.11 2004/04/24 14:00:06 lv Exp $
 
 IUSE="nls bootstrap build"
 
@@ -107,6 +107,11 @@ src_compile() {
 		CFLAGS="$(echo "${CFLAGS}" | sed -e 's,-O[2-9] ,-O1 ,')"
 	fi
 
+	# GCC 3.4 miscompiles binutils unless CFLAGS are conservative. See
+	# bug #47581 for more information.
+	# Travis Tilley <lv@gentoo.org>
+	has_version "=sys-devel/gcc-3.4*" && CFLAGS="-O2"
+
 
 	# Fix /usr/lib/libbfd.la
 	elibtoolize --portage
diff --git a/sys-devel/binutils/binutils-2.14.90.0.7-r4.ebuild b/sys-devel/binutils/binutils-2.14.90.0.7-r4.ebuild
index 0a74d7bd928d..fb9d2e37f443 100644
--- a/sys-devel/binutils/binutils-2.14.90.0.7-r4.ebuild
+++ b/sys-devel/binutils/binutils-2.14.90.0.7-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.14.90.0.7-r4.ebuild,v 1.4 2004/04/21 17:44:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.14.90.0.7-r4.ebuild,v 1.5 2004/04/24 14:00:06 lv Exp $
 
 # NOTE to Maintainer:  ChangeLog states that it no longer use perl to build
 #                      the manpages, but seems this is incorrect ....
@@ -96,6 +96,12 @@ src_compile() {
 	filter-flags -fomit-frame-pointer -fssa
 	use arm && filter-flags -O2 -O3
 
+	# GCC 3.4 miscompiles binutils unless CFLAGS are conservative. See
+	# bug #47581 for more information.
+	# Travis Tilley <lv@gentoo.org>
+	has_version "=sys-devel/gcc-3.4*" && CFLAGS="-O2"
+
+
 	# Fix /usr/lib/libbfd.la
 	elibtoolize --portage
 
diff --git a/sys-devel/binutils/binutils-2.14.90.0.7.ebuild b/sys-devel/binutils/binutils-2.14.90.0.7.ebuild
index 32070ba7c658..b5d30999bc35 100644
--- a/sys-devel/binutils/binutils-2.14.90.0.7.ebuild
+++ b/sys-devel/binutils/binutils-2.14.90.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.14.90.0.7.ebuild,v 1.7 2004/02/23 00:18:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.14.90.0.7.ebuild,v 1.8 2004/04/24 14:00:06 lv Exp $
 
 IUSE="nls bootstrap build"
 
@@ -88,6 +88,12 @@ src_compile() {
 		CFLAGS="$(echo "${CFLAGS}" | sed -e 's,-O[2-9] ,-O1 ,')"
 	fi
 
+	# GCC 3.4 miscompiles binutils unless CFLAGS are conservative. See
+	# bug #47581 for more information.
+	# Travis Tilley <lv@gentoo.org>
+	has_version "=sys-devel/gcc-3.4*" && CFLAGS="-O2"
+
+
 	# Fix /usr/lib/libbfd.la
 	elibtoolize --portage
 
diff --git a/sys-devel/binutils/binutils-2.14.90.0.8-r1.ebuild b/sys-devel/binutils/binutils-2.14.90.0.8-r1.ebuild
index f0193b13f39a..5e398b6e9bfe 100644
--- a/sys-devel/binutils/binutils-2.14.90.0.8-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.14.90.0.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.14.90.0.8-r1.ebuild,v 1.7 2004/04/21 17:44:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.14.90.0.8-r1.ebuild,v 1.8 2004/04/24 14:00:06 lv Exp $
 
 IUSE="nls bootstrap build"
 
@@ -68,6 +68,11 @@ src_compile() {
 		CFLAGS="$(echo "${CFLAGS}" | sed -e 's,-O[2-9] ,-O1 ,')"
 	fi
 
+	# GCC 3.4 miscompiles binutils unless CFLAGS are conservative. See
+	# bug #47581 for more information.
+	# Travis Tilley <lv@gentoo.org>
+	has_version "=sys-devel/gcc-3.4*" && CFLAGS="-O2"
+
 
 	# Fix /usr/lib/libbfd.la
 	elibtoolize --portage
diff --git a/sys-devel/binutils/binutils-2.14.90.0.8.ebuild b/sys-devel/binutils/binutils-2.14.90.0.8.ebuild
index 8f00dc860b13..e50c50227f0f 100644
--- a/sys-devel/binutils/binutils-2.14.90.0.8.ebuild
+++ b/sys-devel/binutils/binutils-2.14.90.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.14.90.0.8.ebuild,v 1.3 2004/02/23 00:18:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.14.90.0.8.ebuild,v 1.4 2004/04/24 14:00:06 lv Exp $
 
 IUSE="nls bootstrap build"
 
@@ -70,6 +70,11 @@ src_compile() {
 		CFLAGS="$(echo "${CFLAGS}" | sed -e 's,-O[2-9] ,-O1 ,')"
 	fi
 
+	# GCC 3.4 miscompiles binutils unless CFLAGS are conservative. See
+	# bug #47581 for more information.
+	# Travis Tilley <lv@gentoo.org>
+	has_version "=sys-devel/gcc-3.4*" && CFLAGS="-O2"
+
 
 	# Fix /usr/lib/libbfd.la
 	elibtoolize --portage
diff --git a/sys-devel/binutils/binutils-2.15.90.0.1.1.ebuild b/sys-devel/binutils/binutils-2.15.90.0.1.1.ebuild
index e1b242d39ce0..5fbbfe4215be 100644
--- a/sys-devel/binutils/binutils-2.15.90.0.1.1.ebuild
+++ b/sys-devel/binutils/binutils-2.15.90.0.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.15.90.0.1.1.ebuild,v 1.4 2004/04/23 19:22:59 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.15.90.0.1.1.ebuild,v 1.5 2004/04/24 14:00:06 lv Exp $
 
 # NOTE to Maintainer:  ChangeLog states that it no longer use perl to build
 #                      the manpages, but seems this is incorrect ....
@@ -64,6 +64,12 @@ src_compile() {
 	# Filter CFLAGS=".. -O2 .." on arm
 	use arm && replace-flags -O? -O
 
+	# GCC 3.4 miscompiles binutils unless CFLAGS are conservative. See
+	# bug #47581 for more information.
+	# Travis Tilley <lv@gentoo.org>
+	has_version "=sys-devel/gcc-3.4*" && CFLAGS="-O2"
+
+
 	# Fix /usr/lib/libbfd.la
 	elibtoolize --portage
 
diff --git a/sys-devel/binutils/binutils-2.15.90.0.3-r1.ebuild b/sys-devel/binutils/binutils-2.15.90.0.3-r1.ebuild
index 09d063a3bcdf..4874814a0102 100644
--- a/sys-devel/binutils/binutils-2.15.90.0.3-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.15.90.0.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.15.90.0.3-r1.ebuild,v 1.2 2004/04/21 17:44:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.15.90.0.3-r1.ebuild,v 1.3 2004/04/24 14:00:06 lv Exp $
 
 # NOTE to Maintainer:  ChangeLog states that it no longer use perl to build
 #                      the manpages, but seems this is incorrect ....
@@ -70,6 +70,12 @@ src_compile() {
 	# untested functionality.
 	# use cross && myconf="${myconf} --targets-all"
 
+	# GCC 3.4 miscompiles binutils unless CFLAGS are conservative. See
+	# bug #47581 for more information.
+	# Travis Tilley <lv@gentoo.org>
+	has_version "=sys-devel/gcc-3.4*" && CFLAGS="-O2"
+
+
 	# Fix /usr/lib/libbfd.la
 	elibtoolize --portage
 
diff --git a/sys-devel/binutils/binutils-2.15.90.0.3.ebuild b/sys-devel/binutils/binutils-2.15.90.0.3.ebuild
index f7ce833fe6b9..5f8c15c4fc3b 100644
--- a/sys-devel/binutils/binutils-2.15.90.0.3.ebuild
+++ b/sys-devel/binutils/binutils-2.15.90.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.15.90.0.3.ebuild,v 1.1 2004/04/16 03:33:04 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.15.90.0.3.ebuild,v 1.2 2004/04/24 14:00:06 lv Exp $
 
 # NOTE to Maintainer:  ChangeLog states that it no longer use perl to build
 #                      the manpages, but seems this is incorrect ....
@@ -64,6 +64,12 @@ src_compile() {
 	# Filter CFLAGS=".. -O2 .." on arm
 	use arm && replace-flags -O? -O
 
+	# GCC 3.4 miscompiles binutils unless CFLAGS are conservative. See
+	# bug #47581 for more information.
+	# Travis Tilley <lv@gentoo.org>
+	has_version "=sys-devel/gcc-3.4*" && CFLAGS="-O2"
+
+
 	# Fix /usr/lib/libbfd.la
 	elibtoolize --portage