GCC-4.1 snapshot bump. Also add a patch to fix building on amd64.

(Portage version: 2.0.53_rc7)

6 files changed, 79 insertions, 15 deletions

diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog
index e34b19f22eb2..a603ffac2511 100644
--- a/sys-devel/gcc/ChangeLog
+++ b/sys-devel/gcc/ChangeLog
@@ -1,6 +1,13 @@
 # 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.467 2005/11/13 22:03:06 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.468 2005/11/26 04:05:09 halcy0n Exp $
+
+*gcc-4.1.0_beta20051125 (26 Nov 2005)
+
+  26 Nov 2005; Mark Loeser <halcy0n@gentoo.org>
+  +files/4.1.0/gcc-4.1.0-pr22313.patch, -gcc-4.1.0_beta20051112.ebuild,
+  +gcc-4.1.0_beta20051125.ebuild:
+  GCC-4.1 snapshot bump.  Also add a patch to fix building on amd64.
 
   13 Nov 2005; Mark Loeser <halcy0n@gentoo.org> gcc-4.0.1.ebuild,
   gcc-4.0.2-r1.ebuild, gcc-4.1.0_beta20051112.ebuild:
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index aecce7decef2..9eb2546151dc 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 db9ad50bb68220acd1e58c11d9013505 ChangeLog 96185
 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
@@ -51,6 +48,7 @@ MD5 7434140298091f759eba5e9706264130 files/3.4.3/libssp.patch 2029
 MD5 50f1f564c568b9e28231c592d4df2f36 files/3.4.4/gcc-3.4.4-cross-compile.patch 1728
 MD5 2c355d808b490994c6566b10f3c0ba27 files/3.4.4/gcc-3.4.4-softfloat.patch 5242
 MD5 3a634a8482dd879e171f0e5bb49a7d8d files/4.0.2/gcc-4.0.2-cross-compile.patch 321
+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
@@ -68,7 +66,7 @@ MD5 ba7469d4f191ff1baa00b9dd45e3dc6b files/digest-gcc-3.4.3.20050110-r2 616
 MD5 fa32cd40c637c54b4e3b89dd4ed4c573 files/digest-gcc-3.4.4-r1 450
 MD5 f0c74f849066ffaefe7d364d69a71961 files/digest-gcc-4.0.1 380
 MD5 935eea1ace4e13688f89c88d75b38dbc files/digest-gcc-4.0.2-r1 381
-MD5 fc170c4619e3ac1e77cb186b90df77be files/digest-gcc-4.1.0_beta20051112 71
+MD5 44fa94e1d895254002b7cfae7b4f20e4 files/digest-gcc-4.1.0_beta20051125 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
@@ -97,12 +95,5 @@ MD5 769273e24a52732ce892d08ebeb4bbeb gcc-3.4.3.20050110-r2.ebuild 5240
 MD5 10e8245482e4da4ba16c6f589b5e7be8 gcc-3.4.4-r1.ebuild 5083
 MD5 c2611e7e7fdf69e451da52b22ef78815 gcc-4.0.1.ebuild 1889
 MD5 d51271215d0ed197a8cc47d5cf428ad2 gcc-4.0.2-r1.ebuild 2228
-MD5 de2e8bd6e456519fb9fd7ca2bf8c6481 gcc-4.1.0_beta20051112.ebuild 1995
+MD5 4c71799e57cfee87bb9c1834adfd80d4 gcc-4.1.0_beta20051125.ebuild 2047
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDgqnfgIKl8Uu19MoRAgflAJ40Jk8Yw89/Rr98jF9U/Z6ju5nFCQCeKnnJ
-S43mPi3b3RRtO5MnARm/ei4=
-=gyYj
------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
new file mode 100644
index 000000000000..9787a204ae29
--- /dev/null
+++ b/sys-devel/gcc/files/4.1.0/gcc-4.1.0-pr22313.patch
@@ -0,0 +1,65 @@
+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_beta20051112 b/sys-devel/gcc/files/digest-gcc-4.1.0_beta20051112
deleted file mode 100644
index 70c84c2f4767..000000000000
--- a/sys-devel/gcc/files/digest-gcc-4.1.0_beta20051112
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fc69d5b77c293724ce7bd527f7b0a888 gcc-4.1-20051112.tar.bz2 35920654
diff --git a/sys-devel/gcc/files/digest-gcc-4.1.0_beta20051125 b/sys-devel/gcc/files/digest-gcc-4.1.0_beta20051125
new file mode 100644
index 000000000000..2e1c318d2f9a
--- /dev/null
+++ b/sys-devel/gcc/files/digest-gcc-4.1.0_beta20051125
@@ -0,0 +1 @@
+MD5 0b39d8af48f968613976f85a87f25722 gcc-4.1-20051125.tar.bz2 36373559
diff --git a/sys-devel/gcc/gcc-4.1.0_beta20051112.ebuild b/sys-devel/gcc/gcc-4.1.0_beta20051125.ebuild
index 4258b3ccb6f6..18ce9001a978 100644
--- a/sys-devel/gcc/gcc-4.1.0_beta20051112.ebuild
+++ b/sys-devel/gcc/gcc-4.1.0_beta20051125.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_beta20051112.ebuild,v 1.3 2005/11/21 01:12:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.1.0_beta20051125.ebuild,v 1.1 2005/11/26 04:05:10 halcy0n Exp $
 
 ETYPE="gcc-compiler"
 
@@ -47,6 +47,7 @@ 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