From a76571c1eee32f21f001fbe4c5e6827a5b715358 Mon Sep 17 00:00:00 2001
From: pascal <pascal@openbsd.org>
Date: Fri, 28 Sep 2012 18:45:42 +0000
Subject: [PATCH] Bugfix update to 4.7.2.  Also, remove sparc from
 ONLY_FOR_ARCHS and put myself as MAINTAINER.

no objection from espie@
---
 lang/gcc/4.7/Makefile                          | 15 +++++----------
 lang/gcc/4.7/distinfo                          | 17 ++++-------------
 lang/gcc/4.7/patches/patch-gcc_config_gcc      | 18 +++++++++---------
 .../4.7/patches/patch-gcc_config_i386_i386_c   | 14 +++++++-------
 lang/gcc/4.7/patches/patch-gcc_configure       | 12 ++++++------
 lang/gcc/4.7/patches/patch-gcc_defaults_h      |  8 ++++----
 lang/gcc/4.7/patches/patch-gcc_lto_lto_c       |  8 ++++----
 lang/gcc/4.7/patches/patch-libgcc_Makefile_in  |  8 ++++----
 lang/gcc/4.7/patches/patch-libgcc_config_host  | 12 ++++++------
 9 files changed, 49 insertions(+), 63 deletions(-)

diff --git a/lang/gcc/4.7/Makefile b/lang/gcc/4.7/Makefile
index f089364aab1..97ad365dceb 100644
--- a/lang/gcc/4.7/Makefile
+++ b/lang/gcc/4.7/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.17 2012/09/28 15:02:29 pascal Exp $
+# $OpenBSD: Makefile,v 1.18 2012/09/28 18:45:42 pascal Exp $
 
-ONLY_FOR_ARCHS = amd64 i386 powerpc sparc sparc64
+ONLY_FOR_ARCHS = amd64 i386 powerpc sparc64
 BROKEN-sparc64 = ICE in libgcc
 
-V = 4.7.1
+V = 4.7.2
 FULL_VERSION = $V
 FULL_PKGVERSION = $V
 BOOTSTRAP_GEN = 0
@@ -22,13 +22,6 @@ PKGNAME-ada =   gnat-${FULL_PKGVERSION}
 #PKGNAME-go =	gccgo-${FULL_PKGVERSION}
 PKGSPEC-main = gcc->=4.7,<4.8
 
-REVISION-main =	4
-REVISION-c++ =	4
-REVISION-estdc = 3
-REVISION-f95 =	4
-REVISION-objc = 4
-REVISION-ada =	4
-
 SHARED_LIBS =	estdc++		15.0 \
 		gfortran	4.0 \
 		gcj		2.0 \
@@ -49,6 +42,8 @@ ONLY_FOR_ARCHS-java = amd64 i386 sparc64
 
 MULTI_PACKAGES = -main -f95 -objc -c++ -estdc -ada
 
+MAINTAINER =	Pascal Stumpf <Pascal.Stumpf@cubes.de>
+
 .include <bsd.port.arch.mk>
 
 # kill both C++ subpackages
diff --git a/lang/gcc/4.7/distinfo b/lang/gcc/4.7/distinfo
index b6e45bed4ff..a3872051281 100644
--- a/lang/gcc/4.7/distinfo
+++ b/lang/gcc/4.7/distinfo
@@ -1,15 +1,6 @@
-MD5 (gcc/adastrap-i386-4.7.1-0.tar.xz) = MIqaZrklis4v0AzndCiVwQ==
-MD5 (gcc/ecj-4.5.jar) = 181qJ8iAHmbLqpZKA57P2w==
-MD5 (gcc/gcc-4.7.1.tar.bz2) = kz5vFfUcAxBgr2Sp4UFJ/w==
-RMD160 (gcc/adastrap-i386-4.7.1-0.tar.xz) = M/Vka0XmbpimAnxU+K2NF9fIn70=
-RMD160 (gcc/ecj-4.5.jar) = 0/TaZX8Ia2Qj906T8AETL0hVNoo=
-RMD160 (gcc/gcc-4.7.1.tar.bz2) = S1LYZ9BiiKCzuzPIRcrAESwitRM=
-SHA1 (gcc/adastrap-i386-4.7.1-0.tar.xz) = 32xwidTVBsWLgCWRgvClMs1pHW8=
-SHA1 (gcc/ecj-4.5.jar) = WMHXnGTIzXGFUPMqkyzP3o0eZEk=
-SHA1 (gcc/gcc-4.7.1.tar.bz2) = OrdOY6jyEgtPLFVX9f/saQczcTc=
-SHA256 (gcc/adastrap-i386-4.7.1-0.tar.xz) = ek4ug/xqyi8GaXMGoVvkXv121wEh5b7iltA+QkSbfoA=
+SHA256 (gcc/adastrap-i386-4.7.2-0.tar.xz) = 7zzkpP6UDkWQckJy9arvYOSEfhWpnqdzqETxdCE43a4=
 SHA256 (gcc/ecj-4.5.jar) = mP0Sjx03TZ5C/Z1INr3SScbVEevGwN8X+8G535bD14E=
-SHA256 (gcc/gcc-4.7.1.tar.bz2) = Fgk/b6AXMq3zeNl/4zjxE8kzvfVtoiv4fHa+/xPaQG8=
-SIZE (gcc/adastrap-i386-4.7.1-0.tar.xz) = 29396032
+SHA256 (gcc/gcc-4.7.2.tar.bz2) = ipKD1wEPuf5ezjylB+CvXBlBJiY4T4pelDQlGuEAsIQ=
+SIZE (gcc/adastrap-i386-4.7.2-0.tar.xz) = 30305556
 SIZE (gcc/ecj-4.5.jar) = 1470676
-SIZE (gcc/gcc-4.7.1.tar.bz2) = 82639660
+SIZE (gcc/gcc-4.7.2.tar.bz2) = 82884636
diff --git a/lang/gcc/4.7/patches/patch-gcc_config_gcc b/lang/gcc/4.7/patches/patch-gcc_config_gcc
index 175900f1279..314255be404 100644
--- a/lang/gcc/4.7/patches/patch-gcc_config_gcc
+++ b/lang/gcc/4.7/patches/patch-gcc_config_gcc
@@ -1,7 +1,7 @@
-$OpenBSD: patch-gcc_config_gcc,v 1.4 2012/09/01 00:00:32 pascal Exp $
---- gcc/config.gcc.orig	Mon Jun  4 11:51:00 2012
-+++ gcc/config.gcc	Thu Aug 30 10:11:20 2012
-@@ -684,6 +684,14 @@ case ${target} in
+$OpenBSD: patch-gcc_config_gcc,v 1.5 2012/09/28 18:45:42 pascal Exp $
+--- gcc/config.gcc.orig	Wed Sep 12 11:03:54 2012
++++ gcc/config.gcc	Wed Sep 26 14:31:56 2012
+@@ -692,6 +692,14 @@ case ${target} in
      *-*-openbsd2.*|*-*-openbsd3.[012])
        tm_defines="${tm_defines} HAS_LIBC_R=1" ;;
    esac
@@ -16,7 +16,7 @@ $OpenBSD: patch-gcc_config_gcc,v 1.4 2012/09/01 00:00:32 pascal Exp $
    ;;
  *-*-rtems*)
    case ${enable_threads} in
-@@ -1054,10 +1062,15 @@ hppa*-*-linux*)
+@@ -1066,10 +1074,15 @@ hppa*-*-linux*)
  	tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h pa/pa-linux.h \
  		 pa/pa32-regs.h pa/pa32-linux.h"
  	;;
@@ -36,7 +36,7 @@ $OpenBSD: patch-gcc_config_gcc,v 1.4 2012/09/01 00:00:32 pascal Exp $
  hppa[12]*-*-hpux10*)
  	case ${target} in
  	hppa1.1-*-* | hppa2*-*-*)
-@@ -1225,6 +1238,15 @@ i[34567]86-*-openbsd*)
+@@ -1237,6 +1250,15 @@ i[34567]86-*-openbsd*)
  	gas=yes
  	gnu_ld=yes
  	;;
@@ -52,7 +52,7 @@ $OpenBSD: patch-gcc_config_gcc,v 1.4 2012/09/01 00:00:32 pascal Exp $
  i[34567]86-*-linux* | i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-knetbsd*-gnu | i[34567]86-*-gnu* | i[34567]86-*-kopensolaris*-gnu)
  			# Intel 80386's running GNU/*
  			# with ELF format using glibc 2
-@@ -1927,11 +1949,11 @@ picochip-*)
+@@ -1939,11 +1961,11 @@ picochip-*)
  	use_gcc_stdint=wrap
  	tmake_file="picochip/t-picochip t-pnt16-warn"
          ;;
@@ -69,7 +69,7 @@ $OpenBSD: patch-gcc_config_gcc,v 1.4 2012/09/01 00:00:32 pascal Exp $
  powerpc-*-darwin*)
  	extra_options="${extra_options} rs6000/darwin.opt"
  	case ${target} in
-@@ -2470,6 +2492,7 @@ sparc64-*-netbsd*)
+@@ -2482,6 +2504,7 @@ sparc64-*-netbsd*)
  	tmake_file="${tmake_file} sparc/t-sparc sparc/t-netbsd64"
  	;;
  sparc64-*-openbsd*)
@@ -77,7 +77,7 @@ $OpenBSD: patch-gcc_config_gcc,v 1.4 2012/09/01 00:00:32 pascal Exp $
  	tm_file="sparc/openbsd1-64.h ${tm_file} dbxelf.h elfos.h sparc/sysv4.h sparc/sp64-elf.h"
  	tm_file="${tm_file} openbsd.h openbsd-stdint.h openbsd-libpthread.h sparc/openbsd64.h"
  	extra_options="${extra_options} openbsd.opt"
-@@ -2641,6 +2664,12 @@ case ${target} in
+@@ -2665,6 +2688,12 @@ case ${target} in
      else
        arch=i386
      fi
diff --git a/lang/gcc/4.7/patches/patch-gcc_config_i386_i386_c b/lang/gcc/4.7/patches/patch-gcc_config_i386_i386_c
index d31df334bd3..856300b5e52 100644
--- a/lang/gcc/4.7/patches/patch-gcc_config_i386_i386_c
+++ b/lang/gcc/4.7/patches/patch-gcc_config_i386_i386_c
@@ -1,6 +1,6 @@
-$OpenBSD: patch-gcc_config_i386_i386_c,v 1.2 2012/07/01 18:56:45 pascal Exp $
---- gcc/config/i386/i386.c.orig	Fri May 25 15:34:07 2012
-+++ gcc/config/i386/i386.c	Wed Jun 20 14:39:11 2012
+$OpenBSD: patch-gcc_config_i386_i386_c,v 1.3 2012/09/28 18:45:42 pascal Exp $
+--- gcc/config/i386/i386.c.orig	Thu Sep 13 19:32:23 2012
++++ gcc/config/i386/i386.c	Mon Sep 24 16:32:08 2012
 @@ -2414,6 +2414,8 @@ struct ix86_frame
    HOST_WIDE_INT reg_save_offset;
    HOST_WIDE_INT sse_reg_save_offset;
@@ -10,7 +10,7 @@ $OpenBSD: patch-gcc_config_i386_i386_c,v 1.2 2012/07/01 18:56:45 pascal Exp $
    /* When save_regs_using_mov is set, emit prologue using
       move instead of push instructions.  */
    bool save_regs_using_mov;
-@@ -8820,6 +8822,7 @@ ix86_compute_frame_layout (struct ix86_frame *frame)
+@@ -8832,6 +8834,7 @@ ix86_compute_frame_layout (struct ix86_frame *frame)
    HOST_WIDE_INT size = get_frame_size ();
    HOST_WIDE_INT to_allocate;
  
@@ -18,7 +18,7 @@ $OpenBSD: patch-gcc_config_i386_i386_c,v 1.2 2012/07/01 18:56:45 pascal Exp $
    frame->nregs = ix86_nsaved_regs ();
    frame->nsseregs = ix86_nsaved_sseregs ();
  
-@@ -10147,6 +10150,9 @@ ix86_expand_prologue (void)
+@@ -10168,6 +10171,9 @@ ix86_expand_prologue (void)
        m->fs.sp_offset = INCOMING_FRAME_SP_OFFSET;
        m->fs.realigned = true;
      }
@@ -26,5 +26,5 @@ $OpenBSD: patch-gcc_config_i386_i386_c,v 1.2 2012/07/01 18:56:45 pascal Exp $
 +  if (warn_stack_larger_than && frame.local_size > stack_larger_than_size)
 +    warning (OPT_Wstack_larger_than_, "stack usage is %d bytes", frame.local_size);
  
-   if (frame_pointer_needed && !m->fs.fp_valid)
-     {
+   int_registers_saved = (frame.nregs == 0);
+   sse_registers_saved = (frame.nsseregs == 0);
diff --git a/lang/gcc/4.7/patches/patch-gcc_configure b/lang/gcc/4.7/patches/patch-gcc_configure
index b1114f369ba..8f7c4031622 100644
--- a/lang/gcc/4.7/patches/patch-gcc_configure
+++ b/lang/gcc/4.7/patches/patch-gcc_configure
@@ -1,7 +1,7 @@
-$OpenBSD: patch-gcc_configure,v 1.2 2012/07/01 18:56:45 pascal Exp $
---- gcc/configure.orig	Fri May 25 12:07:23 2012
-+++ gcc/configure	Wed Jun 20 14:39:12 2012
-@@ -17392,7 +17392,7 @@ openbsd*)
+$OpenBSD: patch-gcc_configure,v 1.3 2012/09/28 18:45:42 pascal Exp $
+--- gcc/configure.orig	Thu Sep 13 15:32:31 2012
++++ gcc/configure	Mon Sep 24 16:32:09 2012
+@@ -17432,7 +17432,7 @@ openbsd*)
      *)				need_version=no  ;;
    esac
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
@@ -10,7 +10,7 @@ $OpenBSD: patch-gcc_configure,v 1.2 2012/07/01 18:56:45 pascal Exp $
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
      case $host_os in
-@@ -21051,7 +21051,7 @@ openbsd*)
+@@ -21091,7 +21091,7 @@ openbsd*)
      *)				need_version=no  ;;
    esac
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
@@ -19,7 +19,7 @@ $OpenBSD: patch-gcc_configure,v 1.2 2012/07/01 18:56:45 pascal Exp $
    shlibpath_var=LD_LIBRARY_PATH
    if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
      case $host_os in
-@@ -26738,6 +26738,7 @@ else
+@@ -26784,6 +26784,7 @@ else
  fi
  
          ;;
diff --git a/lang/gcc/4.7/patches/patch-gcc_defaults_h b/lang/gcc/4.7/patches/patch-gcc_defaults_h
index 178f0dd79fb..9a60065ce00 100644
--- a/lang/gcc/4.7/patches/patch-gcc_defaults_h
+++ b/lang/gcc/4.7/patches/patch-gcc_defaults_h
@@ -1,7 +1,7 @@
-$OpenBSD: patch-gcc_defaults_h,v 1.1 2012/09/01 00:00:32 pascal Exp $
---- gcc/defaults.h.orig	Thu Aug 30 10:05:31 2012
-+++ gcc/defaults.h	Thu Aug 30 10:06:01 2012
-@@ -1413,6 +1413,10 @@ see the files COPYING3 and COPYING.RUNTIME respectivel
+$OpenBSD: patch-gcc_defaults_h,v 1.2 2012/09/28 18:45:42 pascal Exp $
+--- gcc/defaults.h.orig	Tue Aug 14 15:59:04 2012
++++ gcc/defaults.h	Mon Sep 24 16:32:09 2012
+@@ -1418,6 +1418,10 @@ see the files COPYING3 and COPYING.RUNTIME respectivel
  #define SWITCHABLE_TARGET 0
  #endif
  
diff --git a/lang/gcc/4.7/patches/patch-gcc_lto_lto_c b/lang/gcc/4.7/patches/patch-gcc_lto_lto_c
index 9a58ef1dc58..ae9b214b2f9 100644
--- a/lang/gcc/4.7/patches/patch-gcc_lto_lto_c
+++ b/lang/gcc/4.7/patches/patch-gcc_lto_lto_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-gcc_lto_lto_c,v 1.1.1.1 2012/04/23 15:56:41 pascal Exp $
---- gcc/lto/lto.c.orig	Tue Feb 28 10:13:40 2012
-+++ gcc/lto/lto.c	Mon Apr  2 16:38:17 2012
-@@ -2950,4 +2950,10 @@ lto_main (void)
+$OpenBSD: patch-gcc_lto_lto_c,v 1.2 2012/09/28 18:45:42 pascal Exp $
+--- gcc/lto/lto.c.orig	Sun Sep 16 01:03:27 2012
++++ gcc/lto/lto.c	Mon Sep 24 16:32:09 2012
+@@ -2963,4 +2963,10 @@ lto_main (void)
      }
  }
  
diff --git a/lang/gcc/4.7/patches/patch-libgcc_Makefile_in b/lang/gcc/4.7/patches/patch-libgcc_Makefile_in
index aa448be732e..344ebe6b41a 100644
--- a/lang/gcc/4.7/patches/patch-libgcc_Makefile_in
+++ b/lang/gcc/4.7/patches/patch-libgcc_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-libgcc_Makefile_in,v 1.2 2012/07/01 18:56:45 pascal Exp $
---- libgcc/Makefile.in.orig	Thu May 24 16:59:38 2012
-+++ libgcc/Makefile.in	Wed Jun 20 14:39:12 2012
-@@ -1062,10 +1062,10 @@ install-shared:
+$OpenBSD: patch-libgcc_Makefile_in,v 1.3 2012/09/28 18:45:42 pascal Exp $
+--- libgcc/Makefile.in.orig	Wed Sep  5 14:19:47 2012
++++ libgcc/Makefile.in	Mon Sep 24 16:32:09 2012
+@@ -1066,10 +1066,10 @@ install-shared:
  install-leaf: $(install-shared) $(install-libunwind)
  	$(mkinstalldirs) $(DESTDIR)$(inst_libdir)
  
diff --git a/lang/gcc/4.7/patches/patch-libgcc_config_host b/lang/gcc/4.7/patches/patch-libgcc_config_host
index 8de190a761e..ab4642b38a9 100644
--- a/lang/gcc/4.7/patches/patch-libgcc_config_host
+++ b/lang/gcc/4.7/patches/patch-libgcc_config_host
@@ -1,7 +1,7 @@
-$OpenBSD: patch-libgcc_config_host,v 1.2 2012/07/01 18:56:45 pascal Exp $
---- libgcc/config.host.orig	Mon Apr 30 19:39:57 2012
-+++ libgcc/config.host	Sun Jun 24 13:15:31 2012
-@@ -471,6 +471,9 @@ hppa*-*-linux*)
+$OpenBSD: patch-libgcc_config_host,v 1.3 2012/09/28 18:45:42 pascal Exp $
+--- libgcc/config.host.orig	Wed Sep  5 14:19:47 2012
++++ libgcc/config.host	Mon Sep 24 16:32:09 2012
+@@ -474,6 +474,9 @@ hppa*-*-linux*)
  	fi
  	md_unwind_header=pa/linux-unwind.h
  	;;
@@ -11,7 +11,7 @@ $OpenBSD: patch-libgcc_config_host,v 1.2 2012/07/01 18:56:45 pascal Exp $
  hppa[12]*-*-hpux10*)
  	tmake_file="$tmake_file pa/t-hpux pa/t-hpux10 t-libgcc-pic t-slibgcc"
  	# Set the libgcc version number
-@@ -537,7 +540,11 @@ x86_64-*-netbsd*)
+@@ -540,7 +543,11 @@ x86_64-*-netbsd*)
  i[34567]86-*-openbsd2.*|i[34567]86-*openbsd3.[0123])
  	;;
  i[34567]86-*-openbsd*)
@@ -23,7 +23,7 @@ $OpenBSD: patch-libgcc_config_host,v 1.2 2012/07/01 18:56:45 pascal Exp $
  i[34567]86-*-linux*)
  	extra_parts="$extra_parts crtprec32.o crtprec64.o crtprec80.o crtfastmath.o"
  	tmake_file="${tmake_file} i386/t-crtpc i386/t-crtfm i386/t-crtstuff t-dfprules"
-@@ -858,6 +865,9 @@ powerpc*-*-freebsd*)
+@@ -861,6 +868,9 @@ powerpc*-*-freebsd*)
  	;;
  powerpc-*-netbsd*)
  	tmake_file="$tmake_file rs6000/t-netbsd rs6000/t-crtstuff"