Update to the 20070223 snapshot of GCC 4.3.0. No extra patch is needed

to build on i386 any longer.

21 files changed, 133 insertions, 350 deletions

diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index a984ac09a339..97019dc2c9c8 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.3.0
-PORTREVISION=	20070216
+PORTREVISION=	20070223
 CATEGORIES=	lang java
 VERSIONSTRING=	4.3-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
diff --git a/lang/gcc/distinfo b/lang/gcc/distinfo
index a4a52d4fad9f..bd5169cbb136 100644
--- a/lang/gcc/distinfo
+++ b/lang/gcc/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.3-20070216.tar.bz2) = 4f6efd7ad050402fa73098da8aa1674e
-SHA256 (gcc-core-4.3-20070216.tar.bz2) = ab953c81cbf383517e37725e9a364a52f2da85dfefa78c34aca2313097516c48
-SIZE (gcc-core-4.3-20070216.tar.bz2) = 16771360
-MD5 (gcc-fortran-4.3-20070216.tar.bz2) = 60205ac4d2fd4292449419057236d0f4
-SHA256 (gcc-fortran-4.3-20070216.tar.bz2) = 7e5d73296177d3796d199ac75a00cc646c10b1fcce8c34d4f715349c98000e67
-SIZE (gcc-fortran-4.3-20070216.tar.bz2) = 928472
-MD5 (gcc-g++-4.3-20070216.tar.bz2) = dbaa7c99841e4a0f7184cdd8d6130229
-SHA256 (gcc-g++-4.3-20070216.tar.bz2) = 996b1de5dadf4a40ed3e2f8a6fd7dcf836f82ad64e17489aeb6fded91d1917e7
-SIZE (gcc-g++-4.3-20070216.tar.bz2) = 4843709
-MD5 (gcc-objc-4.3-20070216.tar.bz2) = 742e4c599d8b4daeeddd4d94052f3dd2
-SHA256 (gcc-objc-4.3-20070216.tar.bz2) = 4a865d3340d74d6413911afb33e6b8938c10189ff163f4cafa1b3eb96c7981cb
-SIZE (gcc-objc-4.3-20070216.tar.bz2) = 192257
-MD5 (gcc-testsuite-4.3-20070216.tar.bz2) = 573ab6bf3d32789ad5b3c6faf1037ba9
-SHA256 (gcc-testsuite-4.3-20070216.tar.bz2) = d14641224a26ad9e007538eb442e74f9004f131ecc0f1de2a160dd9c1126812a
-SIZE (gcc-testsuite-4.3-20070216.tar.bz2) = 3922932
-MD5 (gcc-java-4.3-20070216.tar.bz2) = 9a2dc40b09f59e8ad95f894f01f1dde4
-SHA256 (gcc-java-4.3-20070216.tar.bz2) = 2525eba551a042ed2957afc79e545b738143dfccd308396c8758d72840122f27
-SIZE (gcc-java-4.3-20070216.tar.bz2) = 17561483
+MD5 (gcc-core-4.3-20070223.tar.bz2) = fd06d25c90db4d7332fd7e63f5c4b613
+SHA256 (gcc-core-4.3-20070223.tar.bz2) = ff0d5c255506bc1774081daab67b1e1c33cd3068a2289466a245d35c46852887
+SIZE (gcc-core-4.3-20070223.tar.bz2) = 16811265
+MD5 (gcc-fortran-4.3-20070223.tar.bz2) = c6da913069420a21a1f17a21dac1d9a6
+SHA256 (gcc-fortran-4.3-20070223.tar.bz2) = 79e323dc589454fca36c647736b26fdf870a3435a77bf9b165578a2b278c012a
+SIZE (gcc-fortran-4.3-20070223.tar.bz2) = 935525
+MD5 (gcc-g++-4.3-20070223.tar.bz2) = a8ce8fc72ffd296f37e182c65c588f0d
+SHA256 (gcc-g++-4.3-20070223.tar.bz2) = d0753c96efe53ee1250adb750ae74eb5e9770618f42d4e215fe70b1167958f58
+SIZE (gcc-g++-4.3-20070223.tar.bz2) = 4858175
+MD5 (gcc-objc-4.3-20070223.tar.bz2) = 41b1a18e502acc8063c35eebebaf2395
+SHA256 (gcc-objc-4.3-20070223.tar.bz2) = 684f46d88813df8353749a869153c4db502a424e1b0dde6b49b9046d9fc19479
+SIZE (gcc-objc-4.3-20070223.tar.bz2) = 192551
+MD5 (gcc-testsuite-4.3-20070223.tar.bz2) = 509a264a5ae5db13e54219218973d74a
+SHA256 (gcc-testsuite-4.3-20070223.tar.bz2) = 8f714ee1036384402c7d2efb0c1c89220d56f4bea27f6d8d36b060e2ec2dbdeb
+SIZE (gcc-testsuite-4.3-20070223.tar.bz2) = 3933166
+MD5 (gcc-java-4.3-20070223.tar.bz2) = 0ba2bcd61613abf862d2fc16d1c86c74
+SHA256 (gcc-java-4.3-20070223.tar.bz2) = 6d62f8e0123fb5f443c5de17e29d470c28314f5bc5fbfe4f716a73a95bf23d7b
+SIZE (gcc-java-4.3-20070223.tar.bz2) = 17571628
diff --git a/lang/gcc/files/patch-gcc-local-alloc.c b/lang/gcc/files/patch-gcc-local-alloc.c
deleted file mode 100644
index c0c257589b70..000000000000
--- a/lang/gcc/files/patch-gcc-local-alloc.c
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Steven Bosscher <stevenb.gcc@gmail.com>
-To:  <gcc-patches@gcc.gnu.org>
-Date: Sun, 18 Feb 2007 09:21:35 +0100
-Message-Id: <200702180921.35650.steven@gcc.gnu.org>
-Subject: [PATCH] Fix PR30773 and its duplicates
-
-[...]
-
-	* local-alloc.c (update_equiv_regs): Do not set reg_equiv_init
-	if we fail to attach a REG_EQUIV note.
-
-Index: gcc/local-alloc.c
-===================================================================
---- local-alloc.c       (revision 121823)
-+++ local-alloc.c       (working copy)
-@@ -1062,10 +1062,11 @@ update_equiv_regs (void)
-	{
-	  rtx init_insn = XEXP (reg_equiv[regno].init_insns, 0);
-	  if (validate_equiv_mem (init_insn, src, dest)
--	      && ! memref_used_between_p (dest, init_insn, insn))
-+	      && ! memref_used_between_p (dest, init_insn, insn)
-+	      /* Attaching a REG_EQUIV note will fail if INIT_INSN has
-+		 multiple sets.  */
-+	      && set_unique_reg_note (init_insn, REG_EQUIV, copy_rtx (dest)))
-	    {
--	      set_unique_reg_note (init_insn, REG_EQUIV, copy_rtx (dest));
--
-	      /* This insn makes the equivalence, not the one initializing
-		 the register.  */
-	      reg_equiv_init[regno]
-
diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index a984ac09a339..97019dc2c9c8 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.3.0
-PORTREVISION=	20070216
+PORTREVISION=	20070223
 CATEGORIES=	lang java
 VERSIONSTRING=	4.3-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
diff --git a/lang/gcc43/distinfo b/lang/gcc43/distinfo
index a4a52d4fad9f..bd5169cbb136 100644
--- a/lang/gcc43/distinfo
+++ b/lang/gcc43/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.3-20070216.tar.bz2) = 4f6efd7ad050402fa73098da8aa1674e
-SHA256 (gcc-core-4.3-20070216.tar.bz2) = ab953c81cbf383517e37725e9a364a52f2da85dfefa78c34aca2313097516c48
-SIZE (gcc-core-4.3-20070216.tar.bz2) = 16771360
-MD5 (gcc-fortran-4.3-20070216.tar.bz2) = 60205ac4d2fd4292449419057236d0f4
-SHA256 (gcc-fortran-4.3-20070216.tar.bz2) = 7e5d73296177d3796d199ac75a00cc646c10b1fcce8c34d4f715349c98000e67
-SIZE (gcc-fortran-4.3-20070216.tar.bz2) = 928472
-MD5 (gcc-g++-4.3-20070216.tar.bz2) = dbaa7c99841e4a0f7184cdd8d6130229
-SHA256 (gcc-g++-4.3-20070216.tar.bz2) = 996b1de5dadf4a40ed3e2f8a6fd7dcf836f82ad64e17489aeb6fded91d1917e7
-SIZE (gcc-g++-4.3-20070216.tar.bz2) = 4843709
-MD5 (gcc-objc-4.3-20070216.tar.bz2) = 742e4c599d8b4daeeddd4d94052f3dd2
-SHA256 (gcc-objc-4.3-20070216.tar.bz2) = 4a865d3340d74d6413911afb33e6b8938c10189ff163f4cafa1b3eb96c7981cb
-SIZE (gcc-objc-4.3-20070216.tar.bz2) = 192257
-MD5 (gcc-testsuite-4.3-20070216.tar.bz2) = 573ab6bf3d32789ad5b3c6faf1037ba9
-SHA256 (gcc-testsuite-4.3-20070216.tar.bz2) = d14641224a26ad9e007538eb442e74f9004f131ecc0f1de2a160dd9c1126812a
-SIZE (gcc-testsuite-4.3-20070216.tar.bz2) = 3922932
-MD5 (gcc-java-4.3-20070216.tar.bz2) = 9a2dc40b09f59e8ad95f894f01f1dde4
-SHA256 (gcc-java-4.3-20070216.tar.bz2) = 2525eba551a042ed2957afc79e545b738143dfccd308396c8758d72840122f27
-SIZE (gcc-java-4.3-20070216.tar.bz2) = 17561483
+MD5 (gcc-core-4.3-20070223.tar.bz2) = fd06d25c90db4d7332fd7e63f5c4b613
+SHA256 (gcc-core-4.3-20070223.tar.bz2) = ff0d5c255506bc1774081daab67b1e1c33cd3068a2289466a245d35c46852887
+SIZE (gcc-core-4.3-20070223.tar.bz2) = 16811265
+MD5 (gcc-fortran-4.3-20070223.tar.bz2) = c6da913069420a21a1f17a21dac1d9a6
+SHA256 (gcc-fortran-4.3-20070223.tar.bz2) = 79e323dc589454fca36c647736b26fdf870a3435a77bf9b165578a2b278c012a
+SIZE (gcc-fortran-4.3-20070223.tar.bz2) = 935525
+MD5 (gcc-g++-4.3-20070223.tar.bz2) = a8ce8fc72ffd296f37e182c65c588f0d
+SHA256 (gcc-g++-4.3-20070223.tar.bz2) = d0753c96efe53ee1250adb750ae74eb5e9770618f42d4e215fe70b1167958f58
+SIZE (gcc-g++-4.3-20070223.tar.bz2) = 4858175
+MD5 (gcc-objc-4.3-20070223.tar.bz2) = 41b1a18e502acc8063c35eebebaf2395
+SHA256 (gcc-objc-4.3-20070223.tar.bz2) = 684f46d88813df8353749a869153c4db502a424e1b0dde6b49b9046d9fc19479
+SIZE (gcc-objc-4.3-20070223.tar.bz2) = 192551
+MD5 (gcc-testsuite-4.3-20070223.tar.bz2) = 509a264a5ae5db13e54219218973d74a
+SHA256 (gcc-testsuite-4.3-20070223.tar.bz2) = 8f714ee1036384402c7d2efb0c1c89220d56f4bea27f6d8d36b060e2ec2dbdeb
+SIZE (gcc-testsuite-4.3-20070223.tar.bz2) = 3933166
+MD5 (gcc-java-4.3-20070223.tar.bz2) = 0ba2bcd61613abf862d2fc16d1c86c74
+SHA256 (gcc-java-4.3-20070223.tar.bz2) = 6d62f8e0123fb5f443c5de17e29d470c28314f5bc5fbfe4f716a73a95bf23d7b
+SIZE (gcc-java-4.3-20070223.tar.bz2) = 17571628
diff --git a/lang/gcc43/files/patch-gcc-local-alloc.c b/lang/gcc43/files/patch-gcc-local-alloc.c
deleted file mode 100644
index c0c257589b70..000000000000
--- a/lang/gcc43/files/patch-gcc-local-alloc.c
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Steven Bosscher <stevenb.gcc@gmail.com>
-To:  <gcc-patches@gcc.gnu.org>
-Date: Sun, 18 Feb 2007 09:21:35 +0100
-Message-Id: <200702180921.35650.steven@gcc.gnu.org>
-Subject: [PATCH] Fix PR30773 and its duplicates
-
-[...]
-
-	* local-alloc.c (update_equiv_regs): Do not set reg_equiv_init
-	if we fail to attach a REG_EQUIV note.
-
-Index: gcc/local-alloc.c
-===================================================================
---- local-alloc.c       (revision 121823)
-+++ local-alloc.c       (working copy)
-@@ -1062,10 +1062,11 @@ update_equiv_regs (void)
-	{
-	  rtx init_insn = XEXP (reg_equiv[regno].init_insns, 0);
-	  if (validate_equiv_mem (init_insn, src, dest)
--	      && ! memref_used_between_p (dest, init_insn, insn))
-+	      && ! memref_used_between_p (dest, init_insn, insn)
-+	      /* Attaching a REG_EQUIV note will fail if INIT_INSN has
-+		 multiple sets.  */
-+	      && set_unique_reg_note (init_insn, REG_EQUIV, copy_rtx (dest)))
-	    {
--	      set_unique_reg_note (init_insn, REG_EQUIV, copy_rtx (dest));
--
-	      /* This insn makes the equivalence, not the one initializing
-		 the register.  */
-	      reg_equiv_init[regno]
-
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index a984ac09a339..97019dc2c9c8 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.3.0
-PORTREVISION=	20070216
+PORTREVISION=	20070223
 CATEGORIES=	lang java
 VERSIONSTRING=	4.3-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
diff --git a/lang/gcc44/distinfo b/lang/gcc44/distinfo
index a4a52d4fad9f..bd5169cbb136 100644
--- a/lang/gcc44/distinfo
+++ b/lang/gcc44/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.3-20070216.tar.bz2) = 4f6efd7ad050402fa73098da8aa1674e
-SHA256 (gcc-core-4.3-20070216.tar.bz2) = ab953c81cbf383517e37725e9a364a52f2da85dfefa78c34aca2313097516c48
-SIZE (gcc-core-4.3-20070216.tar.bz2) = 16771360
-MD5 (gcc-fortran-4.3-20070216.tar.bz2) = 60205ac4d2fd4292449419057236d0f4
-SHA256 (gcc-fortran-4.3-20070216.tar.bz2) = 7e5d73296177d3796d199ac75a00cc646c10b1fcce8c34d4f715349c98000e67
-SIZE (gcc-fortran-4.3-20070216.tar.bz2) = 928472
-MD5 (gcc-g++-4.3-20070216.tar.bz2) = dbaa7c99841e4a0f7184cdd8d6130229
-SHA256 (gcc-g++-4.3-20070216.tar.bz2) = 996b1de5dadf4a40ed3e2f8a6fd7dcf836f82ad64e17489aeb6fded91d1917e7
-SIZE (gcc-g++-4.3-20070216.tar.bz2) = 4843709
-MD5 (gcc-objc-4.3-20070216.tar.bz2) = 742e4c599d8b4daeeddd4d94052f3dd2
-SHA256 (gcc-objc-4.3-20070216.tar.bz2) = 4a865d3340d74d6413911afb33e6b8938c10189ff163f4cafa1b3eb96c7981cb
-SIZE (gcc-objc-4.3-20070216.tar.bz2) = 192257
-MD5 (gcc-testsuite-4.3-20070216.tar.bz2) = 573ab6bf3d32789ad5b3c6faf1037ba9
-SHA256 (gcc-testsuite-4.3-20070216.tar.bz2) = d14641224a26ad9e007538eb442e74f9004f131ecc0f1de2a160dd9c1126812a
-SIZE (gcc-testsuite-4.3-20070216.tar.bz2) = 3922932
-MD5 (gcc-java-4.3-20070216.tar.bz2) = 9a2dc40b09f59e8ad95f894f01f1dde4
-SHA256 (gcc-java-4.3-20070216.tar.bz2) = 2525eba551a042ed2957afc79e545b738143dfccd308396c8758d72840122f27
-SIZE (gcc-java-4.3-20070216.tar.bz2) = 17561483
+MD5 (gcc-core-4.3-20070223.tar.bz2) = fd06d25c90db4d7332fd7e63f5c4b613
+SHA256 (gcc-core-4.3-20070223.tar.bz2) = ff0d5c255506bc1774081daab67b1e1c33cd3068a2289466a245d35c46852887
+SIZE (gcc-core-4.3-20070223.tar.bz2) = 16811265
+MD5 (gcc-fortran-4.3-20070223.tar.bz2) = c6da913069420a21a1f17a21dac1d9a6
+SHA256 (gcc-fortran-4.3-20070223.tar.bz2) = 79e323dc589454fca36c647736b26fdf870a3435a77bf9b165578a2b278c012a
+SIZE (gcc-fortran-4.3-20070223.tar.bz2) = 935525
+MD5 (gcc-g++-4.3-20070223.tar.bz2) = a8ce8fc72ffd296f37e182c65c588f0d
+SHA256 (gcc-g++-4.3-20070223.tar.bz2) = d0753c96efe53ee1250adb750ae74eb5e9770618f42d4e215fe70b1167958f58
+SIZE (gcc-g++-4.3-20070223.tar.bz2) = 4858175
+MD5 (gcc-objc-4.3-20070223.tar.bz2) = 41b1a18e502acc8063c35eebebaf2395
+SHA256 (gcc-objc-4.3-20070223.tar.bz2) = 684f46d88813df8353749a869153c4db502a424e1b0dde6b49b9046d9fc19479
+SIZE (gcc-objc-4.3-20070223.tar.bz2) = 192551
+MD5 (gcc-testsuite-4.3-20070223.tar.bz2) = 509a264a5ae5db13e54219218973d74a
+SHA256 (gcc-testsuite-4.3-20070223.tar.bz2) = 8f714ee1036384402c7d2efb0c1c89220d56f4bea27f6d8d36b060e2ec2dbdeb
+SIZE (gcc-testsuite-4.3-20070223.tar.bz2) = 3933166
+MD5 (gcc-java-4.3-20070223.tar.bz2) = 0ba2bcd61613abf862d2fc16d1c86c74
+SHA256 (gcc-java-4.3-20070223.tar.bz2) = 6d62f8e0123fb5f443c5de17e29d470c28314f5bc5fbfe4f716a73a95bf23d7b
+SIZE (gcc-java-4.3-20070223.tar.bz2) = 17571628
diff --git a/lang/gcc44/files/patch-gcc-local-alloc.c b/lang/gcc44/files/patch-gcc-local-alloc.c
deleted file mode 100644
index c0c257589b70..000000000000
--- a/lang/gcc44/files/patch-gcc-local-alloc.c
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Steven Bosscher <stevenb.gcc@gmail.com>
-To:  <gcc-patches@gcc.gnu.org>
-Date: Sun, 18 Feb 2007 09:21:35 +0100
-Message-Id: <200702180921.35650.steven@gcc.gnu.org>
-Subject: [PATCH] Fix PR30773 and its duplicates
-
-[...]
-
-	* local-alloc.c (update_equiv_regs): Do not set reg_equiv_init
-	if we fail to attach a REG_EQUIV note.
-
-Index: gcc/local-alloc.c
-===================================================================
---- local-alloc.c       (revision 121823)
-+++ local-alloc.c       (working copy)
-@@ -1062,10 +1062,11 @@ update_equiv_regs (void)
-	{
-	  rtx init_insn = XEXP (reg_equiv[regno].init_insns, 0);
-	  if (validate_equiv_mem (init_insn, src, dest)
--	      && ! memref_used_between_p (dest, init_insn, insn))
-+	      && ! memref_used_between_p (dest, init_insn, insn)
-+	      /* Attaching a REG_EQUIV note will fail if INIT_INSN has
-+		 multiple sets.  */
-+	      && set_unique_reg_note (init_insn, REG_EQUIV, copy_rtx (dest)))
-	    {
--	      set_unique_reg_note (init_insn, REG_EQUIV, copy_rtx (dest));
--
-	      /* This insn makes the equivalence, not the one initializing
-		 the register.  */
-	      reg_equiv_init[regno]
-
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index a984ac09a339..97019dc2c9c8 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.3.0
-PORTREVISION=	20070216
+PORTREVISION=	20070223
 CATEGORIES=	lang java
 VERSIONSTRING=	4.3-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
diff --git a/lang/gcc45/distinfo b/lang/gcc45/distinfo
index a4a52d4fad9f..bd5169cbb136 100644
--- a/lang/gcc45/distinfo
+++ b/lang/gcc45/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.3-20070216.tar.bz2) = 4f6efd7ad050402fa73098da8aa1674e
-SHA256 (gcc-core-4.3-20070216.tar.bz2) = ab953c81cbf383517e37725e9a364a52f2da85dfefa78c34aca2313097516c48
-SIZE (gcc-core-4.3-20070216.tar.bz2) = 16771360
-MD5 (gcc-fortran-4.3-20070216.tar.bz2) = 60205ac4d2fd4292449419057236d0f4
-SHA256 (gcc-fortran-4.3-20070216.tar.bz2) = 7e5d73296177d3796d199ac75a00cc646c10b1fcce8c34d4f715349c98000e67
-SIZE (gcc-fortran-4.3-20070216.tar.bz2) = 928472
-MD5 (gcc-g++-4.3-20070216.tar.bz2) = dbaa7c99841e4a0f7184cdd8d6130229
-SHA256 (gcc-g++-4.3-20070216.tar.bz2) = 996b1de5dadf4a40ed3e2f8a6fd7dcf836f82ad64e17489aeb6fded91d1917e7
-SIZE (gcc-g++-4.3-20070216.tar.bz2) = 4843709
-MD5 (gcc-objc-4.3-20070216.tar.bz2) = 742e4c599d8b4daeeddd4d94052f3dd2
-SHA256 (gcc-objc-4.3-20070216.tar.bz2) = 4a865d3340d74d6413911afb33e6b8938c10189ff163f4cafa1b3eb96c7981cb
-SIZE (gcc-objc-4.3-20070216.tar.bz2) = 192257
-MD5 (gcc-testsuite-4.3-20070216.tar.bz2) = 573ab6bf3d32789ad5b3c6faf1037ba9
-SHA256 (gcc-testsuite-4.3-20070216.tar.bz2) = d14641224a26ad9e007538eb442e74f9004f131ecc0f1de2a160dd9c1126812a
-SIZE (gcc-testsuite-4.3-20070216.tar.bz2) = 3922932
-MD5 (gcc-java-4.3-20070216.tar.bz2) = 9a2dc40b09f59e8ad95f894f01f1dde4
-SHA256 (gcc-java-4.3-20070216.tar.bz2) = 2525eba551a042ed2957afc79e545b738143dfccd308396c8758d72840122f27
-SIZE (gcc-java-4.3-20070216.tar.bz2) = 17561483
+MD5 (gcc-core-4.3-20070223.tar.bz2) = fd06d25c90db4d7332fd7e63f5c4b613
+SHA256 (gcc-core-4.3-20070223.tar.bz2) = ff0d5c255506bc1774081daab67b1e1c33cd3068a2289466a245d35c46852887
+SIZE (gcc-core-4.3-20070223.tar.bz2) = 16811265
+MD5 (gcc-fortran-4.3-20070223.tar.bz2) = c6da913069420a21a1f17a21dac1d9a6
+SHA256 (gcc-fortran-4.3-20070223.tar.bz2) = 79e323dc589454fca36c647736b26fdf870a3435a77bf9b165578a2b278c012a
+SIZE (gcc-fortran-4.3-20070223.tar.bz2) = 935525
+MD5 (gcc-g++-4.3-20070223.tar.bz2) = a8ce8fc72ffd296f37e182c65c588f0d
+SHA256 (gcc-g++-4.3-20070223.tar.bz2) = d0753c96efe53ee1250adb750ae74eb5e9770618f42d4e215fe70b1167958f58
+SIZE (gcc-g++-4.3-20070223.tar.bz2) = 4858175
+MD5 (gcc-objc-4.3-20070223.tar.bz2) = 41b1a18e502acc8063c35eebebaf2395
+SHA256 (gcc-objc-4.3-20070223.tar.bz2) = 684f46d88813df8353749a869153c4db502a424e1b0dde6b49b9046d9fc19479
+SIZE (gcc-objc-4.3-20070223.tar.bz2) = 192551
+MD5 (gcc-testsuite-4.3-20070223.tar.bz2) = 509a264a5ae5db13e54219218973d74a
+SHA256 (gcc-testsuite-4.3-20070223.tar.bz2) = 8f714ee1036384402c7d2efb0c1c89220d56f4bea27f6d8d36b060e2ec2dbdeb
+SIZE (gcc-testsuite-4.3-20070223.tar.bz2) = 3933166
+MD5 (gcc-java-4.3-20070223.tar.bz2) = 0ba2bcd61613abf862d2fc16d1c86c74
+SHA256 (gcc-java-4.3-20070223.tar.bz2) = 6d62f8e0123fb5f443c5de17e29d470c28314f5bc5fbfe4f716a73a95bf23d7b
+SIZE (gcc-java-4.3-20070223.tar.bz2) = 17571628
diff --git a/lang/gcc45/files/patch-gcc-local-alloc.c b/lang/gcc45/files/patch-gcc-local-alloc.c
deleted file mode 100644
index c0c257589b70..000000000000
--- a/lang/gcc45/files/patch-gcc-local-alloc.c
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Steven Bosscher <stevenb.gcc@gmail.com>
-To:  <gcc-patches@gcc.gnu.org>
-Date: Sun, 18 Feb 2007 09:21:35 +0100
-Message-Id: <200702180921.35650.steven@gcc.gnu.org>
-Subject: [PATCH] Fix PR30773 and its duplicates
-
-[...]
-
-	* local-alloc.c (update_equiv_regs): Do not set reg_equiv_init
-	if we fail to attach a REG_EQUIV note.
-
-Index: gcc/local-alloc.c
-===================================================================
---- local-alloc.c       (revision 121823)
-+++ local-alloc.c       (working copy)
-@@ -1062,10 +1062,11 @@ update_equiv_regs (void)
-	{
-	  rtx init_insn = XEXP (reg_equiv[regno].init_insns, 0);
-	  if (validate_equiv_mem (init_insn, src, dest)
--	      && ! memref_used_between_p (dest, init_insn, insn))
-+	      && ! memref_used_between_p (dest, init_insn, insn)
-+	      /* Attaching a REG_EQUIV note will fail if INIT_INSN has
-+		 multiple sets.  */
-+	      && set_unique_reg_note (init_insn, REG_EQUIV, copy_rtx (dest)))
-	    {
--	      set_unique_reg_note (init_insn, REG_EQUIV, copy_rtx (dest));
--
-	      /* This insn makes the equivalence, not the one initializing
-		 the register.  */
-	      reg_equiv_init[regno]
-
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index a984ac09a339..97019dc2c9c8 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.3.0
-PORTREVISION=	20070216
+PORTREVISION=	20070223
 CATEGORIES=	lang java
 VERSIONSTRING=	4.3-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
diff --git a/lang/gcc46/distinfo b/lang/gcc46/distinfo
index a4a52d4fad9f..bd5169cbb136 100644
--- a/lang/gcc46/distinfo
+++ b/lang/gcc46/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.3-20070216.tar.bz2) = 4f6efd7ad050402fa73098da8aa1674e
-SHA256 (gcc-core-4.3-20070216.tar.bz2) = ab953c81cbf383517e37725e9a364a52f2da85dfefa78c34aca2313097516c48
-SIZE (gcc-core-4.3-20070216.tar.bz2) = 16771360
-MD5 (gcc-fortran-4.3-20070216.tar.bz2) = 60205ac4d2fd4292449419057236d0f4
-SHA256 (gcc-fortran-4.3-20070216.tar.bz2) = 7e5d73296177d3796d199ac75a00cc646c10b1fcce8c34d4f715349c98000e67
-SIZE (gcc-fortran-4.3-20070216.tar.bz2) = 928472
-MD5 (gcc-g++-4.3-20070216.tar.bz2) = dbaa7c99841e4a0f7184cdd8d6130229
-SHA256 (gcc-g++-4.3-20070216.tar.bz2) = 996b1de5dadf4a40ed3e2f8a6fd7dcf836f82ad64e17489aeb6fded91d1917e7
-SIZE (gcc-g++-4.3-20070216.tar.bz2) = 4843709
-MD5 (gcc-objc-4.3-20070216.tar.bz2) = 742e4c599d8b4daeeddd4d94052f3dd2
-SHA256 (gcc-objc-4.3-20070216.tar.bz2) = 4a865d3340d74d6413911afb33e6b8938c10189ff163f4cafa1b3eb96c7981cb
-SIZE (gcc-objc-4.3-20070216.tar.bz2) = 192257
-MD5 (gcc-testsuite-4.3-20070216.tar.bz2) = 573ab6bf3d32789ad5b3c6faf1037ba9
-SHA256 (gcc-testsuite-4.3-20070216.tar.bz2) = d14641224a26ad9e007538eb442e74f9004f131ecc0f1de2a160dd9c1126812a
-SIZE (gcc-testsuite-4.3-20070216.tar.bz2) = 3922932
-MD5 (gcc-java-4.3-20070216.tar.bz2) = 9a2dc40b09f59e8ad95f894f01f1dde4
-SHA256 (gcc-java-4.3-20070216.tar.bz2) = 2525eba551a042ed2957afc79e545b738143dfccd308396c8758d72840122f27
-SIZE (gcc-java-4.3-20070216.tar.bz2) = 17561483
+MD5 (gcc-core-4.3-20070223.tar.bz2) = fd06d25c90db4d7332fd7e63f5c4b613
+SHA256 (gcc-core-4.3-20070223.tar.bz2) = ff0d5c255506bc1774081daab67b1e1c33cd3068a2289466a245d35c46852887
+SIZE (gcc-core-4.3-20070223.tar.bz2) = 16811265
+MD5 (gcc-fortran-4.3-20070223.tar.bz2) = c6da913069420a21a1f17a21dac1d9a6
+SHA256 (gcc-fortran-4.3-20070223.tar.bz2) = 79e323dc589454fca36c647736b26fdf870a3435a77bf9b165578a2b278c012a
+SIZE (gcc-fortran-4.3-20070223.tar.bz2) = 935525
+MD5 (gcc-g++-4.3-20070223.tar.bz2) = a8ce8fc72ffd296f37e182c65c588f0d
+SHA256 (gcc-g++-4.3-20070223.tar.bz2) = d0753c96efe53ee1250adb750ae74eb5e9770618f42d4e215fe70b1167958f58
+SIZE (gcc-g++-4.3-20070223.tar.bz2) = 4858175
+MD5 (gcc-objc-4.3-20070223.tar.bz2) = 41b1a18e502acc8063c35eebebaf2395
+SHA256 (gcc-objc-4.3-20070223.tar.bz2) = 684f46d88813df8353749a869153c4db502a424e1b0dde6b49b9046d9fc19479
+SIZE (gcc-objc-4.3-20070223.tar.bz2) = 192551
+MD5 (gcc-testsuite-4.3-20070223.tar.bz2) = 509a264a5ae5db13e54219218973d74a
+SHA256 (gcc-testsuite-4.3-20070223.tar.bz2) = 8f714ee1036384402c7d2efb0c1c89220d56f4bea27f6d8d36b060e2ec2dbdeb
+SIZE (gcc-testsuite-4.3-20070223.tar.bz2) = 3933166
+MD5 (gcc-java-4.3-20070223.tar.bz2) = 0ba2bcd61613abf862d2fc16d1c86c74
+SHA256 (gcc-java-4.3-20070223.tar.bz2) = 6d62f8e0123fb5f443c5de17e29d470c28314f5bc5fbfe4f716a73a95bf23d7b
+SIZE (gcc-java-4.3-20070223.tar.bz2) = 17571628
diff --git a/lang/gcc46/files/patch-gcc-local-alloc.c b/lang/gcc46/files/patch-gcc-local-alloc.c
deleted file mode 100644
index c0c257589b70..000000000000
--- a/lang/gcc46/files/patch-gcc-local-alloc.c
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Steven Bosscher <stevenb.gcc@gmail.com>
-To:  <gcc-patches@gcc.gnu.org>
-Date: Sun, 18 Feb 2007 09:21:35 +0100
-Message-Id: <200702180921.35650.steven@gcc.gnu.org>
-Subject: [PATCH] Fix PR30773 and its duplicates
-
-[...]
-
-	* local-alloc.c (update_equiv_regs): Do not set reg_equiv_init
-	if we fail to attach a REG_EQUIV note.
-
-Index: gcc/local-alloc.c
-===================================================================
---- local-alloc.c       (revision 121823)
-+++ local-alloc.c       (working copy)
-@@ -1062,10 +1062,11 @@ update_equiv_regs (void)
-	{
-	  rtx init_insn = XEXP (reg_equiv[regno].init_insns, 0);
-	  if (validate_equiv_mem (init_insn, src, dest)
--	      && ! memref_used_between_p (dest, init_insn, insn))
-+	      && ! memref_used_between_p (dest, init_insn, insn)
-+	      /* Attaching a REG_EQUIV note will fail if INIT_INSN has
-+		 multiple sets.  */
-+	      && set_unique_reg_note (init_insn, REG_EQUIV, copy_rtx (dest)))
-	    {
--	      set_unique_reg_note (init_insn, REG_EQUIV, copy_rtx (dest));
--
-	      /* This insn makes the equivalence, not the one initializing
-		 the register.  */
-	      reg_equiv_init[regno]
-
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index a984ac09a339..97019dc2c9c8 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.3.0
-PORTREVISION=	20070216
+PORTREVISION=	20070223
 CATEGORIES=	lang java
 VERSIONSTRING=	4.3-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
diff --git a/lang/gcc47/distinfo b/lang/gcc47/distinfo
index a4a52d4fad9f..bd5169cbb136 100644
--- a/lang/gcc47/distinfo
+++ b/lang/gcc47/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.3-20070216.tar.bz2) = 4f6efd7ad050402fa73098da8aa1674e
-SHA256 (gcc-core-4.3-20070216.tar.bz2) = ab953c81cbf383517e37725e9a364a52f2da85dfefa78c34aca2313097516c48
-SIZE (gcc-core-4.3-20070216.tar.bz2) = 16771360
-MD5 (gcc-fortran-4.3-20070216.tar.bz2) = 60205ac4d2fd4292449419057236d0f4
-SHA256 (gcc-fortran-4.3-20070216.tar.bz2) = 7e5d73296177d3796d199ac75a00cc646c10b1fcce8c34d4f715349c98000e67
-SIZE (gcc-fortran-4.3-20070216.tar.bz2) = 928472
-MD5 (gcc-g++-4.3-20070216.tar.bz2) = dbaa7c99841e4a0f7184cdd8d6130229
-SHA256 (gcc-g++-4.3-20070216.tar.bz2) = 996b1de5dadf4a40ed3e2f8a6fd7dcf836f82ad64e17489aeb6fded91d1917e7
-SIZE (gcc-g++-4.3-20070216.tar.bz2) = 4843709
-MD5 (gcc-objc-4.3-20070216.tar.bz2) = 742e4c599d8b4daeeddd4d94052f3dd2
-SHA256 (gcc-objc-4.3-20070216.tar.bz2) = 4a865d3340d74d6413911afb33e6b8938c10189ff163f4cafa1b3eb96c7981cb
-SIZE (gcc-objc-4.3-20070216.tar.bz2) = 192257
-MD5 (gcc-testsuite-4.3-20070216.tar.bz2) = 573ab6bf3d32789ad5b3c6faf1037ba9
-SHA256 (gcc-testsuite-4.3-20070216.tar.bz2) = d14641224a26ad9e007538eb442e74f9004f131ecc0f1de2a160dd9c1126812a
-SIZE (gcc-testsuite-4.3-20070216.tar.bz2) = 3922932
-MD5 (gcc-java-4.3-20070216.tar.bz2) = 9a2dc40b09f59e8ad95f894f01f1dde4
-SHA256 (gcc-java-4.3-20070216.tar.bz2) = 2525eba551a042ed2957afc79e545b738143dfccd308396c8758d72840122f27
-SIZE (gcc-java-4.3-20070216.tar.bz2) = 17561483
+MD5 (gcc-core-4.3-20070223.tar.bz2) = fd06d25c90db4d7332fd7e63f5c4b613
+SHA256 (gcc-core-4.3-20070223.tar.bz2) = ff0d5c255506bc1774081daab67b1e1c33cd3068a2289466a245d35c46852887
+SIZE (gcc-core-4.3-20070223.tar.bz2) = 16811265
+MD5 (gcc-fortran-4.3-20070223.tar.bz2) = c6da913069420a21a1f17a21dac1d9a6
+SHA256 (gcc-fortran-4.3-20070223.tar.bz2) = 79e323dc589454fca36c647736b26fdf870a3435a77bf9b165578a2b278c012a
+SIZE (gcc-fortran-4.3-20070223.tar.bz2) = 935525
+MD5 (gcc-g++-4.3-20070223.tar.bz2) = a8ce8fc72ffd296f37e182c65c588f0d
+SHA256 (gcc-g++-4.3-20070223.tar.bz2) = d0753c96efe53ee1250adb750ae74eb5e9770618f42d4e215fe70b1167958f58
+SIZE (gcc-g++-4.3-20070223.tar.bz2) = 4858175
+MD5 (gcc-objc-4.3-20070223.tar.bz2) = 41b1a18e502acc8063c35eebebaf2395
+SHA256 (gcc-objc-4.3-20070223.tar.bz2) = 684f46d88813df8353749a869153c4db502a424e1b0dde6b49b9046d9fc19479
+SIZE (gcc-objc-4.3-20070223.tar.bz2) = 192551
+MD5 (gcc-testsuite-4.3-20070223.tar.bz2) = 509a264a5ae5db13e54219218973d74a
+SHA256 (gcc-testsuite-4.3-20070223.tar.bz2) = 8f714ee1036384402c7d2efb0c1c89220d56f4bea27f6d8d36b060e2ec2dbdeb
+SIZE (gcc-testsuite-4.3-20070223.tar.bz2) = 3933166
+MD5 (gcc-java-4.3-20070223.tar.bz2) = 0ba2bcd61613abf862d2fc16d1c86c74
+SHA256 (gcc-java-4.3-20070223.tar.bz2) = 6d62f8e0123fb5f443c5de17e29d470c28314f5bc5fbfe4f716a73a95bf23d7b
+SIZE (gcc-java-4.3-20070223.tar.bz2) = 17571628
diff --git a/lang/gcc47/files/patch-gcc-local-alloc.c b/lang/gcc47/files/patch-gcc-local-alloc.c
deleted file mode 100644
index c0c257589b70..000000000000
--- a/lang/gcc47/files/patch-gcc-local-alloc.c
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Steven Bosscher <stevenb.gcc@gmail.com>
-To:  <gcc-patches@gcc.gnu.org>
-Date: Sun, 18 Feb 2007 09:21:35 +0100
-Message-Id: <200702180921.35650.steven@gcc.gnu.org>
-Subject: [PATCH] Fix PR30773 and its duplicates
-
-[...]
-
-	* local-alloc.c (update_equiv_regs): Do not set reg_equiv_init
-	if we fail to attach a REG_EQUIV note.
-
-Index: gcc/local-alloc.c
-===================================================================
---- local-alloc.c       (revision 121823)
-+++ local-alloc.c       (working copy)
-@@ -1062,10 +1062,11 @@ update_equiv_regs (void)
-	{
-	  rtx init_insn = XEXP (reg_equiv[regno].init_insns, 0);
-	  if (validate_equiv_mem (init_insn, src, dest)
--	      && ! memref_used_between_p (dest, init_insn, insn))
-+	      && ! memref_used_between_p (dest, init_insn, insn)
-+	      /* Attaching a REG_EQUIV note will fail if INIT_INSN has
-+		 multiple sets.  */
-+	      && set_unique_reg_note (init_insn, REG_EQUIV, copy_rtx (dest)))
-	    {
--	      set_unique_reg_note (init_insn, REG_EQUIV, copy_rtx (dest));
--
-	      /* This insn makes the equivalence, not the one initializing
-		 the register.  */
-	      reg_equiv_init[regno]
-
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index a984ac09a339..97019dc2c9c8 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.3.0
-PORTREVISION=	20070216
+PORTREVISION=	20070223
 CATEGORIES=	lang java
 VERSIONSTRING=	4.3-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
diff --git a/lang/gcc48/distinfo b/lang/gcc48/distinfo
index a4a52d4fad9f..bd5169cbb136 100644
--- a/lang/gcc48/distinfo
+++ b/lang/gcc48/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.3-20070216.tar.bz2) = 4f6efd7ad050402fa73098da8aa1674e
-SHA256 (gcc-core-4.3-20070216.tar.bz2) = ab953c81cbf383517e37725e9a364a52f2da85dfefa78c34aca2313097516c48
-SIZE (gcc-core-4.3-20070216.tar.bz2) = 16771360
-MD5 (gcc-fortran-4.3-20070216.tar.bz2) = 60205ac4d2fd4292449419057236d0f4
-SHA256 (gcc-fortran-4.3-20070216.tar.bz2) = 7e5d73296177d3796d199ac75a00cc646c10b1fcce8c34d4f715349c98000e67
-SIZE (gcc-fortran-4.3-20070216.tar.bz2) = 928472
-MD5 (gcc-g++-4.3-20070216.tar.bz2) = dbaa7c99841e4a0f7184cdd8d6130229
-SHA256 (gcc-g++-4.3-20070216.tar.bz2) = 996b1de5dadf4a40ed3e2f8a6fd7dcf836f82ad64e17489aeb6fded91d1917e7
-SIZE (gcc-g++-4.3-20070216.tar.bz2) = 4843709
-MD5 (gcc-objc-4.3-20070216.tar.bz2) = 742e4c599d8b4daeeddd4d94052f3dd2
-SHA256 (gcc-objc-4.3-20070216.tar.bz2) = 4a865d3340d74d6413911afb33e6b8938c10189ff163f4cafa1b3eb96c7981cb
-SIZE (gcc-objc-4.3-20070216.tar.bz2) = 192257
-MD5 (gcc-testsuite-4.3-20070216.tar.bz2) = 573ab6bf3d32789ad5b3c6faf1037ba9
-SHA256 (gcc-testsuite-4.3-20070216.tar.bz2) = d14641224a26ad9e007538eb442e74f9004f131ecc0f1de2a160dd9c1126812a
-SIZE (gcc-testsuite-4.3-20070216.tar.bz2) = 3922932
-MD5 (gcc-java-4.3-20070216.tar.bz2) = 9a2dc40b09f59e8ad95f894f01f1dde4
-SHA256 (gcc-java-4.3-20070216.tar.bz2) = 2525eba551a042ed2957afc79e545b738143dfccd308396c8758d72840122f27
-SIZE (gcc-java-4.3-20070216.tar.bz2) = 17561483
+MD5 (gcc-core-4.3-20070223.tar.bz2) = fd06d25c90db4d7332fd7e63f5c4b613
+SHA256 (gcc-core-4.3-20070223.tar.bz2) = ff0d5c255506bc1774081daab67b1e1c33cd3068a2289466a245d35c46852887
+SIZE (gcc-core-4.3-20070223.tar.bz2) = 16811265
+MD5 (gcc-fortran-4.3-20070223.tar.bz2) = c6da913069420a21a1f17a21dac1d9a6
+SHA256 (gcc-fortran-4.3-20070223.tar.bz2) = 79e323dc589454fca36c647736b26fdf870a3435a77bf9b165578a2b278c012a
+SIZE (gcc-fortran-4.3-20070223.tar.bz2) = 935525
+MD5 (gcc-g++-4.3-20070223.tar.bz2) = a8ce8fc72ffd296f37e182c65c588f0d
+SHA256 (gcc-g++-4.3-20070223.tar.bz2) = d0753c96efe53ee1250adb750ae74eb5e9770618f42d4e215fe70b1167958f58
+SIZE (gcc-g++-4.3-20070223.tar.bz2) = 4858175
+MD5 (gcc-objc-4.3-20070223.tar.bz2) = 41b1a18e502acc8063c35eebebaf2395
+SHA256 (gcc-objc-4.3-20070223.tar.bz2) = 684f46d88813df8353749a869153c4db502a424e1b0dde6b49b9046d9fc19479
+SIZE (gcc-objc-4.3-20070223.tar.bz2) = 192551
+MD5 (gcc-testsuite-4.3-20070223.tar.bz2) = 509a264a5ae5db13e54219218973d74a
+SHA256 (gcc-testsuite-4.3-20070223.tar.bz2) = 8f714ee1036384402c7d2efb0c1c89220d56f4bea27f6d8d36b060e2ec2dbdeb
+SIZE (gcc-testsuite-4.3-20070223.tar.bz2) = 3933166
+MD5 (gcc-java-4.3-20070223.tar.bz2) = 0ba2bcd61613abf862d2fc16d1c86c74
+SHA256 (gcc-java-4.3-20070223.tar.bz2) = 6d62f8e0123fb5f443c5de17e29d470c28314f5bc5fbfe4f716a73a95bf23d7b
+SIZE (gcc-java-4.3-20070223.tar.bz2) = 17571628
diff --git a/lang/gcc48/files/patch-gcc-local-alloc.c b/lang/gcc48/files/patch-gcc-local-alloc.c
deleted file mode 100644
index c0c257589b70..000000000000
--- a/lang/gcc48/files/patch-gcc-local-alloc.c
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Steven Bosscher <stevenb.gcc@gmail.com>
-To:  <gcc-patches@gcc.gnu.org>
-Date: Sun, 18 Feb 2007 09:21:35 +0100
-Message-Id: <200702180921.35650.steven@gcc.gnu.org>
-Subject: [PATCH] Fix PR30773 and its duplicates
-
-[...]
-
-	* local-alloc.c (update_equiv_regs): Do not set reg_equiv_init
-	if we fail to attach a REG_EQUIV note.
-
-Index: gcc/local-alloc.c
-===================================================================
---- local-alloc.c       (revision 121823)
-+++ local-alloc.c       (working copy)
-@@ -1062,10 +1062,11 @@ update_equiv_regs (void)
-	{
-	  rtx init_insn = XEXP (reg_equiv[regno].init_insns, 0);
-	  if (validate_equiv_mem (init_insn, src, dest)
--	      && ! memref_used_between_p (dest, init_insn, insn))
-+	      && ! memref_used_between_p (dest, init_insn, insn)
-+	      /* Attaching a REG_EQUIV note will fail if INIT_INSN has
-+		 multiple sets.  */
-+	      && set_unique_reg_note (init_insn, REG_EQUIV, copy_rtx (dest)))
-	    {
--	      set_unique_reg_note (init_insn, REG_EQUIV, copy_rtx (dest));
--
-	      /* This insn makes the equivalence, not the one initializing
-		 the register.  */
-	      reg_equiv_init[regno]
-