lang/gnat-aux: Sync with gcc 4.6.3

GCC 4.6.3 was released 01 MAR 2012.  It is a bug-fix release for regressions
and serious bugs.  Seventy-four bug reports were addressed.  The link is
available at bottom of http://gcc.gnu.org/gcc-4.6/changes.html

Unlike release 4.6.2, a few Ada issues were among those addressed.

4 files changed, 71 insertions, 44 deletions

diff --git a/lang/gnat-aux/Makefile b/lang/gnat-aux/Makefile
index 20f23557e56..4b8c6527d51 100644
--- a/lang/gnat-aux/Makefile
+++ b/lang/gnat-aux/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2012/01/12 15:38:45 hans Exp $
+# $NetBSD: Makefile,v 1.12 2012/03/02 16:00:58 marino Exp $
 #
 
 PKGNAME=	gnat-aux-${SNAPSHOT}
@@ -12,9 +12,9 @@ HOMEPAGE=	http://www.dragonlace.net/
 COMMENT=	GNAT Ada compiler based on GCC ${GCC_BRANCH}
 LICENSE=	gnu-gpl-v3 AND gnu-lgpl-v3
 
-SNAPSHOT=	20111026
+SNAPSHOT=	20120301
 GCC_BRANCH=	4.6
-GCC_POINT=	2
+GCC_POINT=	3
 GCC_VERSION=	${GCC_BRANCH}.${GCC_POINT}
 LANGS=		c
 
diff --git a/lang/gnat-aux/distinfo b/lang/gnat-aux/distinfo
index 5630a4c78a9..986338c2810 100644
--- a/lang/gnat-aux/distinfo
+++ b/lang/gnat-aux/distinfo
@@ -1,23 +1,23 @@
-$NetBSD: distinfo,v 1.8 2012/01/08 11:17:07 marino Exp $
+$NetBSD: distinfo,v 1.9 2012/03/02 16:00:58 marino Exp $
 
-SHA1 (gcc-ada-4.6.2.tar.bz2) = e6eaa9b8111ac8e550844a7cc2d161f8c3c96522
-RMD160 (gcc-ada-4.6.2.tar.bz2) = 6f5d5af97c374411e13698c32314b43b1afd99cf
-Size (gcc-ada-4.6.2.tar.bz2) = 6064757 bytes
-SHA1 (gcc-core-4.6.2.tar.bz2) = 23d259e2269a40f6e203cf6f57bc7eb7a207a8b3
-RMD160 (gcc-core-4.6.2.tar.bz2) = 82c25532303759b6195bbd53d7f371f1974ff182
-Size (gcc-core-4.6.2.tar.bz2) = 30258326 bytes
-SHA1 (gcc-fortran-4.6.2.tar.bz2) = aba480c9a42d58eca6c34355b6d2f5f487de051d
-RMD160 (gcc-fortran-4.6.2.tar.bz2) = 6a966d647e9d3fe35996d390fbcd7ff0622edfb8
-Size (gcc-fortran-4.6.2.tar.bz2) = 1676539 bytes
-SHA1 (gcc-g++-4.6.2.tar.bz2) = f0bc2b4e1c23c5dc1462599efd5df4b9807b23af
-RMD160 (gcc-g++-4.6.2.tar.bz2) = afb274990e9102b55cb5f5dc11876c96e6b31c96
-Size (gcc-g++-4.6.2.tar.bz2) = 6955594 bytes
-SHA1 (gcc-objc-4.6.2.tar.bz2) = 32e5fbc31f1e8dd5e7c7e7ed9172afaf6136ea4e
-RMD160 (gcc-objc-4.6.2.tar.bz2) = 3c38c655edb90fadb2805043219296a4af43c56a
-Size (gcc-objc-4.6.2.tar.bz2) = 342544 bytes
-SHA1 (gcc-testsuite-4.6.2.tar.bz2) = 514c0ed8b9e4ed22e55303ae2426dd6f1e8a24f2
-RMD160 (gcc-testsuite-4.6.2.tar.bz2) = 859486da17497b61e0919f53f13efc04eeaef751
-Size (gcc-testsuite-4.6.2.tar.bz2) = 6309400 bytes
+SHA1 (gcc-ada-4.6.3.tar.bz2) = dad948b980357bab992d0ac9aaa1f9859f1671e7
+RMD160 (gcc-ada-4.6.3.tar.bz2) = 33d0077a366edc8705d6907ca98ff2c53a434498
+Size (gcc-ada-4.6.3.tar.bz2) = 6092418 bytes
+SHA1 (gcc-core-4.6.3.tar.bz2) = eaefb90df5a833c94560a8dda177bd1e165c2a88
+RMD160 (gcc-core-4.6.3.tar.bz2) = 071371eae1ce10dbb44c077b69256f2ec2ee1b6b
+Size (gcc-core-4.6.3.tar.bz2) = 30305971 bytes
+SHA1 (gcc-fortran-4.6.3.tar.bz2) = 4dc62a4b995391584e7f80e05353e9635407e647
+RMD160 (gcc-fortran-4.6.3.tar.bz2) = 95b338486d4427f1ba54d3c652fcb628da2c5576
+Size (gcc-fortran-4.6.3.tar.bz2) = 1676490 bytes
+SHA1 (gcc-g++-4.6.3.tar.bz2) = 528d010ee7af50e023bd4d476d65d08df71a7f65
+RMD160 (gcc-g++-4.6.3.tar.bz2) = 2540b113a2ee983c517b1bed6910d8d60c1292c3
+Size (gcc-g++-4.6.3.tar.bz2) = 6928430 bytes
+SHA1 (gcc-objc-4.6.3.tar.bz2) = a584c2b3505a7f6411167027cc7fe473182c6e1c
+RMD160 (gcc-objc-4.6.3.tar.bz2) = 1a673690aad47472126e518d4f56f3b385751877
+Size (gcc-objc-4.6.3.tar.bz2) = 342441 bytes
+SHA1 (gcc-testsuite-4.6.3.tar.bz2) = 31f428af55332ee45bfae7184139a65d130ac2df
+RMD160 (gcc-testsuite-4.6.3.tar.bz2) = 6b2d96cc4db33bd28c0b98fe43526acdc69ecd0d
+Size (gcc-testsuite-4.6.3.tar.bz2) = 6354781 bytes
 SHA1 (gnat-bootstrap.i386.dragonfly.tar.bz2) = d7a8103243a2df3723d9d3c3ec0da9c3bb725214
 RMD160 (gnat-bootstrap.i386.dragonfly.tar.bz2) = 9e6fde444e0ed76ee404810af6d6b7eb48659c09
 Size (gnat-bootstrap.i386.dragonfly.tar.bz2) = 28205489 bytes
diff --git a/lang/gnat-aux/files/diff-ada b/lang/gnat-aux/files/diff-ada
index ce49e37fb44..9d4a8cf5f6f 100644
--- a/lang/gnat-aux/files/diff-ada
+++ b/lang/gnat-aux/files/diff-ada
@@ -782,9 +782,9 @@
 + * will be copied.  Always NUL terminates (unless siz == 0).
 + * Returns strlen(src); if retval >= siz, truncation occurred.
 + *
-+ * $OpenBSD: strlcpy.c,v 1.11 2006/05/05 15:27:38 millert Exp $
-+ * $FreeBSD: src/lib/libc/string/strlcpy.c,v 1.10 2008/10/19 delphij Exp $
-+ * $DragonFly: src/lib/libc/string/strlcpy.c,v 1.4 2005/09/18 asmodai Exp $
++ * OpenBSD: strlcpy.c,v 1.11 2006/05/05 15:27:38 millert Exp
++ * FreeBSD: src/lib/libc/string/strlcpy.c,v 1.10 2008/10/19 delphij Exp
++ * DragonFly: src/lib/libc/string/strlcpy.c,v 1.4 2005/09/18 asmodai Exp
 + */
 +
 +size_t
@@ -823,9 +823,9 @@
 + * Returns strlen(src) + MIN(siz, strlen(initial dst)).
 + * If retval >= siz, truncation occurred.
 + *
-+ * $OpenBSD: strlcat.c,v 1.13 2005/08/08 08:05:37 espie Exp $
-+ * $FreeBSD: src/lib/libc/string/strlcat.c,v 1.11 2009/01/12 delphij Exp $
-+ * $DragonFly: src/lib/libc/string/strlcat.c,v 1.4 2004/12/18 asmodai Exp $
++ * OpenBSD: strlcat.c,v 1.13 2005/08/08 08:05:37 espie Exp
++ * FreeBSD: src/lib/libc/string/strlcat.c,v 1.11 2009/01/12 delphij Exp
++ * DragonFly: src/lib/libc/string/strlcat.c,v 1.4 2004/12/18 asmodai Exp
 + */
 +
 +size_t
@@ -2439,7 +2439,7 @@
  /* VxWorks Section */
  /*******************/
  
-@@ -2320,6 +2392,7 @@
+@@ -2341,6 +2413,7 @@
  
  #if defined (_WIN32) || defined (__INTERIX) \
    || defined (__Lynx__) || defined(__NetBSD__) || defined(__FreeBSD__) \
diff --git a/lang/gnat-aux/files/diff-core b/lang/gnat-aux/files/diff-core
index d6392393d3c..9cb95cdd664 100644
--- a/lang/gnat-aux/files/diff-core
+++ b/lang/gnat-aux/files/diff-core
@@ -290,7 +290,7 @@
 +#define UINTPTR_TYPE      (LONG_TYPE_SIZE == 64 ? UINT64_TYPE : UINT32_TYPE)
 --- /dev/null
 +++ gcc/config/dragonfly.h
-@@ -0,0 +1,141 @@
+@@ -0,0 +1,139 @@
 +/* Base configuration file for all DragonFly targets.
 +   Copyright (C) 1999, 2000, 2001, 2007, 2008 Free Software Foundation, Inc.
 +   Copyright (C) 2010-2012 John R. Marino <www.dragonlace.net>
@@ -388,12 +388,10 @@
 +#undef  LINK_SPEC
 +#define LINK_SPEC DFBSD_LINK_SPEC
 +
-+#define	DFBSD_DYNAMIC_LINKER \
-+  "/usr/libexec/ld-elf.so.2"
++#define	DFBSD_DYNAMIC_LINKER "/usr/libexec/ld-elf.so.2"
 +
 +#if defined(HAVE_LD_EH_FRAME_HDR)
-+#define LINK_EH_SPEC \
-+  "%{!static:--eh-frame-hdr}"
++#define LINK_EH_SPEC "--eh-frame-hdr"
 +#endif
 +
 +/* Use --as-needed -lgcc_s for eh support.  */
@@ -1157,11 +1155,11 @@
  
  /* Put all *tf routines in libgcc.  */
  #undef LIBGCC2_HAS_TF_MODE
-@@ -147,3 +148,39 @@
- #if FBSD_MAJOR >= 6
+@@ -148,5 +149,38 @@
  #define SUBTARGET32_DEFAULT_CPU "i486"
  #endif
-+
+ 
+-#define TARGET_ASM_FILE_END file_end_indicate_exec_stack
 +/* Define location of OS-specific unwind support configuration. */
 +#define MD_UNWIND_SUPPORT "config/i386/freebsd-unwind.h"
 +
@@ -1196,7 +1194,7 @@
 +  (void) mprotect (page, ends - page, perms);            \
 +}
 +
-+
+ 
 --- gcc/config/i386/netbsd-elf.h.orig
 +++ gcc/config/i386/netbsd-elf.h
 @@ -2,6 +2,7 @@
@@ -1787,7 +1785,7 @@
  
  #This file is part of GCC.
  
-@@ -166,6 +167,8 @@
+@@ -157,6 +158,8 @@
    ;;
  *-*-openbsd*)
    ;;
@@ -1796,7 +1794,7 @@
  *-*-rtems*)
    ;;
  *-*-vxworks*)
-@@ -287,6 +290,14 @@
+@@ -278,6 +281,14 @@
  x86_64-*-freebsd*)
  	tmake_file="${tmake_file} i386/t-freebsd"
  	;;
@@ -1811,7 +1809,7 @@
  i[34567]86-*-netbsdelf*)
  	;;
  i[34567]86-*-netbsd*)
-@@ -297,6 +308,8 @@
+@@ -288,6 +299,8 @@
  	;;
  i[34567]86-*-openbsd*)
  	;;
@@ -1820,7 +1818,7 @@
  i[34567]86-*-linux* | i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-knetbsd*-gnu | i[34567]86-*-gnu*)
  	extra_parts="$extra_parts crtprec32.o crtprec64.o crtprec80.o crtfastmath.o"
  	tmake_file="${tmake_file} i386/t-crtpc i386/t-crtfm"
-@@ -628,6 +641,9 @@
+@@ -619,6 +632,9 @@
  		tmake_file="${tmake_file} t-softfp i386/${host_address}/t-fprules-softfp"
  	fi
  	;;
@@ -1837,7 +1835,7 @@
 +SHLIB_MAPFILES += $(srcdir)/config/i386/libgcc-bsd.ver
 --- gcc/configure.orig
 +++ gcc/configure
-@@ -25843,6 +25843,20 @@
+@@ -25833,6 +25833,20 @@
        gcc_cv_target_dl_iterate_phdr=no
      fi
      ;;
@@ -1890,9 +1888,38 @@
  
  $(DESTDIR)$(man7dir)/%$(man7ext): doc/%.7 installdirs
  	-rm -f $@
+--- libiberty/getpagesize.c.orig
++++ libiberty/getpagesize.c
+@@ -20,6 +20,7 @@
+ 
+ */
+ 
++#ifndef __ANDROID__
+ #ifndef VMS
+ 
+ #include "config.h"
+@@ -88,3 +89,4 @@
+ }
+ 
+ #endif /* VMS */
++#endif /* __ANDROID__ */
+--- libiberty/setproctitle.c.orig
++++ libiberty/setproctitle.c
+@@ -40,9 +40,11 @@
+ void
+ setproctitle (const char *name ATTRIBUTE_UNUSED, ...)
+ {
++#ifndef __ANDROID__
+ #ifdef PR_SET_NAME
+   /* On Linux this sets the top visible "comm", but not necessarily
+      the name visible in ps. */
+   prctl (PR_SET_NAME, name);
+ #endif
++#endif
+ }
 --- configure.orig
 +++ configure
-@@ -14200,7 +14200,7 @@
+@@ -14196,7 +14196,7 @@
  _ACEOF
  if ac_fn_c_try_compile "$LINENO"; then :
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5