 @@ -2218,27 +2218,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 */
  /*******************/
-@@ -2416,9 +2487,13 @@
+@@ -2450,9 +2521,13 @@
     initialization of the FP processor.  This version is used under INTERIX
     and WIN32.  */
 -#if defined (_WIN32) || defined (__INTERIX) \
 -  || defined (__Lynx__) || defined(__NetBSD__) || defined(__FreeBSD__) \
 -  || defined (__OpenBSD__)
 +#if defined (_WIN32) \
 + || defined (__INTERIX) \
 + || defined (__Lynx__) \
 + || defined (__NetBSD__) \
 + || defined (__FreeBSD__) \
 + || defined (__DragonFly__) \
 + || defined (__OpenBSD__)
 @@ -8961,67 +8961,65 @@
    $(X86_TARGET_PAIRS) \
    system.ads<system-freebsd-x86.ads
 -  TOOLS_TARGET_PAIRS = \
 -  mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb
    GNATLIB_SHARED = gnatlib-shared-dual
 +  EXTRA_GNATRTL_NONTASKING_OBJS=g-sse.o g-ssvety.o
 +  EXTRA_GNATRTL_TASKING_OBJS=a-exetim.o
++
    EH_MECHANISM=-gcc
    THREADSLIB= -lpthread
    GMEM_LIB = gmemlib
-@@ -1231,26 +1240,33 @@
+@@ -1231,14 +1240,21 @@
    MISCLIB = -lutil
  endif
 -ifeq ($(strip $(filter-out %86_64 freebsd%,$(arch) $(osys))),)
++
 +# FREEBSD AMD64
-+ifeq ($(strip $(filter-out x86_64 freebsd%,$(arch) $(osys))),)
+ ifeq ($(strip $(filter-out %86_64 freebsd%,$(arch) $(osys))),)
    LIBGNAT_TARGET_PAIRS = \
 +  a-exetim.adb<a-exetim-posix.adb \
 +  a-exetim.ads<a-exetim-default.ads \
    a-intnam.ads<a-intnam-freebsd.ads \
 +  g-socthi.adb<g-socthi-bsd.adb \
 +  g-trasym.adb<g-trasym-bsd.adb \
    s-inmaop.adb<s-inmaop-posix.adb \
    s-intman.adb<s-intman-posix.adb \
 +  s-mudido.adb<s-mudido-affinity.adb \
    s-osinte.adb<s-osinte-freebsd.adb \
 -  s-osinte.ads<s-osinte-freebsd.ads \
 -  s-osprim.adb<s-osprim-posix.adb \
 +  s-osinte.ads<s-osinte-freebsd64.ads \
 +  s-osprim.adb<s-osprim-bsd64.adb \
    s-taprop.adb<s-taprop-posix.adb \
    s-taspri.ads<s-taspri-posix.ads \
    s-tpopsp.adb<s-tpopsp-posix.adb \
--  g-trasym.adb<g-trasym-dwarf.adb \
+@@ -1246,10 +1262,11 @@
    $(ATOMICS_TARGET_PAIRS) \
    $(X86_64_TARGET_PAIRS) \
    system.ads<system-freebsd-x86_64.ads
 -  TOOLS_TARGET_PAIRS = \
 -  mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb
    GNATLIB_SHARED = gnatlib-shared-dual
 +  EXTRA_GNATRTL_NONTASKING_OBJS=g-sse.o g-ssvety.o
 +  EXTRA_GNATRTL_TASKING_OBJS=a-exetim.o
++
    EH_MECHANISM=-gcc
    THREADSLIB= -lpthread
    GMEM_LIB = gmemlib
-@@ -1258,6 +1274,268 @@
+@@ -1257,6 +1274,268 @@
    MISCLIB = -lutil
  endif
++
 +# DRAGONFLY i386
 +ifeq ($(strip $(filter-out %86 dragonfly%,$(arch) $(osys))),)
 +  LIBGNAT_TARGET_PAIRS = \
 +  a-exetim.adb<a-exetim-posix.adb \
 +  a-exetim.ads<a-exetim-default.ads \
 +  a-intnam.ads<a-intnam-dragonfly.ads \
 +  g-socthi.adb<g-socthi-bsd.adb \
 +  g-trasym.adb<g-trasym-bsd.adb \
 +  s-inmaop.adb<s-inmaop-posix.adb \

 @@ -498,36 +498,26 @@
  // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
  // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
  // { dg-require-cstdint "" }
 --- libstdc++-v3/testsuite/30_threads/lock/4.cc.orig
 +++ libstdc++-v3/testsuite/30_threads/lock/4.cc
 @@ -1,5 +1,5 @@
 -// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
 -// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
 +// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
 +// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
  // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
  // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
  // { dg-require-cstdint "" }
 --- libstdc++-v3/testsuite/30_threads/lock_guard/cons/1.cc.orig
 +++ libstdc++-v3/testsuite/30_threads/lock_guard/cons/1.cc
@@ -1,5 +1,5 @@
 -// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
 -// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
 +// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
 +// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
  // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
  // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
  // { dg-require-cstdint "" }
 --- libstdc++-v3/testsuite/30_threads/mutex/cons/1.cc.orig
 +++ libstdc++-v3/testsuite/30_threads/mutex/cons/1.cc
 @@ -1,5 +1,5 @@
 -// { dg-do run { target *-*-freebsd* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
 -// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* powerpc-ibm-aix* } }
 +// { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-solaris* *-*-cygwin *-*-darwin* alpha*-*-osf* mips-sgi-irix6* } }
 +// { dg-options " -std=gnu++0x -pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* alpha*-*-osf* mips-sgi-irix6* } }
  // { dg-options " -std=gnu++0x -pthreads" { target *-*-solaris* } }
  // { dg-options " -std=gnu++0x " { target *-*-cygwin *-*-darwin* } }
  // { dg-require-cstdint "" }
 --- libstdc++-v3/testsuite/30_threads/mutex/dest/destructor_locked.cc.orig
 +++ libstdc++-v3/testsuite/30_threads/mutex/dest/destructor_locked.cc
 @@ -1,5 +1,5 @@

 @@ -39,73 +39,73 @@
 +  use_gcc_stdint=wrap
 +  ;;
  *-*-linux* | frv-*-*linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu | *-*-gnu* | *-*-kopensolaris*-gnu)
    extra_options="$extra_options gnu-user.opt"
    gas=yes
 @@ -652,6 +675,7 @@
    esac
    ;;
  *-*-netbsd*)
 +  use_gcc_stdint=wrap
    tmake_file="t-slibgcc"
    gas=yes
    gnu_ld=yes
-@@ -893,7 +917,32 @@
+@@ -903,7 +927,32 @@
- 	tm_file="dbxelf.h elfos.h newlib-stdint.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h arm/ecos-elf.h"
+ 	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h arm/rtems-elf.h rtems.h newlib-stdint.h"
- 	tmake_file="arm/t-arm arm/t-arm-elf"
+ 	tmake_file="arm/t-arm arm/t-arm-elf t-rtems arm/t-rtems"
  	;;
--arm*-*-eabi* | arm*-*-symbianelf* | arm*-*-rtemseabi*)
+-arm*-*-eabi* | arm*-*-symbianelf* | arm*-*-rtems*)
 +arm*-android-eabi*)
 +  gas=yes
 +  gnu_ld=yes
 +  case ${enable_threads} in
 +    "" | yes | posix) thread_file='posix' ;;
 +  esac
 +  tm_file="dbxelf.h elfos.h gnu-user.h linux.h linux-android.h glibc-stdint.h"
 +  tm_file="$tm_file arm/elf.h arm/linux-gas.h arm/linux-elf.h arm/bpabi.h arm/linux-eabi.h"
 +  tm_file="$tm_file ../../libgcc/config/arm/bpabi-lib.h arm/aout.h arm/arm.h"
++
 +  tm_defines="$tm_defines DEFAULT_LIBC=LIBC_BIONIC ANDROID_DEFAULT=1"
 +  case $target in
 +  arm*b-*)
 +    tm_defines="$tm_defines TARGET_BIG_ENDIAN_DEFAULT=1"
 +    ;;
 +  esac
 +  extra_options="$extra_options linux.opt linux-android.opt"
 +  default_use_cxa_atexit=yes
 +  use_gcc_tgmath=no
 +  use_gcc_stdint=wrap
++
 +  # The BPABI long long divmod functions return a 128-bit value in registers r0-r3.
 +  # Correctly modeling that requires the use of TImode.
 +  need_64bit_hwint=yes
 +  ;;
-+arm*-*-symbianelf* | arm*-*-rtemseabi*)
++arm*-*-symbianelf* | arm*-*-rtems*)
  	# The BPABI long long divmod functions return a 128-bit value in
  	# registers r0-r3.  Correctly modeling that requires the use of
  	# TImode.
-@@ -902,11 +951,6 @@
+@@ -912,11 +961,6 @@
  	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/bpabi.h"
  	tmake_file="arm/t-arm arm/t-arm-elf"
  	case ${target} in
 -	arm*-*-eabi*)
 -	  tm_file="$tm_file newlib-stdint.h"
 -	  tmake_file="${tmake_file} arm/t-bpabi"
 -	  use_gcc_stdint=wrap
 -	  ;;
- 	arm*-*-rtemseabi*)
+ 	arm*-*-rtems*)
  	  tm_file="${tm_file} rtems.h arm/rtems-eabi.h newlib-stdint.h"
  	  tmake_file="${tmake_file} arm/t-bpabi t-rtems arm/t-rtems-eabi"
-@@ -1208,19 +1252,31 @@
+@@ -1216,19 +1260,31 @@
  x86_64-*-elf*)
  	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h newlib-stdint.h i386/i386elf.h i386/x86-64.h"
  	;;
 +i[34567]86-*-dragonfly*)
 +	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h dragonfly.h dragonfly-stdint.h i386/dragonfly.h"
 +	tmake_file="${tmake_file} i386/t-crtstuff"
 +	;;
 +x86_64-*-dragonfly*)
 +	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h dragonfly.h dragonfly-stdint.h i386/x86-64.h i386/dragonfly.h"
 +	tmake_file="${tmake_file} i386/t-crtstuff"
 +	;;
  i[34567]86-*-freebsd*)
  	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${fbsd_tm_file} i386/freebsd.h"
 @@ -119,27 +119,27 @@
 -	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h netbsd-elf.h i386/netbsd-elf.h"
 +	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h netbsd-elf.h i386/netbsd-elf.h netbsd-stdint.h"
  	extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
 +	tmake_file="${tmake_file} i386/t-crtstuff"
  	;;
  x86_64-*-netbsd*)
 -	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h netbsd-elf.h i386/x86-64.h i386/netbsd64.h"
 +	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h netbsd-elf.h i386/x86-64.h i386/netbsd64.h netbsd-stdint.h"
  	extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
 +	tmake_file="${tmake_file} i386/t-crtstuff"
  	;;
  i[34567]86-*-openbsd2.*|i[34567]86-*openbsd3.[0123])
  	tm_file="i386/i386.h i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h openbsd-oldgas.h openbsd.h i386/openbsd.h"
-@@ -3554,6 +3610,8 @@
+@@ -3577,6 +3633,8 @@
  		;;
  	i[34567]86-*-cygwin* | i[34567]86-*-mingw* | x86_64-*-mingw*)
  		;;
 +	i[34567]86-*-dragonfly* | x86_64-*-dragonfly*)
 +		;;
  	i[34567]86-*-freebsd* | x86_64-*-freebsd*)
  		;;
  	ia64*-*-linux*)
 --- /dev/null
 +++ gcc/config/dragonfly-stdint.h
 @@ -0,0 +1,56 @@
 +/* Definitions for <stdint.h> types for DragonFly systems.
 +   Copyright (C) 2009 Free Software Foundation, Inc.
 @@ -758,37 +758,37 @@
 @@ -266,8 +278,10 @@
  esac
  case ${host} in
 -*-*-darwin* | *-*-freebsd* | *-*-netbsd* | *-*-openbsd* | *-*-solaris2* | \
 -  alpha*-dec-osf5.1*)
 +*-*-freebsd* | *-*-dragonfly* | *-*-netbsd* | *-*-openbsd*)
 +  enable_execute_stack=enable-execute-stack-freebsd.c
 +  ;;
 +*-*-darwin* | *-*-solaris2* | alpha*-dec-osf5.1*)
    enable_execute_stack=enable-execute-stack-mprotect.c
    ;;
  i[34567]86-*-mingw* | x86_64-*-mingw*)
-@@ -354,11 +368,11 @@
+@@ -358,11 +372,11 @@
  	tmake_file="$tmake_file arm/t-arm arm/t-elf t-softfp-sfdf t-softfp-excl arm/t-softfp t-softfp"
  	extra_parts="$extra_parts crti.o crtn.o"
  	;;
--arm*-*-eabi* | arm*-*-symbianelf* | arm*-*-rtemseabi*)
+-arm*-*-eabi* | arm*-*-symbianelf* | arm*-*-rtems*)
-+arm*-*-symbianelf* | arm*-*-rtemseabi*)
++arm*-*-symbianelf* | arm*-*-rtems*)
  	tmake_file="${tmake_file} arm/t-arm arm/t-elf t-fixedpoint-gnu-prefix"
  	tm_file="$tm_file arm/bpabi-lib.h"
  	case ${host} in
--	arm*-*-eabi* | arm*-*-rtemseabi*)
+-	arm*-*-eabi* | arm*-*-rtems*)
-+	arm*-*-rtemseabi*)
++	arm*-*-rtems*)
  	  tmake_file="${tmake_file} arm/t-bpabi"
  	  extra_parts="crtbegin.o crtend.o crti.o crtn.o"
  	  ;;
 @@ -526,16 +540,29 @@
  x86_64-*-elf*)
  	tmake_file="$tmake_file i386/t-crtstuff t-crtstuff-pic t-libgcc-pic"
  	;;
 +i[34567]86-*-dragonfly*)
 +	tmake_file="${tmake_file} i386/t-dragonfly i386/t-crtstuff"
 +	md_unwind_header=i386/dragonfly-unwind.h
 +	;;
 +x86_64-*-dragonfly*)
 +	tmake_file="${tmake_file} i386/t-dragonfly i386/t-crtstuff"
 @@ -802,27 +802,27 @@
  	tmake_file="${tmake_file} i386/t-freebsd i386/t-crtstuff"
 +	md_unwind_header=i386/freebsd-unwind.h
  	;;
  i[34567]86-*-netbsdelf*)
 +	tmake_file="${tmake_file} i386/t-crtstuff"
 +	md_unwind_header=i386/netbsd-unwind.h
  	;;
  x86_64-*-netbsd*)
  	tmake_file="${tmake_file} i386/t-crtstuff"
 +	md_unwind_header=i386/netbsd-unwind.h
  	;;
  i[34567]86-*-openbsd2.*|i[34567]86-*openbsd3.[0123])
  	;;
-@@ -1163,6 +1190,7 @@
+@@ -1167,6 +1194,7 @@
    i[34567]86-*-gnu* | \
    i[34567]86-*-solaris2* | x86_64-*-solaris2.1[0-9]* | \
    i[34567]86-*-cygwin* | i[34567]86-*-mingw* | x86_64-*-mingw* | \
 +  i[34567]86-*-dragonfly* | x86_64-*-dragonfly* | \
    i[34567]86-*-freebsd* | x86_64-*-freebsd*)
    	tmake_file="${tmake_file} t-softfp-tf"
  	if test "${host_address}" = 32; then
 --- libgcc/crtstuff.c.orig
 +++ libgcc/crtstuff.c
 @@ -81,11 +81,19 @@
+ }
  #endif
 @@ -915,28 +915,28 @@
 +    && (defined(__FreeBSD__) || defined(__DragonFly__))
  # define ElfW __ElfN
  # define USE_PT_GNU_EH_FRAME
  #endif
 +#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
 +    && defined(TARGET_DL_ITERATE_PHDR) \
 +    && (defined(__OpenBSD__) || defined(__NetBSD__))
 +# define ElfW(n) Elf_##n
 +# define USE_PT_GNU_EH_FRAME
 +#endif
++
  #if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
-     && defined(TARGET_DL_ITERATE_PHDR) \
+     && defined(__OpenBSD__)
-     && defined(__sun__) && defined(__svr4__)
+ # define ElfW(type) Elf_##type
 --- /dev/null
 +++ libgcc/config/i386/dragonfly-unwind.h
 @@ -0,0 +1,158 @@
 +/* DWARF2 EH unwinding support for DragonFly BSD: AMD x86-64 and x86.
 +   Copyright (C) 2010 John Marino <draco@marino.st> */
++
 +/* Do code reading to identify a signal frame, and set the frame
 +   state data appropriately.  See unwind-dw2.c for the structs. */
++
 +#include <sys/types.h>
 +#include <sys/sysctl.h>
 +#include <signal.h>
 +#include <sys/ucontext.h>
 @@ -1463,137 +1463,137 @@
  void
  setproctitle (const char *name ATTRIBUTE_UNUSED, ...)
+ {
 +#ifndef __ANDROID__
  #ifdef PR_SET_NAME
    /* On GNU/Linux this sets the top visible "comm", but not
       necessarily the name visible in ps. */
    prctl (PR_SET_NAME, name);
  #endif
 +#endif
+ }
 --- gcc/configure.orig
 +++ gcc/configure
-@@ -26856,6 +26856,20 @@
+@@ -26902,6 +26902,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*)
 +  if grep dl_iterate_phdr $target_header_dir/link_elf.h > /dev/null 2>&1; then
 +      gcc_cv_target_dl_iterate_phdr=yes
 +    else
 +      gcc_cv_target_dl_iterate_phdr=no
 +    fi
 +  ;;
  esac
  if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
 --- gcc/Makefile.in.orig
 +++ gcc/Makefile.in
-@@ -1150,7 +1150,6 @@
+@@ -1165,7 +1165,6 @@
  	insn-automata.o \
  	insn-emit.o \
  	insn-extract.o \
 -	insn-modes.o \
  	insn-opinit.o \
  	insn-output.o \
  	insn-peep.o \
-@@ -1469,13 +1468,18 @@
+@@ -1484,13 +1483,18 @@
  ALL_HOST_BACKEND_OBJS = $(GCC_OBJS) $(OBJS) $(OBJS-libcommon) \
    $(OBJS-libcommon-target) @TREEBROWSER@ main.o gccspec.o cppspec.o \
    $(COLLECT2_OBJS) $(EXTRA_GCC_OBJS) mips-tfile.o mips-tdump.o \
 -  $(GCOV_OBJS) $(GCOV_DUMP_OBJS)
 +  $(GCOV_OBJS) $(GCOV_DUMP_OBJS) insn-modes.o insn-modes-ada.o
  # This lists all host object files, whether they are included in this
  # compilation or not.
  ALL_HOST_OBJS = $(ALL_HOST_FRONTEND_OBJS) $(ALL_HOST_BACKEND_OBJS)
 -BACKEND = main.o @TREEBROWSER@ libbackend.a libcommon-target.a libcommon.a \
 +BACKEND = main.o @TREEBROWSER@ insn-modes.o libbackend.a \
 +	libcommon-target.a libcommon.a \
 +	$(CPPLIB) $(LIBDECNUMBER)
++
 +BACKEND2 = main.o @TREEBROWSER@ insn-modes-ada.o libbackend.a \
 +	libcommon-target.a libcommon.a \
  	$(CPPLIB) $(LIBDECNUMBER)
  MOSTLYCLEANFILES = insn-flags.h insn-config.h insn-codes.h \
-@@ -3506,6 +3510,8 @@
+@@ -3522,6 +3526,8 @@
    $(TM_H) $(RTL_H) $(DIAGNOSTIC_CORE_H) insn-config.h $(RECOG_H)
  insn-modes.o : insn-modes.c $(CONFIG_H) $(SYSTEM_H) coretypes.h	$(TM_H) \
    $(MACHMODE_H)
 +insn-modes-ada.o : insn-modes-ada.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
 +  $(TM_H) $(MACHMODE_H)
  insn-opinit.o : insn-opinit.c $(CONFIG_H) $(SYSTEM_H) coretypes.h	\
    $(TM_H) $(RTL_H) $(TM_P_H) insn-config.h $(FLAGS_H) $(RECOG_H)	\
    $(EXPR_H) $(OPTABS_H) reload.h
-@@ -3599,6 +3605,7 @@
+@@ -3615,6 +3621,7 @@
  insn-modes.c: s-modes; @true
  insn-modes.h: s-modes-h; @true
 +insn-modes-ada.c: s-modes-ada; @true
  min-insn-modes.c: s-modes-m; @true
  s-modes: build/genmodes$(build_exeext)
-@@ -3616,6 +3623,12 @@
+@@ -3632,6 +3639,12 @@
  	$(SHELL) $(srcdir)/../move-if-change tmp-min-modes.c min-insn-modes.c
  	$(STAMP) s-modes-m
 +s-modes-ada: s-modes
 +	$(shell sed -e 's/: TARGET_96_ROUND_53_LONG_DOUBLE \? &ieee_extended_intel_96_round_53_format //'  \
 +		< insn-modes.c > tmp-modes-ada.c)
 +	$(SHELL) $(srcdir)/../move-if-change tmp-modes-ada.c insn-modes-ada.c
 +	$(STAMP) s-modes-ada
++
  insn-preds.c: s-preds; @true
  tm-preds.h: s-preds-h; @true
  tm-constrs.h: s-constrs-h; @true
-@@ -4378,7 +4391,7 @@
+@@ -4394,7 +4407,7 @@
  	DESTDIR=$(@D) \
  	$(SHELL) $(srcdir)/doc/install.texi2html
 -MANFILES = doc/gcov.1 doc/cpp.1 doc/gcc.1 doc/gfdl.7 doc/gpl.7 doc/fsf-funding.7
 +MANFILES = doc/gcov.1 doc/cpp.1 doc/gcc.1
  generated-manpages: man
-@@ -4530,7 +4543,7 @@
+@@ -4546,7 +4559,7 @@
  # Install the driver last so that the window when things are
  # broken is small.
  install: install-common $(INSTALL_HEADERS) \
 -    install-cpp install-man install-info install-@POSUB@ \
 +    install-cpp install-man install-@POSUB@ \
      install-driver install-lto-wrapper install-gcc-ar
  ifeq ($(enable_plugin),yes)
-@@ -4655,6 +4668,9 @@
+@@ -4671,6 +4684,9 @@
  	-rm -f $(DESTDIR)$(bindir)/$(target_noncanonical)-gcc-$(version)$(exeext)
  	-( cd $(DESTDIR)$(bindir) && \
  	   $(LN) $(GCC_INSTALL_NAME)$(exeext) $(target_noncanonical)-gcc-$(version)$(exeext) )
 +	-if [ -f gnat1$(exeext) ] ; then \
 +	  ( cd $(DESTDIR)$(bindir) && $(LN) $(GCC_INSTALL_NAME)$(exeext) ada$(exeext) ) \
 +	fi
  	-if [ -f gcc-cross$(exeext) ] ; then \
  	  if [ -d $(DESTDIR)$(gcc_tooldir)/bin/. ] ; then \
  	    rm -f $(DESTDIR)$(gcc_tooldir)/bin/gcc$(exeext); \
-@@ -4728,10 +4744,7 @@
+@@ -4744,10 +4760,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 $@
 --- configure.orig
 +++ configure

 @@ -1,31 +1,30 @@
-# $NetBSD: Makefile,v 1.7 2013/01/31 23:01:56 marino Exp $
+# $NetBSD: Makefile,v 1.8 2013/04/12 15:40:54 marino Exp $
+#
 PKGNAME=	gcc-aux-${SNAPSHOT}
 DISTNAME=	gcc-${GCC_VERSION}
 PKGREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/}
 DISTFILES=	${DISTNAME}.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=	20120920
+SNAPSHOT=	20130411
 GCC_BRANCH=	4.7
-GCC_POINT=	2
+GCC_POINT=	3
 GCC_VERSION=	${GCC_BRANCH}.${GCC_POINT}
 LANGS=		c
 USE_TOOLS+=		gmake sed:run 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
 # DragonFly i386/AMD64 and SunOS i386  Bootstrap compilers for OpenBSD and
 # FreeBSD also exist, but are currently reserved for the native package systems

 @@ -1,18 +1,18 @@
-$NetBSD: distinfo,v 1.2 2012/10/01 17:26:52 marino Exp $
+$NetBSD: distinfo,v 1.3 2013/04/12 15:40:54 marino Exp $
-SHA1 (gcc-4.7.2.tar.bz2) = a464ba0f26eef24c29bcd1e7489421117fb9ee35
+SHA1 (gcc-4.7.3.tar.bz2) = 69e02737bd6e1a7c6047d801600d39c32b9427ca
-RMD160 (gcc-4.7.2.tar.bz2) = fc281ade14b47d2a9c2ced4f7082c74bfbae31c1
+RMD160 (gcc-4.7.3.tar.bz2) = b4ba153b098cad726ecd28195ee445aa542d37ae
-Size (gcc-4.7.2.tar.bz2) = 82884636 bytes
+Size (gcc-4.7.3.tar.bz2) = 82904224 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

 @@ -34,46 +34,46 @@
 +      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)
        AC_MSG_RESULT(gnu)
 --- libstdc++-v3/configure.orig
 +++ libstdc++-v3/configure
-@@ -15704,7 +15704,7 @@
+@@ -15738,7 +15738,7 @@
  if test "${enable_clocale+set}" = set; then :
    enableval=$enable_clocale;
        case "$enableval" in
 -       generic|gnu|ieee_1003.1-2001|newlib|yes|no|auto) ;;
 +       generic|gnu|ieee_1003.1-2001|newlib|darwin|dragonfly|yes|no|auto) ;;
         *) as_fn_error "Unknown argument to enable/disable clocale" "$LINENO" 5 ;;
  	  	        esac
-@@ -15742,6 +15742,9 @@
+@@ -15776,6 +15776,9 @@
        darwin* | freebsd*)
  	enable_clocale_flag=darwin
  	;;
 +      dragonfly*)
 +	enable_clocale_flag=dragonfly
 +	;;
        *)
  	if test x"$with_newlib" = x"yes"; then
  	  enable_clocale_flag=newlib
-@@ -15883,7 +15886,23 @@
+@@ -15917,7 +15920,23 @@
        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; }
 +      CLOCALE_H=config/locale/generic/c_locale.h
 +      CLOCALE_CC=config/locale/dragonfly/c_locale.cc
 +      CCODECVT_CC=config/locale/generic/codecvt_members.cc
 +      CCOLLATE_CC=config/locale/generic/collate_members.cc
 +      CCTYPE_CC=config/locale/dragonfly/ctype_members.cc
 +      CMESSAGES_H=config/locale/generic/messages_members.h