4 files changed, 53 insertions, 20 deletions

diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index a6dd1ce2f920..a984ac09a339 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.3.0
-PORTREVISION=	20070209
+PORTREVISION=	20070216
 CATEGORIES=	lang java
 VERSIONSTRING=	4.3-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -103,7 +103,8 @@ EXTRA_PATCHES+=	${FILESDIR}/java-patch-hier
 # FIXME: we are currently getting weird build failures with libjava on
 # some 4.x and 5.x systems, which the following works around. PR 81788.
 CONFIGURE_ARGS+=--disable-rpath
-MAN1+=		gcj${SUFFIX}.1 \
+MAN1+=		gc-analyze${SUFFIX}.1 \
+		gcj${SUFFIX}.1 \
 		gcj-dbtool${SUFFIX}.1 \
 		gcjh${SUFFIX}.1 \
 		gij${SUFFIX}.1 \
diff --git a/lang/gcc43/distinfo b/lang/gcc43/distinfo
index fe2de6cec8b6..a4a52d4fad9f 100644
--- a/lang/gcc43/distinfo
+++ b/lang/gcc43/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.3-20070209.tar.bz2) = fc33f211584f16a65723b5b35cf76dbc
-SHA256 (gcc-core-4.3-20070209.tar.bz2) = 52674cc8a3b4cab8ca1251d67f7b6281271a6a9d2e25ed1a021ab820add46b3a
-SIZE (gcc-core-4.3-20070209.tar.bz2) = 16759657
-MD5 (gcc-fortran-4.3-20070209.tar.bz2) = c0ddb66673ebf59eb565dfcaaa98d88d
-SHA256 (gcc-fortran-4.3-20070209.tar.bz2) = 8c98bbcb9035e3a0bce67ccaa569fb1c82598d6b567907157ae9a3be6b0a3d9f
-SIZE (gcc-fortran-4.3-20070209.tar.bz2) = 927470
-MD5 (gcc-g++-4.3-20070209.tar.bz2) = 13148b14fed8e62e0eecd3ff1257d80a
-SHA256 (gcc-g++-4.3-20070209.tar.bz2) = 358a539e9fa1aad0763bc059498d6206086538d2078f8a5d5bb9e53d26d2c836
-SIZE (gcc-g++-4.3-20070209.tar.bz2) = 4839059
-MD5 (gcc-objc-4.3-20070209.tar.bz2) = e7dd58a1e5e65d016552c94780c22169
-SHA256 (gcc-objc-4.3-20070209.tar.bz2) = 661ac9dd8f99272527585157b198adc8eaf6cb12253a0c7c45b54c467e89b18b
-SIZE (gcc-objc-4.3-20070209.tar.bz2) = 192156
-MD5 (gcc-testsuite-4.3-20070209.tar.bz2) = 33763762d8e9d9cfda184a1ac6324f07
-SHA256 (gcc-testsuite-4.3-20070209.tar.bz2) = c2621ce88762031b8869516c0b29a822fc3932c5c80f92db02c28bd45018205d
-SIZE (gcc-testsuite-4.3-20070209.tar.bz2) = 3915884
-MD5 (gcc-java-4.3-20070209.tar.bz2) = 2faabb27d344f90bf750a5a14ee7d74f
-SHA256 (gcc-java-4.3-20070209.tar.bz2) = d79c4c6ec8fda77a06b61d5809aded6d3d26d460313155304c3cba398474949c
-SIZE (gcc-java-4.3-20070209.tar.bz2) = 17512562
+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
diff --git a/lang/gcc43/files/patch-gcc-local-alloc.c b/lang/gcc43/files/patch-gcc-local-alloc.c
new file mode 100644
index 000000000000..c0c257589b70
--- /dev/null
+++ b/lang/gcc43/files/patch-gcc-local-alloc.c
@@ -0,0 +1,31 @@
+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/pkg-plist b/lang/gcc43/pkg-plist
index 13e5c2a8a57d..22f2b5a41052 100644
--- a/lang/gcc43/pkg-plist
+++ b/lang/gcc43/pkg-plist
@@ -14,6 +14,7 @@ bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
 info/gcc%%SUFFIX%%/dir
 %%JAVA%%bin/addr2name.awk%%SUFFIX%%
 %%JAVA%%bin/gappletviewer%%SUFFIX%%
+%%JAVA%%bin/gc-analyze%%SUFFIX%%
 %%JAVA%%bin/gcj%%SUFFIX%%
 %%JAVA%%bin/gcj-dbtool%%SUFFIX%%
 %%JAVA%%bin/gij%%SUFFIX%%