Bump to a new gcc-4.1 snapshot. The patch from pr22313 is now included upstream.

Package-Manager: portage-2.1_pre1

6 files changed, 17 insertions, 76 deletions

diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog
index ca551d0155e9..3f85d4defaea 100644
--- a/sys-devel/gcc/ChangeLog
+++ b/sys-devel/gcc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-devel/gcc
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.478 2005/12/20 21:08:16 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.479 2005/12/24 00:59:19 halcy0n Exp $
+
+*gcc-4.1.0_beta20051223 (24 Dec 2005)
+
+  24 Dec 2005; Mark Loeser <halcy0n@gentoo.org>
+  -files/4.1.0/gcc-4.1.0-pr22313.patch, -gcc-4.1.0_beta20051216.ebuild,
+  +gcc-4.1.0_beta20051223.ebuild:
+  Bump to a new gcc-4.1 snapshot. The patch from pr22313 is now included
+  upstream.
 
   20 Dec 2005; Mark Loeser <halcy0n@gentoo.org> gcc-4.0.1.ebuild,
   gcc-4.0.2-r2.ebuild, gcc-4.1.0_beta20051216.ebuild:
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 1c0b7f123522..9d1c93c412de 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 9012c349df9a5bb7d4f50ce12acc345c ChangeLog 98036
+MD5 57ca2c2e92938418d4ca8dff4e1629e8 ChangeLog 98315
 MD5 8ec9b0352d226e4693cabffe0fa5bba6 files/3.2.1/gcc31-loop-load-final-value.patch 3324
 MD5 5e8f2122ef7f9ce187b0a0d50ac9d24a files/3.2.1/gcc32-arm-disable-mathf.patch 2229
 MD5 044a164462d9392aa67cde6f9fd5c1bc files/3.2.1/gcc32-arm-reload1-fix.patch 932
@@ -51,7 +51,6 @@ MD5 7434140298091f759eba5e9706264130 files/3.4.3/libssp.patch 2029
 MD5 520c8e6799b5c4bff0fdcb81e81fbe88 files/3.4.4/gcc-3.4.4-cross-compile.patch 1912
 MD5 2c355d808b490994c6566b10f3c0ba27 files/3.4.4/gcc-3.4.4-softfloat.patch 5242
 MD5 0acb1229f47bbb9e254a9824db17c25b files/4.0.2/gcc-4.0.2-cross-compile.patch 505
-MD5 6c3e9176aff0f29e30a356970e8fa307 files/4.1.0/gcc-4.1.0-pr22313.patch 2292
 MD5 fed3620378df7a876d6709ddf3f7bbec files/awk/fixlafiles.awk 7865
 MD5 c672adb59a1f452475ab0a864b9d1bd1 files/awk/scanforssp.awk 5830
 MD5 4ecf0f5cb735c81ca4b61a9c6db74269 files/digest-gcc-2.95.3-r9 139
@@ -70,7 +69,7 @@ MD5 fa32cd40c637c54b4e3b89dd4ed4c573 files/digest-gcc-3.4.4-r1 450
 MD5 009ef464ff3b7e1a3f6aa78e20736969 files/digest-gcc-3.4.5 364
 MD5 f0c74f849066ffaefe7d364d69a71961 files/digest-gcc-4.0.1 380
 MD5 ec2e40ca8729562141a95fcb54f5861d files/digest-gcc-4.0.2-r2 381
-MD5 931dc072360e8ad2d0a9d96da71884da files/digest-gcc-4.1.0_beta20051216 71
+MD5 307c5b6e8d2820e48c211c1b2475260e files/digest-gcc-4.1.0_beta20051223 71
 MD5 1acd56209164ab837c5f91723434464e files/fix_libtool_files.sh 1712
 MD5 e0ebf10eb8bf4542ae57ba591daa68a4 files/gcc-configure-LANG.patch 1686
 MD5 f80fd6ebeeea00d3e1649dfccdd85062 files/gcc-spec-env.patch 893
@@ -100,12 +99,12 @@ MD5 c44289f25b99d3c631f97a8043826901 gcc-3.4.4-r1.ebuild 5203
 MD5 14188c45d8fee496cb16ba55363fd2c2 gcc-3.4.5.ebuild 5046
 MD5 103f90b35ea4fb36f174d4e29a2f00c1 gcc-4.0.1.ebuild 1864
 MD5 174f2d562e09f4eab132d7b8e3b42818 gcc-4.0.2-r2.ebuild 2178
-MD5 9df672a0201da740dd73de713c67d22a gcc-4.1.0_beta20051216.ebuild 2144
+MD5 eff344349de4e1c0200e452fb919334f gcc-4.1.0_beta20051223.ebuild 2092
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDqHLLCRZPokWLroQRAkG6AJ4mazxOV7pNNRPclMOeV839l7rxFwCfcAhw
-Kflk2pPtjxsFkOxauzQQvAE=
-=2EYv
+iD8DBQFDrJ1yCRZPokWLroQRAlVDAJ9SjeHQUAI8RowWKS7eTO986KEttQCfQt1L
+dIg5Amuml1mIuZGxPBvRp9E=
+=JTvK
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gcc/files/4.1.0/gcc-4.1.0-pr22313.patch b/sys-devel/gcc/files/4.1.0/gcc-4.1.0-pr22313.patch
deleted file mode 100644
index 9787a204ae29..000000000000
--- a/sys-devel/gcc/files/4.1.0/gcc-4.1.0-pr22313.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Andrew Pinski
-
-ChangeLog:
-
-  * dwarf2out.c (dwarf2out_switch_text_section): Export.
-  * debug.h (dwarf2out_switch_text_section): Prototype.
-  * final.c (final_scan_insn): Call dwarf2out_switch_text_section
-    if we need to call it for dwarf2 unwind info.
-
-diff -ur gcc-4.1-20051105-orig/gcc/debug.h gcc-4.1-20051105/gcc/debug.h
---- gcc-4.1-20051105-orig/gcc/debug.h	2005-11-12 00:09:33.376787809 +0000
-+++ gcc-4.1-20051105/gcc/debug.h	2005-11-12 00:10:06.962349214 +0000
-@@ -160,6 +160,7 @@
- /* Decide whether we want to emit frame unwind information for the current
-    translation unit.  */
- extern int dwarf2out_do_frame (void);
-+void dwarf2out_switch_text_section (void);
- 
- extern void debug_flush_symbol_queue (void);
- extern void debug_queue_symbol (tree);
-diff -ur gcc-4.1-20051105-orig/gcc/dwarf2out.c gcc-4.1-20051105/gcc/dwarf2out.c
---- gcc-4.1-20051105-orig/gcc/dwarf2out.c	2005-11-12 00:09:26.948488952 +0000
-+++ gcc-4.1-20051105/gcc/dwarf2out.c	2005-11-12 00:10:06.962349214 +0000
-@@ -3520,7 +3520,6 @@
- static void dwarf2out_abstract_function (tree);
- static void dwarf2out_var_location (rtx);
- static void dwarf2out_begin_function (tree);
--static void dwarf2out_switch_text_section (void);
- 
- /* The debug hooks structure.  */
- 
-@@ -6866,7 +6865,7 @@
-   *d = new_loc_list (descr, begin, end, section, 0);
- }
- 
--static void
-+void
- dwarf2out_switch_text_section (void)
- {
-   dw_fde_ref fde;
-diff -ur gcc-4.1-20051105-orig/gcc/final.c gcc-4.1-20051105/gcc/final.c
---- gcc-4.1-20051105-orig/gcc/final.c	2005-11-12 00:09:26.912487279 +0000
-+++ gcc-4.1-20051105/gcc/final.c	2005-11-12 00:10:06.962349214 +0000
-@@ -1717,11 +1717,21 @@
- 	  if (last_text_section == in_text)
- 	    {
- 	      (*debug_hooks->switch_text_section) ();
-+#if defined (DWARF2_UNWIND_INFO)
-+	        if (write_symbols != DWARF2_DEBUG && write_symbols != VMS_AND_DWARF2_DEBUG
-+	 	    && dwarf2out_do_frame ())
-+	 	  dwarf2out_switch_text_section ();
-+#endif
- 	      unlikely_text_section ();
- 	    }
- 	  else
- 	    {
- 	      (*debug_hooks->switch_text_section) ();
-+#if defined (DWARF2_UNWIND_INFO)
-+	        if (write_symbols != DWARF2_DEBUG && write_symbols != VMS_AND_DWARF2_DEBUG
-+	 	    && dwarf2out_do_frame ())
-+	 	  dwarf2out_switch_text_section ();
-+#endif
- 	      text_section ();
- 	    }
- 	  break;
diff --git a/sys-devel/gcc/files/digest-gcc-4.1.0_beta20051216 b/sys-devel/gcc/files/digest-gcc-4.1.0_beta20051216
deleted file mode 100644
index d3f89ea1e24b..000000000000
--- a/sys-devel/gcc/files/digest-gcc-4.1.0_beta20051216
+++ /dev/null
@@ -1 +0,0 @@
-MD5 85abcb1651194c9d1ae2cd3e3c797e1b gcc-4.1-20051216.tar.bz2 36693636
diff --git a/sys-devel/gcc/files/digest-gcc-4.1.0_beta20051223 b/sys-devel/gcc/files/digest-gcc-4.1.0_beta20051223
new file mode 100644
index 000000000000..e924cb7d7df4
--- /dev/null
+++ b/sys-devel/gcc/files/digest-gcc-4.1.0_beta20051223
@@ -0,0 +1 @@
+MD5 3fc04589e6930277d859f9896acaffab gcc-4.1-20051223.tar.bz2 36686699
diff --git a/sys-devel/gcc/gcc-4.1.0_beta20051216.ebuild b/sys-devel/gcc/gcc-4.1.0_beta20051223.ebuild
index 47eb4509e0b5..f326b052bace 100644
--- a/sys-devel/gcc/gcc-4.1.0_beta20051216.ebuild
+++ b/sys-devel/gcc/gcc-4.1.0_beta20051223.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.1.0_beta20051216.ebuild,v 1.2 2005/12/20 21:08:16 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.1.0_beta20051223.ebuild,v 1.1 2005/12/24 00:59:19 halcy0n Exp $
 
 ETYPE="gcc-compiler"
 
@@ -50,7 +50,6 @@ pkg_setup() {
 
 src_unpack() {
 	toolchain_src_unpack
-	epatch "${FILESDIR}"/4.1.0/gcc-4.1.0-pr22313.patch
 
 	echo ${PV/_/-} > "${S}"/gcc/BASE-VER
 	echo "" > "${S}"/gcc/DATESTAMP