 @@ -1,33 +1,33 @@
-$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
+SHA1 (gcc-ada-4.6.3.tar.bz2) = dad948b980357bab992d0ac9aaa1f9859f1671e7
-RMD160 (gcc-ada-4.6.2.tar.bz2) = 6f5d5af97c374411e13698c32314b43b1afd99cf
+RMD160 (gcc-ada-4.6.3.tar.bz2) = 33d0077a366edc8705d6907ca98ff2c53a434498
-Size (gcc-ada-4.6.2.tar.bz2) = 6064757 bytes
+Size (gcc-ada-4.6.3.tar.bz2) = 6092418 bytes
-SHA1 (gcc-core-4.6.2.tar.bz2) = 23d259e2269a40f6e203cf6f57bc7eb7a207a8b3
+SHA1 (gcc-core-4.6.3.tar.bz2) = eaefb90df5a833c94560a8dda177bd1e165c2a88
-RMD160 (gcc-core-4.6.2.tar.bz2) = 82c25532303759b6195bbd53d7f371f1974ff182
+RMD160 (gcc-core-4.6.3.tar.bz2) = 071371eae1ce10dbb44c077b69256f2ec2ee1b6b
-Size (gcc-core-4.6.2.tar.bz2) = 30258326 bytes
+Size (gcc-core-4.6.3.tar.bz2) = 30305971 bytes
-SHA1 (gcc-fortran-4.6.2.tar.bz2) = aba480c9a42d58eca6c34355b6d2f5f487de051d
+SHA1 (gcc-fortran-4.6.3.tar.bz2) = 4dc62a4b995391584e7f80e05353e9635407e647
-RMD160 (gcc-fortran-4.6.2.tar.bz2) = 6a966d647e9d3fe35996d390fbcd7ff0622edfb8
+RMD160 (gcc-fortran-4.6.3.tar.bz2) = 95b338486d4427f1ba54d3c652fcb628da2c5576
-Size (gcc-fortran-4.6.2.tar.bz2) = 1676539 bytes
+Size (gcc-fortran-4.6.3.tar.bz2) = 1676490 bytes
-SHA1 (gcc-g++-4.6.2.tar.bz2) = f0bc2b4e1c23c5dc1462599efd5df4b9807b23af
+SHA1 (gcc-g++-4.6.3.tar.bz2) = 528d010ee7af50e023bd4d476d65d08df71a7f65
-RMD160 (gcc-g++-4.6.2.tar.bz2) = afb274990e9102b55cb5f5dc11876c96e6b31c96
+RMD160 (gcc-g++-4.6.3.tar.bz2) = 2540b113a2ee983c517b1bed6910d8d60c1292c3
-Size (gcc-g++-4.6.2.tar.bz2) = 6955594 bytes
+Size (gcc-g++-4.6.3.tar.bz2) = 6928430 bytes
-SHA1 (gcc-objc-4.6.2.tar.bz2) = 32e5fbc31f1e8dd5e7c7e7ed9172afaf6136ea4e
+SHA1 (gcc-objc-4.6.3.tar.bz2) = a584c2b3505a7f6411167027cc7fe473182c6e1c
-RMD160 (gcc-objc-4.6.2.tar.bz2) = 3c38c655edb90fadb2805043219296a4af43c56a
+RMD160 (gcc-objc-4.6.3.tar.bz2) = 1a673690aad47472126e518d4f56f3b385751877
-Size (gcc-objc-4.6.2.tar.bz2) = 342544 bytes
+Size (gcc-objc-4.6.3.tar.bz2) = 342441 bytes
-SHA1 (gcc-testsuite-4.6.2.tar.bz2) = 514c0ed8b9e4ed22e55303ae2426dd6f1e8a24f2
+SHA1 (gcc-testsuite-4.6.3.tar.bz2) = 31f428af55332ee45bfae7184139a65d130ac2df
-RMD160 (gcc-testsuite-4.6.2.tar.bz2) = 859486da17497b61e0919f53f13efc04eeaef751
+RMD160 (gcc-testsuite-4.6.3.tar.bz2) = 6b2d96cc4db33bd28c0b98fe43526acdc69ecd0d
-Size (gcc-testsuite-4.6.2.tar.bz2) = 6309400 bytes
+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
 SHA1 (gnat-bootstrap.i386.netbsd.tar.bz2) = 19b61f54fae8e237a4e678ff03f20f50b47db1df
 RMD160 (gnat-bootstrap.i386.netbsd.tar.bz2) = ade03f223b2af229daece20a749915f7da0eb0a6
 Size (gnat-bootstrap.i386.netbsd.tar.bz2) = 27654956 bytes
 SHA1 (gnat-bootstrap.x86_64.dragonfly.tar.bz2) = 77a637a497c61e4085de31b24a205f24b1776a15
 RMD160 (gnat-bootstrap.x86_64.dragonfly.tar.bz2) = 4d0eb7b8a5f901333f1ffd190a5bf72072b2b52e
 Size (gnat-bootstrap.x86_64.dragonfly.tar.bz2) = 31380342 bytes
 SHA1 (gnat-bootstrap.x86_64.netbsd.tar.bz2) = 84f0e9179998daa643046a5d139321c4130ea84d
 RMD160 (gnat-bootstrap.x86_64.netbsd.tar.bz2) = 0b2943349536c323a62b56dc05ff1fedd6d7e17a
 Size (gnat-bootstrap.x86_64.netbsd.tar.bz2) = 30572187 bytes
 SHA1 (gnat-bootstrap.i386.solaris.tar.bz2) = 4962657bfc894a20ad3102c1f6fe8e566b47cb51

 @@ -772,29 +772,29 @@
 + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
 + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 + */
++
 +/*
 + * original function name: strlcpy
 + * Copy src to string dst of size siz.  At most siz-1 characters
 + * 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 $
++ * 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 $
++ * 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 $
++ * DragonFly: src/lib/libc/string/strlcpy.c,v 1.4 2005/09/18 asmodai Exp
 + */
++
 +size_t
 +bsd_strlcpy(char *dst, const char *src, size_t siz)
 +{
 +	char *d = dst;
 +	const char *s = src;
 +	size_t n = siz;
++
 +	/* Copy as many bytes as will fit */
 +	if (n != 0) {
 +		while (--n != 0) {
 +			if ((*d++ = *s++) == '\0')
 @@ -813,29 +813,29 @@
 +	return(s - src - 1);	/* count does not include NUL */
 +}
++
++
++
 +/*
 + * Original function name: strlcat
 + * Appends src to string dst of size siz (unlike strncat, siz is the
 + * full size of dst, not space left).  At most siz-1 characters
 + * will be copied.  Always NUL terminates (unless siz <= strlen(dst)).
 + * 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 $
++ * 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 $
++ * 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 $
++ * DragonFly: src/lib/libc/string/strlcat.c,v 1.4 2004/12/18 asmodai Exp
 + */
++
 +size_t
 +bsd_strlcat(char *dst, const char *src, size_t siz)
 +{
 +	char *d = dst;
 +	const char *s = src;
 +	size_t n = siz;
 +	size_t dlen;
++
 +	/* Find the end of dst and adjust bytes left but don't go past end */
 +	while (n-- != 0 && *d != '\0')
 +		d++;
 @@ -2429,27 +2429,27 @@
 +  if (__gnat_get_interrupt_state (SIGBUS)  != 's')
 +    sigaction (SIGBUS,  &act, NULL);
 +  if (__gnat_get_interrupt_state (SIGSEGV) != 's')
 +    sigaction (SIGSEGV, &act, NULL);
++
 +  __gnat_handler_installed = 1;
 +}
++
++
 +/*******************/
  /* VxWorks Section */
  /*******************/
-@@ -2320,6 +2392,7 @@
+@@ -2341,6 +2413,7 @@
  #if defined (_WIN32) || defined (__INTERIX) \
    || defined (__Lynx__) || defined(__NetBSD__) || defined(__FreeBSD__) \
 +  || defined (__DragonFly__) \
    || defined (__OpenBSD__)
  #define HAVE_GNAT_INIT_FLOAT
 --- gcc/ada/initialize.c.orig
 +++ gcc/ada/initialize.c
 @@ -27,6 +27,7 @@
   * GNAT was originally developed  by the GNAT team at  New York University. *
   * Extensive contributions were provided by Ada Core Technologies Inc.      *
   *                                                                          *

 @@ -280,27 +280,27 @@
 +#define INT_FAST8_TYPE    INT32_TYPE
 +#define INT_FAST16_TYPE   INT32_TYPE
 +#define INT_FAST32_TYPE   INT32_TYPE
 +#define INT_FAST64_TYPE   INT64_TYPE
 +#define UINT_FAST8_TYPE   UINT32_TYPE
 +#define UINT_FAST16_TYPE  UINT32_TYPE
 +#define UINT_FAST32_TYPE  UINT32_TYPE
 +#define UINT_FAST64_TYPE  UINT64_TYPE
++
 +#define INTPTR_TYPE       (LONG_TYPE_SIZE == 64 ?  INT64_TYPE :  INT32_TYPE)
 +#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>
++
 +This file is part of GCC.
++
 +GCC is free software; you can redistribute it and/or modify
 +it under the terms of the GNU General Public License as published by
 +the Free Software Foundation; either version 3, or (at your option)
 +any later version.
++
 +GCC is distributed in the hope that it will be useful,
 +but WITHOUT ANY WARRANTY; without even the implied warranty of
 @@ -378,32 +378,30 @@
 +  %{v:-V} \
 +  %{assert*} %{R*} %{rpath*} %{defsym*} \
 +  %{shared:-Bshareable %{h*} %{soname*}} \
 +    %{!shared: \
 +      %{!static: \
 +        %{rdynamic:-export-dynamic} \
 +        -dynamic-linker %(dfbsd_dynamic_linker) } \
 +    %{static:-Bstatic}} \
 +  %{symbolic:-Bsymbolic}"
++
 +#undef  LINK_SPEC
 +#define LINK_SPEC DFBSD_LINK_SPEC
++
-+#define	DFBSD_DYNAMIC_LINKER \
++#define	DFBSD_DYNAMIC_LINKER "/usr/libexec/ld-elf.so.2"
 +  "/usr/libexec/ld-elf.so.2"
++
 +#if defined(HAVE_LD_EH_FRAME_HDR)
-+#define LINK_EH_SPEC \
++#define LINK_EH_SPEC "--eh-frame-hdr"
 +  "%{!static:--eh-frame-hdr}"
 +#endif
++
 +/* Use --as-needed -lgcc_s for eh support.  */
 +#ifdef HAVE_LD_AS_NEEDED
 +#define USE_LD_AS_NEEDED 1
 +#endif
++
 +/************************[  Target stuff  ]***********************************/
++
 +/* All DragonFly Architectures support the ELF object file format.  */
 +#undef  OBJECT_FORMAT_ELF
 +#define OBJECT_FORMAT_ELF
++
 @@ -1147,31 +1145,31 @@
  #undef  DEFAULT_PCC_STRUCT_RETURN
  #define DEFAULT_PCC_STRUCT_RETURN 0
 -/* FreeBSD sets the rounding precision of the FPU to 53 bits.  Let the
 -   compiler get the contents of <float.h> and std::numeric_limits correct.  */
 +/* FreeBSD sets the rounding precision of the FPU to 53 bits, but GNAT
 +   resets it to full precision.  */
  #undef TARGET_96_ROUND_53_LONG_DOUBLE
 -#define TARGET_96_ROUND_53_LONG_DOUBLE (!TARGET_64BIT)
 +#define TARGET_96_ROUND_53_LONG_DOUBLE 0
  /* Put all *tf routines in libgcc.  */
  #undef LIBGCC2_HAS_TF_MODE
-@@ -147,3 +148,39 @@
+@@ -148,5 +149,38 @@
  #if FBSD_MAJOR >= 6
  #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"
++
 +/* Through FreeBSD 8.2 at least, stack is denied execution rights by libthr
 +   This only affects AMD64 since i386 ignores the nx bit (non-PAE)
 +   However, it's still included in i386 because it's possible an AMD64
 +   machine will be required to run a binary generated by i386 GNAT.
 +   perms = PROT_READ | PROT_WRITE | PROT_EXEC;
 +*/
 +#define ENABLE_EXECUTE_STACK                             \
 +extern void __enable_execute_stack (void *);             \
 +void                                                     \
 +__enable_execute_stack (void *addr)                      \
 @@ -1186,27 +1184,27 @@
 +  long ends_addr = (long) (addr + TRAMPOLINE_SIZE);      \
 +  int  perms     = 7;                                    \
 +                                                         \
 +  if (size == 0)                                         \
 +  {                                                      \
 +    size = getpagesize();                                \
 +  }                                                      \
 +  mask = ~((long) size - 1);                             \
 +  page = (char *)  (page_addr & mask);                   \
 +  ends = (char *) ((ends_addr & mask) + size);           \
 +  (void) mprotect (page, ends - page, perms);            \
 +}
++
 --- gcc/config/i386/netbsd-elf.h.orig
 +++ gcc/config/i386/netbsd-elf.h
 @@ -2,6 +2,7 @@
     for i386/ELF NetBSD systems.
     Copyright (C) 2001, 2002, 2004, 2007 Free Software Foundation, Inc.
     Contributed by matthew green <mrg@eterna.com.au>
 +   Copyright (C) 2010, 2011 John Marino <www.dragonlace.net>
  This file is part of GCC.
 @@ -39,6 +40,7 @@
  #undef LINK_SPEC
 @@ -1777,77 +1775,77 @@
  extern char *basename (const char *);
  #else
  /* Do not allow basename to be used if there is no prototype seen.  We
 --- libgcc/config.host.orig
 +++ libgcc/config.host
 @@ -1,6 +1,7 @@
  # libgcc host-specific configuration file.
  # Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
  # 2008, 2009, 2010 Free Software Foundation, Inc.
 +# Copyright 2010-2012 John Marino <http://www.dragonlace.net>
  #This file is part of GCC.
-@@ -166,6 +167,8 @@
+@@ -157,6 +158,8 @@
    ;;
  *-*-openbsd*)
    ;;
 +*-*-dragonfly*)
 +  ;;
  *-*-rtems*)
    ;;
  *-*-vxworks*)
-@@ -287,6 +290,14 @@
+@@ -278,6 +281,14 @@
  x86_64-*-freebsd*)
  	tmake_file="${tmake_file} i386/t-freebsd"
  	;;
 +i[34567]86-*-dragonfly*)
 +	# define symbol versions (same as FreeBSD)
 +	tmake_file="${tmake_file} i386/t-dragonfly"
 +	;;
 +x86_64-*-dragonfly*)
 +	# define symbol versions (same as FreeBSD)
 +	tmake_file="${tmake_file} i386/t-dragonfly"
 +	;;
  i[34567]86-*-netbsdelf*)
  	;;
  i[34567]86-*-netbsd*)
-@@ -297,6 +308,8 @@
+@@ -288,6 +299,8 @@
  	;;
  i[34567]86-*-openbsd*)
  	;;
 +x86_64-*-openbsd*)
 +	;;
  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
  	;;
 +i[34567]86-*-dragonfly* | i[34567]86-*-netbsdelf*)
 +	tmake_file="${tmake_file} t-softfp i386/32/t-fprules-softfp"
 +	;;
  esac
  case ${host} in
 --- /dev/null
 +++ libgcc/config/i386/t-dragonfly
 @@ -0,0 +1,2 @@
 +# Add support for the introduction of 128-bit long double.
 +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
      ;;
 +  *-*-dragonfly* | *-*-freebsd*)
 +  if grep dl_iterate_phdr $target_header_dir/sys/link_elf.h > /dev/null 2>&1; then
 +      gcc_cv_target_dl_iterate_phdr=yes
 +    else
 +      gcc_cv_target_dl_iterate_phdr=no
 +    fi
 +  ;;
 +# *-*-netbsd* | *-*-openbsd*)
 +# if grep dl_iterate_phdr $target_header_dir/link_elf.h > /dev/null 2>&1; then
 +#     gcc_cv_target_dl_iterate_phdr=yes
 @@ -1880,24 +1878,53 @@
  ifeq ($(enable_plugin),yes)
 @@ -4665,10 +4665,7 @@
  install-man: lang.install-man \
  	$(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext) \
  	$(DESTDIR)$(man1dir)/$(CPP_INSTALL_NAME)$(man1ext) \
 -	$(DESTDIR)$(man1dir)/$(GCOV_INSTALL_NAME)$(man1ext) \
 -	$(DESTDIR)$(man7dir)/fsf-funding$(man7ext) \
 -	$(DESTDIR)$(man7dir)/gfdl$(man7ext) \
 -	$(DESTDIR)$(man7dir)/gpl$(man7ext)
 +	$(DESTDIR)$(man1dir)/$(GCOV_INSTALL_NAME)$(man1ext)
  $(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
 -$as_echo "yes" >&6; }; stage1_cflags="$stage1_cflags -fkeep-inline-functions"
 +$as_echo "yes" >&6; };
  else
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }

 @@ -1,30 +1,30 @@
-# $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}
 DISTNAME=	gcc-${GCC_VERSION}
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/}
 DISTFILES=	gcc-core-${GCC_VERSION}.tar.bz2
 MAINTAINER=	draco@marino.st
 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
 PKG_DESTDIR_SUPPORT=	user-destdir
 USE_TOOLS+=		gmake sed perl makeinfo bzip2 patch pod2man
 USE_BUILTIN.iconv=	no
 APPLY_DIFFS=		core
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 # Requires bootstrap compiler, which is only available for NetBSD i386/AMD64