Update to GCC 4.7.2

  GCC 4.7.2 is the first bug-fix release containing important fixes
  for regressions and serious bugs in GCC 4.7.1 with over 70 bugs
  fixed since the previous release.

  A notable change in GCC 4.7.2 compared to 4.7.1 are ABI bug fixes
  related to some C++11 templates (std::list and std::pair).  As a result,
  code using those templates in C++11 mode is again ABI compatible with
  code in C++03/C++98 mode or C++11 mode of GCC 4.6 and earlier, but might
  be ABI incompatible with code compiled by GCC 4.7.1 or 4.7.0 in C++11
  mode.  See http://gcc.gnu.org/gcc-4.7/changes.html for more details.

  This is the list of problem reports (PRs) from GCC's bug tracking system
  that are known to be fixed in this release. This list might not be complete
  (that is, it is possible that some PRs that have been fixed are not listed
  here).
  http://gcc.gnu.org/bugzilla/buglist.cgi?bug_status=RESOLVED&resolution=FIXED&target_milestone=4.7.2

7 files changed, 30 insertions, 53 deletions

diff --git a/lang/gcc47-libs/Makefile b/lang/gcc47-libs/Makefile
index 61ee34ab739..8dbf2bd5c0f 100644
--- a/lang/gcc47-libs/Makefile
+++ b/lang/gcc47-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/11/20 23:15:08 jperkin Exp $
+# $NetBSD: Makefile,v 1.7 2012/12/01 02:29:32 sbd Exp $
 
 GCC_PKGNAME=		gcc47
 .include		"../../lang/${GCC_PKGNAME}/version.mk"
@@ -8,7 +8,7 @@ PKGNAME=		${GCC_PKGNAME}-libs-${GCC_DIST_VERSION}
 ## The PKGREVISION of this package needs to be at least 1 more than the
 ## PKGREVISION of the lang/gcc47 package so that with the dependence pattern 
 ## '{gcc47,gcc47-libs}>=4.7.*' pkg_all will choose gcc47-libs over gcc47.
-PKGREVISION=		7
+PKGREVISION=		1
 CATEGORIES=		lang
 MASTER_SITES=		# empty
 DISTFILES=		# empty
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index b25c4c0ccfe..acde5671cde 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2012/11/20 23:13:11 jperkin Exp $
+# $NetBSD: Makefile,v 1.12 2012/12/01 02:29:32 sbd Exp $
 
 GCC_PKGNAME=		gcc47
 .include		"version.mk"
@@ -8,7 +8,7 @@ PKGNAME=		${GCC_PKGNAME}-${GCC_DIST_VERSION}
 ## When bumping the PKGREVISION of this package the PKGREVISION of
 ## lang/gcc47-libs needs to be bump to be at least 1 more than the
 ## PKGREVISION of this package!
-PKGREVISION=		6
+PKGREVISION=		
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_GNU:=gcc/gcc-${GCC_DIST_VERSION}/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/lang/gcc47/distinfo b/lang/gcc47/distinfo
index 691cb5dac94..a9f772d551a 100644
--- a/lang/gcc47/distinfo
+++ b/lang/gcc47/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.11 2012/11/16 01:03:54 joerg Exp $
+$NetBSD: distinfo,v 1.12 2012/12/01 02:29:32 sbd Exp $
 
 SHA1 (ecj-4.5.jar) = 58c1d79c64c8cd718550f32a932ccfde8d1e6449
 RMD160 (ecj-4.5.jar) = d3f4da657f086b6423f74e93f001132f4855368a
 Size (ecj-4.5.jar) = 1470676 bytes
-SHA1 (gcc-4.7.0.tar.bz2) = 03b8241477a9f8a34f6efe7273d92b9b6dd9fe82
-RMD160 (gcc-4.7.0.tar.bz2) = 4ed660b281cdb9bcf98f5c2cf2da105c71db5be4
-Size (gcc-4.7.0.tar.bz2) = 82518546 bytes
+SHA1 (gcc-4.7.2.tar.bz2) = a464ba0f26eef24c29bcd1e7489421117fb9ee35
+RMD160 (gcc-4.7.2.tar.bz2) = fc281ade14b47d2a9c2ced4f7082c74bfbae31c1
+Size (gcc-4.7.2.tar.bz2) = 82884636 bytes
 SHA1 (patch-configure) = 51c0978c60baddd90ef7e512445fdef913c04e6c
 SHA1 (patch-gcc_Makefile.in) = 1cf954d214a1d4a3fd4fece1f577f11b511e20ed
 SHA1 (patch-gcc_config.gcc) = efa4ecabd71bdec14d5dd1f8bb836116c7a9d6e9
@@ -24,7 +24,7 @@ SHA1 (patch-libgcc_config_i386_dragonfly-unwind.h) = 9d77252dd982495e90f95b82706
 SHA1 (patch-libgcc_crtstuff.c) = 88500ea895cd683608f8f2b7177149f11947e3b4
 SHA1 (patch-libgcc_unwind-dw2-fde-dip.c) = 2a0b8c6d2f86d985506578b4e74947d3fb1766a5
 SHA1 (patch-libgfortran_configure) = b3bbc7d9201073a1bed0b7e10141465bab52c8be
-SHA1 (patch-libgo_Makefile.in) = c06e3f0deb9f906d2c158262cffdc3fb7af95602
+SHA1 (patch-libgo_Makefile.in) = 612987541f745c7be6835ce7fb7119884db294c3
 SHA1 (patch-libjava_boehm.cc) = b18bc9d410a62543583c77e011f50b86f41ca18a
 SHA1 (patch-libjava_configure) = 48ea2baffe87e09dda8133d286bd9b1bfe4c3f8a
 SHA1 (patch-libjava_contrib_rebuild-gcj-db.in) = bb01d738fc7db05046ae37e8ade32574de1d8297
@@ -34,6 +34,5 @@ SHA1 (patch-libstdc++-v3_config_os_bsd_dragonfly_ctype__base.h) = 1c8ee3ea80bd88
 SHA1 (patch-libstdc++-v3_config_os_bsd_dragonfly_ctype__configure__char.cc) = d5649f42b61ff3c27d60e813cc844b820525aee4
 SHA1 (patch-libstdc++-v3_config_os_bsd_dragonfly_ctype__inline.h) = fecd20146d8e0bdebb073c8d64886e36293416fd
 SHA1 (patch-libstdc++-v3_config_os_bsd_dragonfly_os__defines.h) = 9a45ecb4309c50ca90008b2fc7d3b44d002698b4
-SHA1 (patch-libstdc++-v3_config_os_bsd_netbsd_ctype__base.h) = 94879703659b960c7b61122b4b4173e01cec1afc
-SHA1 (patch-libstdc++-v3_configure) = 4846c93afac42e4fdd20141234d601517cab7175
+SHA1 (patch-libstdc++-v3_configure) = 7aa0c5fea3b446657aa27f603d99ea50ed1e44c1
 SHA1 (patch-libstdc++-v3_configure.host) = 7426ea4a9735e5f886f4a3ffb4a9ba62734178c4
diff --git a/lang/gcc47/patches/patch-libgo_Makefile.in b/lang/gcc47/patches/patch-libgo_Makefile.in
index b54f1f3715d..a78be869987 100644
--- a/lang/gcc47/patches/patch-libgo_Makefile.in
+++ b/lang/gcc47/patches/patch-libgo_Makefile.in
@@ -1,13 +1,13 @@
-$NetBSD: patch-libgo_Makefile.in,v 1.1.1.1 2012/04/16 04:27:18 sbd Exp $
+$NetBSD: patch-libgo_Makefile.in,v 1.2 2012/12/01 02:29:32 sbd Exp $
 
 proc.c will not compile with inline-functions (implied by -O3) 
 so add -fno-inline-functions to it's cflags.
 
 
---- libgo/Makefile.in.orig	2012-03-10 19:03:09.000000000 +0000
+--- libgo/Makefile.in.orig	2012-08-06 14:34:27.000000000 +0000
 +++ libgo/Makefile.in
-@@ -3028,7 +3028,7 @@ msize.lo: runtime/msize.c
- @am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msize.lo `test -f 'runtime/msize.c' || echo '$(srcdir)/'`runtime/msize.c
+@@ -3051,7 +3051,7 @@ print.lo: runtime/print.c
+ @am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o print.lo `test -f 'runtime/print.c' || echo '$(srcdir)/'`runtime/print.c
  
  proc.lo: runtime/proc.c
 -@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT proc.lo -MD -MP -MF $(DEPDIR)/proc.Tpo -c -o proc.lo `test -f 'runtime/proc.c' || echo '$(srcdir)/'`runtime/proc.c
diff --git a/lang/gcc47/patches/patch-libstdc++-v3_config_os_bsd_netbsd_ctype__base.h b/lang/gcc47/patches/patch-libstdc++-v3_config_os_bsd_netbsd_ctype__base.h
deleted file mode 100644
index f6965e5e911..00000000000
--- a/lang/gcc47/patches/patch-libstdc++-v3_config_os_bsd_netbsd_ctype__base.h
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-libstdc++-v3_config_os_bsd_netbsd_ctype__base.h,v 1.1 2012/06/08 15:42:29 joerg Exp $
-
---- libstdc++-v3/config/os/bsd/netbsd/ctype_base.h.orig	2012-06-05 12:36:50.000000000 +0000
-+++ libstdc++-v3/config/os/bsd/netbsd/ctype_base.h
-@@ -30,8 +30,6 @@
- // Full details can be found from the CVS files at:
- //   anoncvs@anoncvs.netbsd.org:/cvsroot/basesrc/include/ctype.h
- // See www.netbsd.org for details of access.
--  
--#include <sys/param.h>
- 
- namespace std _GLIBCXX_VISIBILITY(default)
- {
-@@ -47,7 +45,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
-     // on the mask type. Because of this, we don't use an enum.
-     typedef unsigned char      	mask;
- 
--#if __NetBSD_Version__ < 599004100
-+#if !defined(_CTYPE_U)
-     static const mask upper    	= _U;
-     static const mask lower 	= _L;
-     static const mask alpha 	= _U | _L;
diff --git a/lang/gcc47/patches/patch-libstdc++-v3_configure b/lang/gcc47/patches/patch-libstdc++-v3_configure
index 283ccb05a86..a179a38d006 100644
--- a/lang/gcc47/patches/patch-libstdc++-v3_configure
+++ b/lang/gcc47/patches/patch-libstdc++-v3_configure
@@ -1,6 +1,6 @@
-$NetBSD: patch-libstdc++-v3_configure,v 1.1 2012/06/23 22:13:02 marino Exp $
+$NetBSD: patch-libstdc++-v3_configure,v 1.2 2012/12/01 02:29:32 sbd Exp $
 
---- libstdc++-v3/configure.orig	2012-03-02 07:13:55.000000000 +0000
+--- libstdc++-v3/configure.orig	2012-08-06 14:34:27.000000000 +0000
 +++ libstdc++-v3/configure
 @@ -15704,7 +15704,7 @@ $as_echo "stdio" >&6; }
  if test "${enable_clocale+set}" = set; then :
@@ -21,10 +21,15 @@ $NetBSD: patch-libstdc++-v3_configure,v 1.1 2012/06/23 22:13:02 marino Exp $
        *)
  	if test x"$with_newlib" = x"yes"; then
  	  enable_clocale_flag=newlib
-@@ -15883,6 +15886,23 @@ $as_echo "darwin or freebsd" >&6; }
-       CTIME_CC=config/locale/generic/time_members.cc
-       CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
-       ;;
+@@ -15878,6 +15881,23 @@ $as_echo "darwin or freebsd" >&6; }
+       CMESSAGES_H=config/locale/generic/messages_members.h
+       CMESSAGES_CC=config/locale/generic/messages_members.cc
+       CMONEY_CC=config/locale/generic/monetary_members.cc
++      CNUMERIC_CC=config/locale/generic/numeric_members.cc
++      CTIME_H=config/locale/generic/time_members.h
++      CTIME_CC=config/locale/generic/time_members.cc
++      CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
++      ;;
 +    dragonfly)
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: result: dragonfly" >&5
 +$as_echo "dragonfly" >&6; }
@@ -37,11 +42,6 @@ $NetBSD: patch-libstdc++-v3_configure,v 1.1 2012/06/23 22:13:02 marino Exp $
 +      CMESSAGES_H=config/locale/generic/messages_members.h
 +      CMESSAGES_CC=config/locale/generic/messages_members.cc
 +      CMONEY_CC=config/locale/generic/monetary_members.cc
-+      CNUMERIC_CC=config/locale/generic/numeric_members.cc
-+      CTIME_H=config/locale/generic/time_members.h
-+      CTIME_CC=config/locale/generic/time_members.cc
-+      CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
-+      ;;
- 
-     gnu)
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: gnu" >&5
+       CNUMERIC_CC=config/locale/generic/numeric_members.cc
+       CTIME_H=config/locale/generic/time_members.h
+       CTIME_CC=config/locale/generic/time_members.cc
diff --git a/lang/gcc47/version.mk b/lang/gcc47/version.mk
index ed294353c4c..486d2a7be37 100644
--- a/lang/gcc47/version.mk
+++ b/lang/gcc47/version.mk
@@ -1,2 +1,2 @@
-# $NetBSD: version.mk,v 1.1.1.1 2012/04/16 04:27:18 sbd Exp $
-GCC_DIST_VERSION:=	4.7.0
+# $NetBSD: version.mk,v 1.2 2012/12/01 02:29:32 sbd Exp $
+GCC_DIST_VERSION:=	4.7.2