update to 3.3.1

21 files changed, 36 insertions, 140 deletions

diff --git a/lang/gcc3-ada/Makefile b/lang/gcc3-ada/Makefile
index eadfc37f66b..55c9a420572 100644
--- a/lang/gcc3-ada/Makefile
+++ b/lang/gcc3-ada/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2003/08/08 09:31:01 grant Exp $
+# $NetBSD: Makefile,v 1.6 2003/08/11 14:15:58 drochner Exp $
 #
 
-PKGNAME=		gcc3${GCC3_PKGMODIF}-ada-3.3
+PKGNAME=		gcc3${GCC3_PKGMODIF}-ada-${GCC_VERSION}
 COMMENT=		GNU Compiler Collection, version 3, Ada compiler
 
 INFO_FILES=	gnat_ug_unx.info gnat_ug_vms.info gnat_ug_vxw.info
diff --git a/lang/gcc3-ada/distinfo b/lang/gcc3-ada/distinfo
index 815d54928c0..adace45bfec 100644
--- a/lang/gcc3-ada/distinfo
+++ b/lang/gcc3-ada/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.4 2003/07/16 18:19:35 drochner Exp $
+$NetBSD: distinfo,v 1.5 2003/08/11 14:15:58 drochner Exp $
 
-SHA1 (gcc-3.3.tar.bz2) = 18e23822c6dc9cb462e0ff88bc1b8a20c53da60a
-Size (gcc-3.3.tar.bz2) = 23447616 bytes
+SHA1 (gcc-3.3.1.tar.bz2) = 65ba4142dbf345d1aac1ed323f64b5f49294aee7
+Size (gcc-3.3.1.tar.bz2) = 23544362 bytes
 SHA1 (patch-aa) = 541cd543720cccc24aa60b9ac26cfa6143e7e5d4
 SHA1 (patch-ad) = 80fead3fdfba3f93a89a7294b45f9633454d35fb
 SHA1 (patch-ae) = a2da480a15cc57c486a8f25501c6f210cdbb615d
-SHA1 (patch-ba) = 9037d2504c5db6458494a18852d57c1ef5c9dcdb
diff --git a/lang/gcc3-ada/patches/patch-ba b/lang/gcc3-ada/patches/patch-ba
deleted file mode 100644
index 5ab4f7ce1c3..00000000000
--- a/lang/gcc3-ada/patches/patch-ba
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2003/07/09 15:23:54 drochner Exp $
-
---- gcc/unroll.c.orig	2003-03-25 20:23:07.000000000 +0000
-+++ gcc/unroll.c
-@@ -792,9 +792,9 @@ unroll_loop (loop, insn_count, strength_
-       /* We must limit the generic test to max_reg_before_loop, because only
- 	 these pseudo registers have valid regno_first_uid info.  */
-       for (r = FIRST_PSEUDO_REGISTER; r < max_reg_before_loop; ++r)
--	if (REGNO_FIRST_UID (r) > 0 && REGNO_FIRST_UID (r) <= max_uid_for_loop
-+	if (REGNO_FIRST_UID (r) > 0 && REGNO_FIRST_UID (r) < max_uid_for_loop
- 	    && REGNO_FIRST_LUID (r) >= copy_start_luid
--	    && REGNO_LAST_UID (r) > 0 && REGNO_LAST_UID (r) <= max_uid_for_loop
-+	    && REGNO_LAST_UID (r) > 0 && REGNO_LAST_UID (r) < max_uid_for_loop
- 	    && REGNO_LAST_LUID (r) <= copy_end_luid)
- 	  {
- 	    /* However, we must also check for loop-carried dependencies.
diff --git a/lang/gcc3-c++/Makefile b/lang/gcc3-c++/Makefile
index 9f3fd68bc09..8fac4decc5c 100644
--- a/lang/gcc3-c++/Makefile
+++ b/lang/gcc3-c++/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2003/08/08 09:31:02 grant Exp $
+# $NetBSD: Makefile,v 1.7 2003/08/11 14:16:02 drochner Exp $
 #
 
-PKGNAME=		gcc3${GCC3_PKGMODIF}-c++-3.3
-PKGREVISION=		1
+PKGNAME=		gcc3${GCC3_PKGMODIF}-c++-${GCC_VERSION}
 COMMENT=		GNU Compiler Collection, version 3, c++ compiler
 
 .include "../gcc3-c/buildaddon.mk"
diff --git a/lang/gcc3-c++/PLIST b/lang/gcc3-c++/PLIST
index 13069346b97..e241ed5fa2d 100644
--- a/lang/gcc3-c++/PLIST
+++ b/lang/gcc3-c++/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/07/08 15:04:59 drochner Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/08/11 14:16:02 drochner Exp $
 ${GCC_SUBPREFIX}/bin/c++
 ${GCC_SUBPREFIX}/bin/g++
 ${GCC_SUBPREFIX}/bin/${GCC_PLATFORM}-c++
@@ -194,7 +194,7 @@ ${GCC_SUBPREFIX}/lib/libstdc++.a
 ${GCC_SUBPREFIX}/lib/libstdc++.la
 ${GCC_SUBPREFIX}/lib/libstdc++.so
 ${GCC_SUBPREFIX}/lib/libstdc++.so.5
-${GCC_SUBPREFIX}/lib/libstdc++.so.5.4
+${GCC_SUBPREFIX}/lib/libstdc++.so.5.5
 ${GCC_SUBPREFIX}/lib/libsupc++.a
 ${GCC_SUBPREFIX}/lib/libsupc++.la
 ${GCC_SUBPREFIX}/man/man1/g++.1
diff --git a/lang/gcc3-c++/distinfo b/lang/gcc3-c++/distinfo
index 56e98f8f0cd..6b6265c83e4 100644
--- a/lang/gcc3-c++/distinfo
+++ b/lang/gcc3-c++/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.4 2003/07/29 09:02:49 martin Exp $
+$NetBSD: distinfo,v 1.5 2003/08/11 14:16:02 drochner Exp $
 
-SHA1 (gcc-3.3.tar.bz2) = 18e23822c6dc9cb462e0ff88bc1b8a20c53da60a
-Size (gcc-3.3.tar.bz2) = 23447616 bytes
+SHA1 (gcc-3.3.1.tar.bz2) = 65ba4142dbf345d1aac1ed323f64b5f49294aee7
+Size (gcc-3.3.1.tar.bz2) = 23544362 bytes
 SHA1 (patch-aa) = 93a4299e7d64b91f750ba96c75f0487cdf87abea
 SHA1 (patch-af) = ee41c43dbb6e710a9399954793c6ff7c4274e515
 SHA1 (patch-ag) = 23fecd85ddca19a2c543827b60ea555ffbdcaa6c
-SHA1 (patch-ba) = 9037d2504c5db6458494a18852d57c1ef5c9dcdb
diff --git a/lang/gcc3-c++/patches/patch-ba b/lang/gcc3-c++/patches/patch-ba
deleted file mode 100644
index b306c8d0d02..00000000000
--- a/lang/gcc3-c++/patches/patch-ba
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2003/07/09 15:23:57 drochner Exp $
-
---- gcc/unroll.c.orig	2003-03-25 20:23:07.000000000 +0000
-+++ gcc/unroll.c
-@@ -792,9 +792,9 @@ unroll_loop (loop, insn_count, strength_
-       /* We must limit the generic test to max_reg_before_loop, because only
- 	 these pseudo registers have valid regno_first_uid info.  */
-       for (r = FIRST_PSEUDO_REGISTER; r < max_reg_before_loop; ++r)
--	if (REGNO_FIRST_UID (r) > 0 && REGNO_FIRST_UID (r) <= max_uid_for_loop
-+	if (REGNO_FIRST_UID (r) > 0 && REGNO_FIRST_UID (r) < max_uid_for_loop
- 	    && REGNO_FIRST_LUID (r) >= copy_start_luid
--	    && REGNO_LAST_UID (r) > 0 && REGNO_LAST_UID (r) <= max_uid_for_loop
-+	    && REGNO_LAST_UID (r) > 0 && REGNO_LAST_UID (r) < max_uid_for_loop
- 	    && REGNO_LAST_LUID (r) <= copy_end_luid)
- 	  {
- 	    /* However, we must also check for loop-carried dependencies.
diff --git a/lang/gcc3-c/Makefile b/lang/gcc3-c/Makefile
index 4227a749607..400723ca9ef 100644
--- a/lang/gcc3-c/Makefile
+++ b/lang/gcc3-c/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2003/08/08 09:31:02 grant Exp $
+# $NetBSD: Makefile,v 1.7 2003/08/11 14:16:00 drochner Exp $
 #
 
 PKGNAME=		gcc3${GCC3_PKGMODIF}-c-${GCC_VERSION}
-PKGREVISION=		1
 COMMENT=		GNU Compiler Collection, version 3, C compiler
 
 INFO_FILES=	cpp.info gcc.info gccint.info cppinternals.info
diff --git a/lang/gcc3-c/Makefile.common b/lang/gcc3-c/Makefile.common
index e27cf666c0e..98525d10996 100644
--- a/lang/gcc3-c/Makefile.common
+++ b/lang/gcc3-c/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.5 2003/08/09 10:59:13 seb Exp $
+# $NetBSD: Makefile.common,v 1.6 2003/08/11 14:16:01 drochner Exp $
 #
 
-GCC_VERSION=	3.3
+GCC_VERSION=	3.3.1
 DISTNAME=	gcc-${GCC_VERSION}
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/}
diff --git a/lang/gcc3-c/buildaddon.mk b/lang/gcc3-c/buildaddon.mk
index 2392f346507..10ea76821d0 100644
--- a/lang/gcc3-c/buildaddon.mk
+++ b/lang/gcc3-c/buildaddon.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildaddon.mk,v 1.4 2003/07/23 09:48:44 drochner Exp $
+# $NetBSD: buildaddon.mk,v 1.5 2003/08/11 14:16:01 drochner Exp $
 
 .include "../../lang/gcc3-c/Makefile.common"
 
@@ -7,7 +7,7 @@ pre-build:
 	${LN} -sf ${GCC_PREFIX}/lib/libiberty.a ${WRKSRC}/libiberty
 	${LN} -sf ${GCC_PREFIX}/bin/gcc ${WRKSRC}/gcc/xgcc
 
-BUILDLINK_DEPENDS.gcc3c?=	gcc3${GCC3_PKGMODIF}-c-3.3nb1
+BUILDLINK_DEPENDS.gcc3c?=	gcc3${GCC3_PKGMODIF}-c-3.3.1
 BUILDLINK_PKGSRCDIR.gcc3c?=	../../lang/gcc3-c
 
 BUILDLINK_PREFIX.gcc3c=	${LOCALBASE}
diff --git a/lang/gcc3-c/distinfo b/lang/gcc3-c/distinfo
index db5c5f3a3be..c55923d89b4 100644
--- a/lang/gcc3-c/distinfo
+++ b/lang/gcc3-c/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.4 2003/07/29 09:05:54 martin Exp $
+$NetBSD: distinfo,v 1.5 2003/08/11 14:16:01 drochner Exp $
 
-SHA1 (gcc-3.3.tar.bz2) = 18e23822c6dc9cb462e0ff88bc1b8a20c53da60a
-Size (gcc-3.3.tar.bz2) = 23447616 bytes
+SHA1 (gcc-3.3.1.tar.bz2) = 65ba4142dbf345d1aac1ed323f64b5f49294aee7
+Size (gcc-3.3.1.tar.bz2) = 23544362 bytes
 SHA1 (patch-ab) = f0795e3792cd5200140bc19e291a2616b7d31468
 SHA1 (patch-ae) = e5dd184ca1b0c415215e82d0250469792a432741
 SHA1 (patch-af) = ee41c43dbb6e710a9399954793c6ff7c4274e515
 SHA1 (patch-ag) = 23fecd85ddca19a2c543827b60ea555ffbdcaa6c
 SHA1 (patch-ai) = bb9f4975769cd104b25b4609a1d4c888bb147bb1
-SHA1 (patch-ba) = 9037d2504c5db6458494a18852d57c1ef5c9dcdb
diff --git a/lang/gcc3-c/patches/patch-ba b/lang/gcc3-c/patches/patch-ba
deleted file mode 100644
index 40a450bd742..00000000000
--- a/lang/gcc3-c/patches/patch-ba
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2003/07/09 15:14:43 drochner Exp $
-
---- gcc/unroll.c.orig	2003-03-25 20:23:07.000000000 +0000
-+++ gcc/unroll.c
-@@ -792,9 +792,9 @@ unroll_loop (loop, insn_count, strength_
-       /* We must limit the generic test to max_reg_before_loop, because only
- 	 these pseudo registers have valid regno_first_uid info.  */
-       for (r = FIRST_PSEUDO_REGISTER; r < max_reg_before_loop; ++r)
--	if (REGNO_FIRST_UID (r) > 0 && REGNO_FIRST_UID (r) <= max_uid_for_loop
-+	if (REGNO_FIRST_UID (r) > 0 && REGNO_FIRST_UID (r) < max_uid_for_loop
- 	    && REGNO_FIRST_LUID (r) >= copy_start_luid
--	    && REGNO_LAST_UID (r) > 0 && REGNO_LAST_UID (r) <= max_uid_for_loop
-+	    && REGNO_LAST_UID (r) > 0 && REGNO_LAST_UID (r) < max_uid_for_loop
- 	    && REGNO_LAST_LUID (r) <= copy_end_luid)
- 	  {
- 	    /* However, we must also check for loop-carried dependencies.
diff --git a/lang/gcc3-f77/Makefile b/lang/gcc3-f77/Makefile
index a95cd97a934..d57a16ec647 100644
--- a/lang/gcc3-f77/Makefile
+++ b/lang/gcc3-f77/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2003/08/08 09:31:02 grant Exp $
+# $NetBSD: Makefile,v 1.6 2003/08/11 14:16:04 drochner Exp $
 #
 
-PKGNAME=		gcc3${GCC3_PKGMODIF}-f77-3.3
+PKGNAME=		gcc3${GCC3_PKGMODIF}-f77-${GCC_VERSION}
 COMMENT=		GNU Compiler Collection, version 3, f77 compiler
 
 INFO_FILES=		g77.info
diff --git a/lang/gcc3-f77/distinfo b/lang/gcc3-f77/distinfo
index 837d9508a9b..98c3f5f038c 100644
--- a/lang/gcc3-f77/distinfo
+++ b/lang/gcc3-f77/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.3 2003/07/09 15:23:57 drochner Exp $
+$NetBSD: distinfo,v 1.4 2003/08/11 14:16:04 drochner Exp $
 
-SHA1 (gcc-3.3.tar.bz2) = 18e23822c6dc9cb462e0ff88bc1b8a20c53da60a
-Size (gcc-3.3.tar.bz2) = 23447616 bytes
+SHA1 (gcc-3.3.1.tar.bz2) = 65ba4142dbf345d1aac1ed323f64b5f49294aee7
+Size (gcc-3.3.1.tar.bz2) = 23544362 bytes
 SHA1 (patch-aa) = 541cd543720cccc24aa60b9ac26cfa6143e7e5d4
-SHA1 (patch-ba) = 9037d2504c5db6458494a18852d57c1ef5c9dcdb
diff --git a/lang/gcc3-f77/patches/patch-ba b/lang/gcc3-f77/patches/patch-ba
deleted file mode 100644
index d2775b9bb41..00000000000
--- a/lang/gcc3-f77/patches/patch-ba
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2003/07/09 15:23:58 drochner Exp $
-
---- gcc/unroll.c.orig	2003-03-25 20:23:07.000000000 +0000
-+++ gcc/unroll.c
-@@ -792,9 +792,9 @@ unroll_loop (loop, insn_count, strength_
-       /* We must limit the generic test to max_reg_before_loop, because only
- 	 these pseudo registers have valid regno_first_uid info.  */
-       for (r = FIRST_PSEUDO_REGISTER; r < max_reg_before_loop; ++r)
--	if (REGNO_FIRST_UID (r) > 0 && REGNO_FIRST_UID (r) <= max_uid_for_loop
-+	if (REGNO_FIRST_UID (r) > 0 && REGNO_FIRST_UID (r) < max_uid_for_loop
- 	    && REGNO_FIRST_LUID (r) >= copy_start_luid
--	    && REGNO_LAST_UID (r) > 0 && REGNO_LAST_UID (r) <= max_uid_for_loop
-+	    && REGNO_LAST_UID (r) > 0 && REGNO_LAST_UID (r) < max_uid_for_loop
- 	    && REGNO_LAST_LUID (r) <= copy_end_luid)
- 	  {
- 	    /* However, we must also check for loop-carried dependencies.
diff --git a/lang/gcc3-java/Makefile b/lang/gcc3-java/Makefile
index 171d013f287..d1bce1e0525 100644
--- a/lang/gcc3-java/Makefile
+++ b/lang/gcc3-java/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.6 2003/08/08 09:31:03 grant Exp $
+# $NetBSD: Makefile,v 1.7 2003/08/11 14:16:05 drochner Exp $
 #
 
-PKGNAME=		gcc3${GCC3_PKGMODIF}-java-3.3
+PKGNAME=		gcc3${GCC3_PKGMODIF}-java-${GCC_VERSION}
 COMMENT=		GNU Compiler Collection, version 3, Java compiler
 
 INFO_FILES=		gcj.info
 
 .include "../../lang/gcc3-c/buildaddon.mk"
 
-BUILD_DEPENDS+=		gcc3${GCC3_PKGMODIF}-c++-3.3nb1:../../lang/gcc3-c++
+BUILD_DEPENDS+=		gcc3${GCC3_PKGMODIF}-c++-3.3.1:../../lang/gcc3-c++
 CONFIGURE_ARGS+=	--enable-languages="java"
 CONFIGURE_ARGS+=	--with-system-zlib
 # done manually in do-build
diff --git a/lang/gcc3-java/distinfo b/lang/gcc3-java/distinfo
index 9ef25b7b87b..e38654d4f00 100644
--- a/lang/gcc3-java/distinfo
+++ b/lang/gcc3-java/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.3 2003/07/09 15:23:59 drochner Exp $
+$NetBSD: distinfo,v 1.4 2003/08/11 14:16:05 drochner Exp $
 
-SHA1 (gcc-3.3.tar.bz2) = 18e23822c6dc9cb462e0ff88bc1b8a20c53da60a
-Size (gcc-3.3.tar.bz2) = 23447616 bytes
+SHA1 (gcc-3.3.1.tar.bz2) = 65ba4142dbf345d1aac1ed323f64b5f49294aee7
+Size (gcc-3.3.1.tar.bz2) = 23544362 bytes
 SHA1 (patch-aa) = e79f24237d3ece987065b84987a95eb8abc7ded7
-SHA1 (patch-ba) = 9037d2504c5db6458494a18852d57c1ef5c9dcdb
diff --git a/lang/gcc3-java/patches/patch-ba b/lang/gcc3-java/patches/patch-ba
deleted file mode 100644
index 568bbc6a27e..00000000000
--- a/lang/gcc3-java/patches/patch-ba
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2003/07/09 15:23:59 drochner Exp $
-
---- gcc/unroll.c.orig	2003-03-25 20:23:07.000000000 +0000
-+++ gcc/unroll.c
-@@ -792,9 +792,9 @@ unroll_loop (loop, insn_count, strength_
-       /* We must limit the generic test to max_reg_before_loop, because only
- 	 these pseudo registers have valid regno_first_uid info.  */
-       for (r = FIRST_PSEUDO_REGISTER; r < max_reg_before_loop; ++r)
--	if (REGNO_FIRST_UID (r) > 0 && REGNO_FIRST_UID (r) <= max_uid_for_loop
-+	if (REGNO_FIRST_UID (r) > 0 && REGNO_FIRST_UID (r) < max_uid_for_loop
- 	    && REGNO_FIRST_LUID (r) >= copy_start_luid
--	    && REGNO_LAST_UID (r) > 0 && REGNO_LAST_UID (r) <= max_uid_for_loop
-+	    && REGNO_LAST_UID (r) > 0 && REGNO_LAST_UID (r) < max_uid_for_loop
- 	    && REGNO_LAST_LUID (r) <= copy_end_luid)
- 	  {
- 	    /* However, we must also check for loop-carried dependencies.
diff --git a/lang/gcc3-objc/Makefile b/lang/gcc3-objc/Makefile
index 10304fed88a..821e2a1c9f0 100644
--- a/lang/gcc3-objc/Makefile
+++ b/lang/gcc3-objc/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2003/08/08 09:31:03 grant Exp $
+# $NetBSD: Makefile,v 1.6 2003/08/11 14:16:06 drochner Exp $
 #
 
-PKGNAME=		gcc3${GCC3_PKGMODIF}-objc-3.3
+PKGNAME=		gcc3${GCC3_PKGMODIF}-objc-${GCC_VERSION}
 COMMENT=		GNU Compiler Collection, version 3, objc compiler
 
 .include "../gcc3-c/buildaddon.mk"
diff --git a/lang/gcc3-objc/distinfo b/lang/gcc3-objc/distinfo
index a4e3d9df44d..0a3cffa1b2c 100644
--- a/lang/gcc3-objc/distinfo
+++ b/lang/gcc3-objc/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.3 2003/07/09 15:24:01 drochner Exp $
+$NetBSD: distinfo,v 1.4 2003/08/11 14:16:06 drochner Exp $
 
-SHA1 (gcc-3.3.tar.bz2) = 18e23822c6dc9cb462e0ff88bc1b8a20c53da60a
-Size (gcc-3.3.tar.bz2) = 23447616 bytes
+SHA1 (gcc-3.3.1.tar.bz2) = 65ba4142dbf345d1aac1ed323f64b5f49294aee7
+Size (gcc-3.3.1.tar.bz2) = 23544362 bytes
 SHA1 (patch-aa) = 541cd543720cccc24aa60b9ac26cfa6143e7e5d4
-SHA1 (patch-ba) = 9037d2504c5db6458494a18852d57c1ef5c9dcdb
diff --git a/lang/gcc3-objc/patches/patch-ba b/lang/gcc3-objc/patches/patch-ba
deleted file mode 100644
index 11cc6706601..00000000000
--- a/lang/gcc3-objc/patches/patch-ba
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2003/07/09 15:24:01 drochner Exp $
-
---- gcc/unroll.c.orig	2003-03-25 20:23:07.000000000 +0000
-+++ gcc/unroll.c
-@@ -792,9 +792,9 @@ unroll_loop (loop, insn_count, strength_
-       /* We must limit the generic test to max_reg_before_loop, because only
- 	 these pseudo registers have valid regno_first_uid info.  */
-       for (r = FIRST_PSEUDO_REGISTER; r < max_reg_before_loop; ++r)
--	if (REGNO_FIRST_UID (r) > 0 && REGNO_FIRST_UID (r) <= max_uid_for_loop
-+	if (REGNO_FIRST_UID (r) > 0 && REGNO_FIRST_UID (r) < max_uid_for_loop
- 	    && REGNO_FIRST_LUID (r) >= copy_start_luid
--	    && REGNO_LAST_UID (r) > 0 && REGNO_LAST_UID (r) <= max_uid_for_loop
-+	    && REGNO_LAST_UID (r) > 0 && REGNO_LAST_UID (r) < max_uid_for_loop
- 	    && REGNO_LAST_LUID (r) <= copy_end_luid)
- 	  {
- 	    /* However, we must also check for loop-carried dependencies.