OSDN Git Service

Changlog libcpp
[pf3gnuchains/gcc-fork.git] / gcc / config.gcc
index 3bef721..0002563 100644 (file)
@@ -1,6 +1,6 @@
 # GCC target-specific configuration file.
 # Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-# 2008 Free Software Foundation, Inc.
+# 2008, 2009 Free Software Foundation, Inc.
 
 #This file is part of GCC.
 
 #  use_gcc_tgmath      If set, add tgmath.h to the list of used header
 #                      files.
 #
+#  use_gcc_stdint      If "wrap", install a version of stdint.h that
+#                      wraps the system's copy for hosted compilations;
+#                      if "provide", provide a version of systems without
+#                      such a system header; otherwise "none", do not
+#                      provide such a header at all.
+#
 #  extra_passes                List of extra executables compiled for this target
 #                      machine, used for compiling from source to object.
 #
 #  cxx_target_objs     List of extra target-dependent objects that be
 #                      linked into the C++ compiler only.
 #
+#  fortran_target_objs List of extra target-dependent objects that be
+#                      linked into the fortran compiler only.
+#
 #  target_gtfiles       List of extra source files with type information.
 #
 #  xm_defines          List of macros to define when compiling for the
 #                      system normally uses GNU as.
 #
 #  need_64bit_hwint    Set to yes if HOST_WIDE_INT must be 64 bits wide
-#                      for this target.  This is true iff this target
-#                      supports "long" or "wchar_t" wider than 32 bits.
+#                      for this target.  This is true if this target
+#                      supports "long" or "wchar_t" wider than 32 bits,
+#                      or BITS_PER_WORD is wider than 32 bits.
 #                      The setting made here must match the one made in
 #                      other locations such as libcpp/configure.ac
 #
 #  configure_default_options
 #                      Set to an initializer for configure_default_options
 #                      in configargs.h, based on --with-cpu et cetera.
-#
-#  use_fixproto                Set to "yes" if fixproto should be run normally,
-#                      "no" if fixproto should never be run.
 
 # The following variables are used in each case-construct to build up the
 # outgoing variables:
@@ -165,6 +172,7 @@ out_file=
 tmake_file=
 extra_headers=
 use_gcc_tgmath=yes
+use_gcc_stdint=none
 extra_passes=
 extra_parts=
 extra_programs=
@@ -173,6 +181,7 @@ extra_gcc_objs=
 extra_options=
 c_target_objs=
 cxx_target_objs=
+fortran_target_objs=
 tm_defines=
 xm_defines=
 # Set this to force installation and use of collect2.
@@ -191,72 +200,41 @@ default_use_cxa_atexit=no
 target_gtfiles=
 need_64bit_hwint=
 
-# Default to not using fixproto.  Targets which need fixproto should
-# specifically set this to 'yes'.
-use_fixproto=no
-
 # Don't carry these over build->host->target.  Please.
 xm_file=
 md_file=
 
 # Obsolete configurations.
-case ${target} in
-   mt-*                        \
- | strongarm*-*                \
- | ep9312*-*           \
- | xscale*-*           \
- | parisc*-*           \
- | m680[012]0-*                \
- | *-*-beos*           \
- | *-*-kaos*           \
- | *-*-linux*aout*     \
- | *-*-linux*libc1*    \
- | *-*-solaris2.[0-6]  \
- | *-*-solaris2.[0-6].*        \
- | *-*-sysv*           \
- | *-*-windiss*                \
- | alpha*-*-unicosmk*  \
- | cris-*-aout         \
- | hppa1.1-*-pro*      \
- | hppa1.1-*-osf*      \
- | hppa1.1-*-bsd*      \
- | i[34567]86-sequent-ptx4*    \
- | i[34567]86-*-sco3.2v5*      \
- | i[34567]86-*-uwin*  \
- | powerpc-*-chorusos* \
- | vax-*-bsd*          \
- | vax-*-ultrix*       \
- )
-    if test "x$enable_obsolete" != xyes; then
-      echo "*** Configuration ${target} is obsolete." >&2
-      echo "*** Specify --enable-obsolete to build it anyway." >&2
-      echo "*** Support will be REMOVED in the next major release of GCC," >&2
-      echo "*** unless a maintainer comes forward." >&2
-      exit 1
-    fi;;
-esac
+#case ${target} in
+# )
+#    if test "x$enable_obsolete" != xyes; then
+#      echo "*** Configuration ${target} is obsolete." >&2
+#      echo "*** Specify --enable-obsolete to build it anyway." >&2
+#      echo "*** Support will be REMOVED in the next major release of GCC," >&2
+#      echo "*** unless a maintainer comes forward." >&2
+#      exit 1
+#    fi;;
+#esac
 
 # Unsupported targets list.  Do not put an entry in this list unless
 # it would otherwise be caught by a more permissive pattern.  The list
 # should be in alphabetical order.
 case ${target} in
-   alpha*-*-linux*libc1*               \
- | i[34567]86-sequent-sysv             \
- | i[34567]86-sequent-sysv[123]*       \
- | i[34567]86-go32-*                   \
+   i[34567]86-go32-*                   \
  | i[34567]86-*-go32*                  \
- | m68k-*-linux*aout*                  \
- | m68k-*-linux*libc1*                 \
  | mips64orion*-*-rtems*               \
- | powerpc-*-linux*libc1*              \
- | sparc-*-linux*aout*                 \
- | sparc-*-linux*libc1*                        \
+ | pdp11-*-bsd                         \
  | sparc-hal-solaris2*                 \
  | thumb-*-*                           \
+ | *-*-linux*aout*                     \
  | *-*-linux*coff*                     \
+ | *-*-linux*libc1*                    \
  | *-*-linux*oldld*                    \
  | *-*-rtemsaout*                      \
  | *-*-rtemscoff*                      \
+ | *-*-solaris2.[0-6]                  \
+ | *-*-solaris2.[0-6].*                        \
+ | *-*-sysv*           \
  | vax-*-vms*                          \
  )
        echo "*** Configuration ${target} not supported" 1>&2
@@ -282,9 +260,6 @@ alpha*-*-*)
 am33_2.0-*-linux*)
        cpu_type=mn10300
        ;;
-strongarm*-*-*)
-       cpu_type=arm
-       ;;
 arm*-*-*)
        cpu_type=arm
        extra_headers="mmintrin.h arm_neon.h"
@@ -297,61 +272,62 @@ bfin*-*)
 crisv32-*)
        cpu_type=cris
        ;;
-ep9312*-*-*)
-       cpu_type=arm
-       ;;
 frv*)  cpu_type=frv
        ;;
+moxie*)        cpu_type=moxie
+       ;;
 fido-*-*)
        cpu_type=m68k
        extra_headers=math-68881.h
         ;;
-xscale-*-*)
-       cpu_type=arm
-       extra_headers="mmintrin.h"
-       ;;
 i[34567]86-*-*)
        cpu_type=i386
+       c_target_objs="i386-c.o"
+       cxx_target_objs="i386-c.o"
        extra_headers="cpuid.h mmintrin.h mm3dnow.h xmmintrin.h emmintrin.h
                       pmmintrin.h tmmintrin.h ammintrin.h smmintrin.h
                       nmmintrin.h bmmintrin.h mmintrin-common.h
-                      wmmintrin.h"
+                      wmmintrin.h immintrin.h x86intrin.h avxintrin.h 
+                      ia32intrin.h cross-stdarg.h"
        ;;
 x86_64-*-*)
        cpu_type=i386
+       c_target_objs="i386-c.o"
+       cxx_target_objs="i386-c.o"
        extra_headers="cpuid.h mmintrin.h mm3dnow.h xmmintrin.h emmintrin.h
                       pmmintrin.h tmmintrin.h ammintrin.h smmintrin.h
                       nmmintrin.h bmmintrin.h mmintrin-common.h
-                      wmmintrin.h"
+                      wmmintrin.h immintrin.h x86intrin.h avxintrin.h 
+                      ia32intrin.h cross-stdarg.h"
        need_64bit_hwint=yes
        ;;
 ia64-*-*)
        extra_headers=ia64intrin.h
        need_64bit_hwint=yes
        ;;
-hppa*-*-* | parisc*-*-*)
+hppa*-*-*)
        cpu_type=pa
        ;;
 m32r*-*-*)
         cpu_type=m32r
         ;;
-m680[012]0-*-*)
-       cpu_type=m68k
-       extra_headers=math-68881.h
-       ;;
 m68k-*-*)
        extra_headers=math-68881.h
        ;;
 mips*-*-*)
        cpu_type=mips
        need_64bit_hwint=yes
+       extra_headers="loongson.h"
        ;;
+picochip-*-*)
+        cpu_type=picochip
+        ;;
 powerpc*-*-*)
        cpu_type=rs6000
        extra_headers="ppc-asm.h altivec.h spe.h ppu_intrinsics.h paired.h spu2vmx.h vec_types.h si2vmx.h"
        need_64bit_hwint=yes
        case x$with_cpu in
-           xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[3456]|xpower6x|xrs64a|xcell)
+           xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[34567]|xpower6x|xrs64a|xcell)
                cpu_is_64bit=yes
                ;;
        esac
@@ -398,15 +374,17 @@ fi
 
 case ${target} in
 i[34567]86-*-*)
-       if test $enable_cld = yes; then
+       if test "x$enable_cld" = xyes; then
                tm_defines="${tm_defines} USE_IX86_CLD=1"
        fi
+       tm_file="vxworks-dummy.h ${tm_file}"
        ;;
 x86_64-*-*)
        tm_file="i386/biarch64.h ${tm_file}"
-       if test $enable_cld = yes; then
+       if test "x$enable_cld" = xyes; then
                tm_defines="${tm_defines} USE_IX86_CLD=1"
        fi
+       tm_file="vxworks-dummy.h ${tm_file}"
        ;;
 esac
 
@@ -422,7 +400,7 @@ case ${target} in
 *-*-darwin*)
   tm_file="${tm_file} darwin.h"
   case ${target} in
-  *-*-darwin9*)
+  *-*-darwin[912]*)
     tm_file="${tm_file} darwin9.h"
     ;;
   esac
@@ -431,11 +409,13 @@ case ${target} in
   tmake_file="t-darwin ${cpu_type}/t-darwin t-slibgcc-darwin"
   target_gtfiles="\$(srcdir)/config/darwin.c"
   extra_options="${extra_options} darwin.opt"
-  c_target_objs="darwin-c.o"
-  cxx_target_objs="darwin-c.o"
+  c_target_objs="${c_target_objs} darwin-c.o"
+  cxx_target_objs="${cxx_target_objs} darwin-c.o"
+  fortran_target_objs="darwin-f.o"
   extra_objs="darwin.o"
   extra_gcc_objs="darwin-driver.o"
   default_use_cxa_atexit=yes
+  use_gcc_stdint=wrap
   case ${enable_threads} in
     "" | yes | posix) thread_file='posix' ;;
   esac
@@ -491,21 +471,38 @@ case ${target} in
       exit 1
       ;;
   esac
-  fbsd_tm_file="${fbsd_tm_file} freebsd-spec.h freebsd.h"
-  ;;
-*-*-linux*libc1* | *-*-linux*aout*)
-  # Avoid the generic linux case.
+  fbsd_tm_file="${fbsd_tm_file} freebsd-spec.h freebsd.h freebsd-stdint.h"
+  case ${target} in
+    *-*-freebsd[345].*)
+      :;;
+    *)
+      default_use_cxa_atexit=yes;;
+  esac
+  # need_64bit_hwint=yes # system compiler has this for all arch!
+  use_gcc_stdint=wrap
   ;;
-*-*-linux* | frv-*-*linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu)
-  # Must come before *-*-gnu* (because of *-*-linux-gnu* systems).
+*-*-linux* | frv-*-*linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu | *-*-gnu* | *-*-kopensolaris*-gnu)
   extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
-  extra_options="${extra_options} linux.opt"
   gas=yes
   gnu_ld=yes
   case ${enable_threads} in
     "" | yes | posix) thread_file='posix' ;;
   esac
   tmake_file="t-slibgcc-elf-ver t-linux"
+  case $target in
+    *-*-linux* | frv-*-*linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu | *-*-kopensolaris*-gnu)
+      :;;
+    *-*-gnu*)
+      tmake_file="$tmake_file t-gnu";;
+  esac
+  # glibc / uclibc switch.  uclibc isn't usable for GNU/Hurd and neither for
+  # GNU/k*BSD.
+  case $target in
+    *linux*)
+      extra_options="$extra_options linux.opt";;
+    *)
+      tm_defines="$tm_defines OPTION_GLIBC=1";;
+  esac
   case ${target} in
     *-*-*uclibc*)
       tm_defines="${tm_defines} UCLIBC_DEFAULT=1"
@@ -517,30 +514,7 @@ case ${target} in
   # Assume that glibc or uClibc are being used and so __cxa_atexit is provided.
   default_use_cxa_atexit=yes
   use_gcc_tgmath=no
-  ;;
-*-*-gnu*)
-  # On the Hurd, the setup is just about the same on
-  # each different CPU.  The specific machines that we
-  # support are matched above and just set $cpu_type.
-  tm_file="${cpu_type}/gnu.h"
-  extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o"
-  # GNU tools are the only tools.
-  gas=yes
-  gnu_ld=yes
-  # These details are the same as for Linux.
-  # But here we need a little extra magic.
-  tmake_file="t-slibgcc-elf-ver t-linux t-gnu"
-  case ${target} in
-    alpha*)
-      tm_file="${cpu_type}/${cpu_type}.h alpha/elf.h alpha/linux.h alpha/linux-elf.h gnu.h ${tm_file}"
-      ;;
-    i[34567]86-*-*)
-      tm_file="${cpu_type}/${cpu_type}.h i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h linux.h i386/linux.h gnu.h ${tm_file}"
-      ;;
-  esac
-  # Assume that glibc is being used and so __cxa_atexit is provided.
-  default_use_cxa_atexit=yes
-  use_gcc_tgmath=no
+  use_gcc_stdint=wrap
   ;;
 *-*-netbsd*)
   tmake_file="t-slibgcc-elf-ver t-libc-ok t-netbsd t-libgcc-pic"
@@ -598,6 +572,10 @@ case ${target} in
   case ${enable_threads} in
     yes) thread_file='rtems' ;;
   esac
+  use_gcc_stdint=wrap
+  ;;
+*-*-uclinux*)
+  use_gcc_stdint=wrap
   ;;
 *-*-vxworks*)
   tmake_file=t-vxworks
@@ -613,6 +591,7 @@ case ${target} in
 *-*-elf)
   # Assume that newlib is being used and so __cxa_atexit is provided.
   default_use_cxa_atexit=yes
+  use_gcc_stdint=wrap
   ;;
 esac
 
@@ -628,21 +607,13 @@ case ${target} in
        then tmake_file=${cpu_type}/t-$rest
        fi
        ;;
-alpha*-*-unicosmk*)
-       use_collect2=yes
-       tm_file="${tm_file} alpha/unicosmk.h"
-
-       # Don't include t-ieee for now because we don't support that yet
-       # tmake_file="alpha/t-ieee"
-       tmake_file="alpha/t-unicosmk"
-       use_fixproto=yes
-       ;;
 alpha*-*-linux*)
-       tm_file="${tm_file} alpha/elf.h alpha/linux.h alpha/linux-elf.h"
+       tm_file="${tm_file} alpha/elf.h alpha/linux.h alpha/linux-elf.h glibc-stdint.h"
        target_cpu_default="MASK_GAS"
        tmake_file="${tmake_file} alpha/t-crtfm alpha/t-alpha alpha/t-ieee alpha/t-linux"
        ;;
 alpha*-*-gnu*)
+       tm_file="$tm_file alpha/elf.h alpha/linux.h alpha/linux-elf.h gnu.h glibc-stdint.h alpha/gnu.h"
        target_cpu_default="MASK_GAS"
        tmake_file="${tmake_file} alpha/t-crtfm alpha/t-alpha alpha/t-ieee"
        ;;
@@ -699,32 +670,31 @@ alpha*-dec-osf[45]*)
        ;;
 alpha64-dec-*vms*)
        tm_file="${tm_file} alpha/vms.h alpha/vms64.h"
-       xm_file="alpha/xm-vms.h"
-       tmake_file="alpha/t-alpha alpha/t-vms alpha/t-vms64 alpha/t-ieee"
-       prefix=/gnu
-       local_prefix=/gnu
+       xm_file="alpha/xm-vms.h vms/xm-vms64.h"
+       tmake_file="alpha/t-alpha vms/t-vms vms/t-vms64 alpha/t-vms alpha/t-ieee"
+       xmake_file=vms/x-vms
+       exeext=.exe
+       install_headers_dir=install-headers-cp
+       extra_options="${extra_options} vms/vms.opt"
        ;;
 alpha*-dec-*vms*)
        tm_file="${tm_file} alpha/vms.h"
-       xm_file=alpha/xm-vms.h
-       tmake_file="alpha/t-alpha alpha/t-vms alpha/t-ieee"
-       prefix=/gnu
-       local_prefix=/gnu
+       xm_file="alpha/xm-vms.h"
+       tmake_file="alpha/t-alpha vms/t-vms alpha/t-vms alpha/t-ieee"
+       xmake_file=vms/x-vms
+       exeext=.exe
+       install_headers_dir=install-headers-cp
+       extra_options="${extra_options} vms/vms.opt"
        ;;
 arc-*-elf*)
-       tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
+       tm_file="dbxelf.h elfos.h svr4.h newlib-stdint.h ${tm_file}"
        extra_parts="crtinit.o crtfini.o"
-       use_fixproto=yes
-       ;;
-arm-*-coff* | armel-*-coff*)
-       tm_file="arm/semi.h arm/aout.h arm/arm.h arm/coff.h dbxcoff.h"
-       tmake_file="arm/t-arm arm/t-arm-coff"
        ;;
 arm-wrs-vxworks)
        tm_file="elfos.h arm/elf.h arm/aout.h ${tm_file} vx-common.h vxworks.h arm/vxworks.h"
        tmake_file="${tmake_file} arm/t-arm arm/t-vxworks"
        ;;
-arm*-*-freebsd*|strongarm*-*-freebsd*)
+arm*-*-freebsd*)
        tm_file="dbxelf.h elfos.h ${fbsd_tm_file} arm/elf.h arm/aout.h arm/freebsd.h arm/arm.h"
        tmake_file="${tmake_file} arm/t-arm arm/t-strongarm-elf"
        ;;
@@ -739,7 +709,7 @@ arm*-*-netbsd*)
        use_collect2=yes
        ;;
 arm*-*-linux*)                 # ARM GNU/Linux with ELF
-       tm_file="dbxelf.h elfos.h linux.h arm/elf.h arm/linux-gas.h arm/linux-elf.h"
+       tm_file="dbxelf.h elfos.h linux.h glibc-stdint.h arm/elf.h arm/linux-gas.h arm/linux-elf.h"
        case $target in
        arm*b-*)
                tm_defines="${tm_defines} TARGET_BIG_ENDIAN_DEFAULT=1"
@@ -765,10 +735,10 @@ arm*-*-linux*)                    # ARM GNU/Linux with ELF
        tmake_file="${tmake_file} arm/t-arm-softfp soft-fp/t-softfp"
        ;;
 arm*-*-uclinux*)               # ARM ucLinux
-       tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/linux-gas.h arm/uclinux-elf.h"
+       tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/linux-gas.h arm/uclinux-elf.h glibc-stdint.h"
        tmake_file="arm/t-arm arm/t-arm-elf"
        case ${target} in
-       arm*-*-uclinux-*eabi)
+       arm*-*-uclinux*eabi)
            tm_file="$tm_file arm/bpabi.h arm/uclinux-eabi.h"
            tmake_file="$tmake_file arm/t-bpabi"
            # The BPABI long long divmod functions return a 128-bit value in
@@ -782,7 +752,7 @@ arm*-*-uclinux*)            # ARM ucLinux
        tmake_file="${tmake_file} arm/t-arm-softfp soft-fp/t-softfp"
        ;;
 arm*-*-ecos-elf)
-       tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h arm/ecos-elf.h"
+       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"
        tmake_file="arm/t-arm arm/t-arm-elf"
        tmake_file="${tmake_file} arm/t-arm-softfp soft-fp/t-softfp"
        ;;
@@ -796,7 +766,10 @@ arm*-*-eabi* | arm*-*-symbianelf* )
        tmake_file="arm/t-arm arm/t-arm-elf"
        case ${target} in
        arm*-*-eabi*)
+         tm_file="$tm_file arm/eabi.h newlib-stdint.h"
          tmake_file="${tmake_file} arm/t-bpabi"
+         extra_options="${extra_options} arm/eabi.opt"
+         use_gcc_stdint=wrap
          ;;
        arm*-*-symbianelf*)
          tm_file="${tm_file} arm/symbian.h"
@@ -809,12 +782,12 @@ arm*-*-eabi* | arm*-*-symbianelf* )
        tmake_file="${tmake_file} arm/t-arm-softfp soft-fp/t-softfp"
        ;;
 arm*-*-rtems*)
-       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"
+       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 t-rtems arm/t-rtems"
        tmake_file="${tmake_file} arm/t-arm-softfp soft-fp/t-softfp"
        ;;
-arm*-*-elf | ep9312-*-elf)
-       tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h"
+arm*-*-elf)
+       tm_file="dbxelf.h elfos.h newlib-stdint.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h"
        tmake_file="arm/t-arm arm/t-arm-elf"
        tmake_file="${tmake_file} arm/t-arm-softfp soft-fp/t-softfp"
        ;;
@@ -825,38 +798,38 @@ arm*-wince-pe*)
        extra_objs="pe.o"
        ;;
 arm-*-pe*)
-       tm_file="arm/semi.h arm/aout.h arm/arm.h arm/coff.h dbxcoff.h arm/pe.h"
+       tm_file="arm/semi.h arm/aout.h arm/arm.h arm/coff.h dbxcoff.h arm/pe.h newlib-stdint.h"
        tmake_file="arm/t-arm arm/t-pe"
+       use_gcc_stdint=wrap
        extra_options="${extra_options} arm/pe.opt"
        extra_objs="pe.o"
        ;;
-arm*-*-kaos*)
-       tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h kaos.h arm/kaos-arm.h"
-       tmake_file="arm/t-arm arm/t-arm-elf"
-       tmake_file="${tmake_file} arm/t-arm-softfp soft-fp/t-softfp"
-       ;;
 avr-*-rtems*)
-       tm_file="avr/avr.h dbxelf.h avr/rtems.h rtems.h"
+       tm_file="avr/avr.h dbxelf.h avr/rtems.h rtems.h newlib-stdint.h"
        tmake_file="avr/t-avr t-rtems avr/t-rtems"
+       extra_gcc_objs="driver-avr.o avr-devices.o"
+       extra_objs="avr-devices.o"
        ;;
 avr-*-*)
-       tm_file="avr/avr.h dbxelf.h"
-       use_fixproto=yes
+       tm_file="avr/avr.h dbxelf.h newlib-stdint.h"
+       use_gcc_stdint=wrap
+       extra_gcc_objs="driver-avr.o avr-devices.o"
+       extra_objs="avr-devices.o"
        ;;
 bfin*-elf*)
-       tm_file="${tm_file} dbxelf.h elfos.h bfin/elf.h"
+       tm_file="${tm_file} dbxelf.h elfos.h newlib-stdint.h bfin/elf.h"
        tmake_file=bfin/t-bfin-elf
        use_collect2=no
        ;;
 bfin*-uclinux*)
-       tm_file="${tm_file} dbxelf.h elfos.h bfin/elf.h linux.h bfin/uclinux.h"
+       tm_file="${tm_file} dbxelf.h elfos.h bfin/elf.h linux.h glibc-stdint.h bfin/uclinux.h"
        tmake_file=bfin/t-bfin-uclinux
        tm_defines="${tm_defines} UCLIBC_DEFAULT=1"
        extra_options="${extra_options} linux.opt"
        use_collect2=no
        ;;
 bfin*-linux-uclibc*)
-       tm_file="${tm_file} dbxelf.h elfos.h bfin/elf.h linux.h bfin/linux.h ./linux-sysroot-suffix.h"
+       tm_file="${tm_file} dbxelf.h elfos.h bfin/elf.h linux.h glibc-stdint.h bfin/linux.h ./linux-sysroot-suffix.h"
        tmake_file="t-slibgcc-elf-ver bfin/t-bfin-linux"
        extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
        use_collect2=no
@@ -866,31 +839,28 @@ bfin*-rtems*)
        tmake_file="bfin/t-bfin t-rtems bfin/t-rtems"
        ;;
 bfin*-*)
-       tm_file="${tm_file} dbxelf.h elfos.h bfin/elf.h"
+       tm_file="${tm_file} dbxelf.h elfos.h newlib-stdint.h bfin/elf.h"
        tmake_file=bfin/t-bfin
        use_collect2=no
-       ;;
-cris-*-aout)
-       tm_file="dbxelf.h ${tm_file} cris/aout.h"
-       gas=yes
-       tmake_file="cris/t-cris cris/t-aout"
-       extra_options="${extra_options} cris/aout.opt"
+       use_gcc_stdint=wrap
        ;;
 crisv32-*-elf | crisv32-*-none)
-       tm_file="dbxelf.h elfos.h ${tm_file}"
+       tm_file="dbxelf.h elfos.h newlib-stdint.h ${tm_file}"
        tmake_file="cris/t-cris"
        target_cpu_default=32
        gas=yes
        extra_options="${extra_options} cris/elf.opt"
+       use_gcc_stdint=wrap
        ;;
 cris-*-elf | cris-*-none)
-       tm_file="dbxelf.h elfos.h ${tm_file}"
+       tm_file="dbxelf.h elfos.h newlib-stdint.h ${tm_file}"
        tmake_file="cris/t-cris cris/t-elfmulti"
        gas=yes
        extra_options="${extra_options} cris/elf.opt"
+       use_gcc_stdint=wrap
        ;;
 crisv32-*-linux* | cris-*-linux*)
-       tm_file="dbxelf.h elfos.h svr4.h ${tm_file} linux.h cris/linux.h"
+       tm_file="dbxelf.h elfos.h svr4.h ${tm_file} linux.h glibc-stdint.h cris/linux.h"
        # We need to avoid using t-linux, so override default tmake_file
        tmake_file="cris/t-cris t-slibgcc-elf-ver cris/t-linux"
        extra_options="${extra_options} cris/linux.opt"
@@ -904,50 +874,60 @@ crisv32-*-linux* | cris-*-linux*)
        esac
        ;;
 crx-*-elf)
-       tm_file="elfos.h ${tm_file}"
+       tm_file="elfos.h newlib-stdint.h ${tm_file}"
        extra_parts="crtbegin.o crtend.o"
        use_collect2=no
        ;;
 fr30-*-elf)
-       tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
+       tm_file="dbxelf.h elfos.h svr4.h newlib-stdint.h ${tm_file}"
        tmake_file=fr30/t-fr30
        extra_parts="crti.o crtn.o crtbegin.o crtend.o"
-       use_fixproto=yes
        ;;
 frv-*-elf)
-       tm_file="dbxelf.h elfos.h svr4.h ${tm_file} frv/frv-abi.h"
+       tm_file="dbxelf.h elfos.h svr4.h newlib-stdint.h ${tm_file} frv/frv-abi.h"
        tmake_file=frv/t-frv
-       use_fixproto=yes
        ;;
 frv-*-*linux*)
        tm_file="dbxelf.h elfos.h svr4.h ${tm_file} \
-                linux.h frv/linux.h frv/frv-abi.h"
+                linux.h glibc-stdint.h frv/linux.h frv/frv-abi.h"
        tmake_file="${tmake_file} frv/t-frv frv/t-linux"
        ;;
+moxie-*-elf)
+       gas=yes
+       gnu_ld=yes
+       tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
+       extra_parts="crti.o crtn.o crtbegin.o crtend.o"
+       tmake_file="${tmake_file} moxie/t-moxie moxie/t-moxie-softfp soft-fp/t-softfp"
+       ;;
+moxie-*-uclinux*)
+       gas=yes
+       gnu_ld=yes
+       tm_file="dbxelf.h elfos.h svr4.h ${tm_file} linux.h glibc-stdint.h moxie/uclinux.h"
+       extra_parts="crti.o crtn.o crtbegin.o crtend.o"
+       tmake_file="${tmake_file} moxie/t-moxie moxie/t-moxie-softfp soft-fp/t-softfp"
+       tm_defines="${tm_defines} UCLIBC_DEFAULT=1"
+       extra_options="${extra_options} linux.opt"
+       ;;
 h8300-*-rtems*)
        tmake_file="h8300/t-h8300 h8300/t-elf t-rtems h8300/t-rtems"
-       tm_file="h8300/h8300.h dbxelf.h elfos.h h8300/elf.h h8300/rtems.h rtems.h"
+       tm_file="h8300/h8300.h dbxelf.h elfos.h h8300/elf.h h8300/rtems.h rtems.h newlib-stdint.h"
        ;;
 h8300-*-elf*)
        tmake_file="h8300/t-h8300 h8300/t-elf"
-       tm_file="h8300/h8300.h dbxelf.h elfos.h h8300/elf.h"
-       use_fixproto=yes
-       ;;
-h8300-*-*)
-       tm_file="h8300/h8300.h dbxcoff.h h8300/coff.h"
-       use_fixproto=yes
+       tm_file="h8300/h8300.h dbxelf.h elfos.h newlib-stdint.h h8300/elf.h"
        ;;
-hppa*64*-*-linux* | parisc*64*-*-linux*)
+hppa*64*-*-linux*)
        target_cpu_default="MASK_PA_11|MASK_PA_20"
        tm_file="pa/pa64-start.h ${tm_file} dbxelf.h elfos.h svr4.h linux.h \
-                pa/pa-linux.h pa/pa64-regs.h pa/pa-64.h pa/pa64-linux.h"
+                glibc-stdint.h pa/pa-linux.h pa/pa64-regs.h pa/pa-64.h \
+                pa/pa64-linux.h"
        tmake_file="${tmake_file} pa/t-linux64"
        gas=yes gnu_ld=yes
        need_64bit_hwint=yes
        ;;
-hppa*-*-linux* | parisc*-*-linux*)
+hppa*-*-linux*)
        target_cpu_default="MASK_PA_11|MASK_NO_SPACE_REGS"
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h pa/pa-linux.h \
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h glibc-stdint.h pa/pa-linux.h \
                 pa/pa32-regs.h pa/pa32-linux.h"
        tmake_file="${tmake_file} pa/t-linux"
        # Set the libgcc version number
@@ -961,24 +941,6 @@ hppa*-*-linux* | parisc*-*-linux*)
 #hppa*-*-openbsd*)
 #      target_cpu_default="MASK_PA_11"
 #      ;;
-hppa1.1-*-pro*)
-       target_cpu_default="MASK_PORTABLE_RUNTIME|MASK_NO_SPACE_REGS|MASK_SOFT_FLOAT"
-       tm_file="${tm_file} pa/pa32-regs.h dbxelf.h elfos.h pa/elf.h \
-                pa/pa-pro-end.h libgloss.h"
-       tmake_file="pa/t-pro"
-       ;;
-hppa1.1-*-osf*)
-       target_cpu_default="MASK_PA_11"
-       tm_file="${tm_file} pa/pa32-regs.h dbxelf.h pa/som.h pa/pa-osf.h"
-       tmake_file="pa/t-pa"
-       use_collect2=yes
-       ;;
-hppa1.1-*-bsd*)
-       target_cpu_default="MASK_PA_11"
-       tm_file="${tm_file} pa/pa32-regs.h dbxelf.h pa/som.h"
-       tmake_file="pa/t-pa"
-       use_collect2=yes
-       ;;
 hppa[12]*-*-hpux10*)
        case ${target} in
        hppa1.1-*-* | hppa2*-*-*)
@@ -994,6 +956,8 @@ hppa[12]*-*-hpux10*)
                extra_options="${extra_options} pa/pa-hpux1010.opt"
                ;;
        esac
+       use_gcc_stdint=provide
+       tm_file="${tm_file} hpux-stdint.h"
        tmake_file="pa/t-pa-hpux10 pa/t-pa-hpux pa/t-hpux-shlib"
        case ${enable_threads} in
          "")
@@ -1012,7 +976,6 @@ hppa[12]*-*-hpux10*)
            tmake_file="$tmake_file pa/t-slibgcc-dwarf-ver"
        fi
        use_collect2=yes
-       use_fixproto=yes
        gas=yes
        ;;
 hppa*64*-*-hpux11*)
@@ -1051,6 +1014,16 @@ hppa*64*-*-hpux11*)
                ;;
        esac
        gas=yes
+       case ${target} in
+         *-*-hpux11.[01]*)
+               use_gcc_stdint=provide
+               tm_file="${tm_file} hpux-stdint.h"
+               ;;
+         *-*-hpux11.[23]*)
+               use_gcc_stdint=wrap
+               tm_file="${tm_file} hpux-stdint.h"
+               ;;
+       esac
        ;;
 hppa[12]*-*-hpux11*)
        case ${target} in
@@ -1081,6 +1054,16 @@ hppa[12]*-*-hpux11*)
        esac
        use_collect2=yes
        gas=yes
+       case ${target} in
+         *-*-hpux11.[01]*)
+               use_gcc_stdint=provide
+               tm_file="${tm_file} hpux-stdint.h"
+               ;;
+         *-*-hpux11.[23]*)
+               use_gcc_stdint=wrap
+               tm_file="${tm_file} hpux-stdint.h"
+               ;;
+       esac
        ;;
 i[34567]86-*-darwin*)
        need_64bit_hwint=yes
@@ -1090,41 +1073,20 @@ i[34567]86-*-darwin*)
        # then this file using that to set --with-cpu=i386 which has no -m64
        # support.
        with_cpu=${with_cpu:-generic}
-       tmake_file="${tmake_file} i386/t-fprules-softfp64 soft-fp/t-softfp i386/t-crtpc i386/t-crtfm"
+       tmake_file="${tmake_file} i386/t-crtpc i386/t-crtfm"
        ;;
 x86_64-*-darwin*)
        with_cpu=${with_cpu:-generic}
-       tmake_file="t-darwin ${cpu_type}/t-darwin64 t-slibgcc-darwin i386/t-fprules-softfp64 soft-fp/t-softfp i386/t-crtpc i386/t-crtfm"
+       tmake_file="${tmake_file} t-darwin ${cpu_type}/t-darwin64 t-slibgcc-darwin i386/t-crtpc i386/t-crtfm"
        tm_file="${tm_file} ${cpu_type}/darwin64.h"
        ;;
 i[34567]86-*-elf*)
-       tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h i386/i386elf.h"
-       tmake_file="i386/t-i386elf t-svr4"
-       use_fixproto=yes
+       tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h newlib-stdint.h i386/i386elf.h"
+       tmake_file="${tmake_file} i386/t-i386elf t-svr4"
        ;;
 x86_64-*-elf*)
-       tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h i386/i386elf.h i386/x86-64.h"
-       tmake_file="i386/t-i386elf t-svr4"
-       use_fixproto=yes
-       ;;
-i[34567]86-sequent-ptx4* | i[34567]86-sequent-sysv4*)
-       if test x$gas = xyes
-       then
-               tm_file="${tm_file} usegas.h"
-       fi
-       tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ptx4.h i386/ptx4-i.h"
-       tmake_file=t-svr4
-       extra_parts="crtbegin.o crtend.o"
-       use_fixproto=yes
-       ;;
-i[34567]86-*-aout*)
-       tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h i386/i386-aout.h"
-       use_fixproto=yes
-       ;;
-i[34567]86-*-beoself* | i[34567]86-*-beos*)
-       tmake_file='i386/t-beos i386/t-crtpic'
-       tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h i386/beos-elf.h"
-       extra_parts='crtbegin.o crtend.o'
+       tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h newlib-stdint.h i386/i386elf.h i386/x86-64.h"
+       tmake_file="${tmake_file} i386/t-i386elf t-svr4"
        ;;
 i[34567]86-*-freebsd*)
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${fbsd_tm_file} i386/freebsd.h"
@@ -1138,7 +1100,7 @@ i[34567]86-*-netbsdelf*)
        ;;
 i[34567]86-*-netbsd*)
        tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h netbsd.h netbsd-aout.h i386/netbsd.h"
-       tmake_file=t-netbsd
+       tmake_file="${tmake_file} t-netbsd"
        extra_parts=""
        use_collect2=yes
        ;;
@@ -1149,7 +1111,7 @@ x86_64-*-netbsd*)
 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"
        # needed to unconfuse gdb
-       tmake_file="t-libc-ok t-openbsd i386/t-openbsd"
+       tmake_file="${tmake_file} t-libc-ok t-openbsd i386/t-openbsd"
        # we need collect2 until our bug is fixed...
        use_collect2=yes
        ;;
@@ -1159,32 +1121,28 @@ i[34567]86-*-openbsd*)
        gas=yes
        gnu_ld=yes
        ;;
-i[34567]86-*-coff*)
-       tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/i386-coff.h"
-       use_fixproto=yes
-       ;;
-i[34567]86-*-linux* | i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-knetbsd*-gnu)
+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
-       tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h linux.h"
+       tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h linux.h glibc-stdint.h"
        case ${target} in
        i[34567]86-*-linux*)
                if test x$enable_targets = xall; then
                        tm_file="${tm_file} i386/x86-64.h i386/linux64.h"
                        tm_defines="${tm_defines} TARGET_BI_ARCH=1"
-                       tmake_file="${tmake_file} i386/t-linux64 i386/t-fprules-softfp64 soft-fp/t-softfp"
+                       tmake_file="${tmake_file} i386/t-linux64"
                        need_64bit_hwint=yes
-                       # FIXME: -m64 for i[34567]86-*-* should be allowed just
-                       # like -m32 for x86_64-*-*.
                        case X"${with_cpu}" in
-                       Xgeneric|Xcore2|Xnocona|Xx86-64|Xamdfam10|Xbarcelona|Xk8|Xopteron|Xathlon64|Xathlon-fx)
+                       Xgeneric|Xatom|Xcore2|Xnocona|Xx86-64|Xamdfam10|Xbarcelona|Xk8|Xopteron|Xathlon64|Xathlon-fx)
                                ;;
                        X)
-                               with_cpu=generic
+                               if test x$with_cpu_64 = x; then
+                                       with_cpu_64=generic
+                               fi
                                ;;
                        *)
                                echo "Unsupported CPU used in --with-cpu=$with_cpu, supported values:" 1>&2
-                               echo "generic core2 nocona x86-64 amdfam10 barcelona k8 opteron athlon64 athlon-fx" 1>&2
+                               echo "generic atom core2 nocona x86-64 amdfam10 barcelona k8 opteron athlon64 athlon-fx" 1>&2
                                exit 1
                                ;;
                        esac
@@ -1194,32 +1152,33 @@ i[34567]86-*-linux* | i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-knetbsd*-gnu)
                ;;
        i[34567]86-*-knetbsd*-gnu) tm_file="${tm_file} i386/linux.h knetbsd-gnu.h i386/knetbsd-gnu.h" ;;
        i[34567]86-*-kfreebsd*-gnu) tm_file="${tm_file} i386/linux.h kfreebsd-gnu.h i386/kfreebsd-gnu.h" ;;
+       i[34567]86-*-kopensolaris*-gnu) tm_file="${tm_file} i386/linux.h kopensolaris-gnu.h i386/kopensolaris-gnu.h" ;;
+       i[34567]86-*-gnu*) tm_file="$tm_file i386/linux.h gnu.h i386/gnu.h";;
        esac
        tmake_file="${tmake_file} i386/t-crtstuff i386/t-crtpc i386/t-crtfm t-dfprules"
        ;;
 x86_64-*-linux* | x86_64-*-kfreebsd*-gnu | x86_64-*-knetbsd*-gnu)
-       tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h linux.h \
+       tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h linux.h glibc-stdint.h \
                 i386/x86-64.h i386/linux64.h"
        case ${target} in
        x86_64-*-kfreebsd*-gnu) tm_file="${tm_file} kfreebsd-gnu.h" ;;
        x86_64-*-knetbsd*-gnu) tm_file="${tm_file} knetbsd-gnu.h" ;;
        esac
-       tmake_file="${tmake_file} i386/t-linux64 i386/t-crtstuff i386/t-crtpc i386/t-crtfm i386/t-fprules-softfp64 soft-fp/t-softfp t-dfprules"
-       ;;
-i[34567]86-*-gnu*)
+       tmake_file="${tmake_file} i386/t-linux64 i386/t-crtstuff i386/t-crtpc i386/t-crtfm t-dfprules"
        ;;
 i[34567]86-pc-msdosdjgpp*)
        xm_file=i386/xm-djgpp.h
        tm_file="dbxcoff.h ${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/djgpp.h"
-       tmake_file=i386/t-djgpp
+       tmake_file="${tmake_file} i386/t-djgpp"
        extra_options="${extra_options} i386/djgpp.opt"
        gnu_ld=yes
        gas=yes
+       use_gcc_stdint=wrap
        ;;
 i[34567]86-*-lynxos*)
        xm_defines=POSIX
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h i386/lynx.h lynx.h"
-       tmake_file="i386/t-crtstuff t-lynx"
+       tmake_file="${tmake_file} i386/t-crtstuff t-lynx"
        extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
        extra_options="${extra_options} lynx.opt"
        thread_file=lynx
@@ -1228,7 +1187,7 @@ i[34567]86-*-lynxos*)
        ;;
 i[3456x]86-*-netware*)
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h tm-dwarf2.h i386/netware.h"
-       tmake_file=i386/t-netware
+       tmake_file="${tmake_file} i386/t-netware"
        extra_objs=netware.o
        case /${with_ld} in
        */nwld)
@@ -1247,40 +1206,26 @@ i[3456x]86-*-netware*)
        ;;
 i[34567]86-*-nto-qnx*)
        tm_file="${tm_file} i386/att.h dbxelf.h tm-dwarf2.h elfos.h svr4.h i386/unix.h i386/nto.h"
-       tmake_file=i386/t-nto
+       tmake_file="${tmake_file} i386/t-nto"
        gnu_ld=yes
        gas=yes
        ;;
 i[34567]86-*-rtems*)
-       tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h i386/i386elf.h i386/rtemself.h rtems.h"
+       tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h i386/i386elf.h i386/rtemself.h rtems.h newlib-stdint.h"
        extra_parts="crtbegin.o crtend.o crti.o crtn.o"
-       tmake_file="i386/t-rtems-i386 i386/t-crtstuff t-rtems"
-       ;;
-i[34567]86-*-sco3.2v5*)        # 80386 running SCO Open Server 5
-       tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h i386/sco5.h"
-       if test x$gas = xyes
-       then
-               tm_file="usegas.h ${tm_file}"
-       fi
-       tmake_file=i386/t-sco5
-       extra_parts="crtbegin.o crtend.o"
-       extra_options="${extra_options} i386/sco5.opt"
-       use_fixproto=yes
+       tmake_file="${tmake_file} i386/t-rtems-i386 i386/t-crtstuff t-rtems"
        ;;
 i[34567]86-*-solaris2*)
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h i386/sysv4.h sol2.h"
        case ${target} in
-       *-*-solaris2.[0-6] | *-*-solaris2.[0-6].*)
-               tm_file="${tm_file} sol2-6.h"
-               ;;
        *-*-solaris2.1[0-9]*)
                tm_file="${tm_file} sol2-10.h"
                ;;
        esac
        tm_file="${tm_file} i386/sol2.h"
-       tmake_file="t-sol2 i386/t-sol2 t-svr4"
-       c_target_objs="sol2-c.o"
-       cxx_target_objs="sol2-c.o"
+       tmake_file="${tmake_file} t-sol2 t-svr4"
+       c_target_objs="${c_target_objs} sol2-c.o"
+       cxx_target_objs="${cxx_target_objs} sol2-c.o"
        extra_objs="sol2.o"
        tm_p_file="${tm_p_file} sol2-protos.h"
        if test x$gnu_ld = xyes; then
@@ -1292,78 +1237,45 @@ i[34567]86-*-solaris2*)
        if test x$gas = xyes; then
                tm_file="usegas.h ${tm_file}"
        fi
-       case ${target} in
-       *-*-solaris2.[789] | *-*-solaris2.1[0-9]*)
-               tm_file="$tm_file tm-dwarf2.h"
-               ;;
-       esac
+       tm_file="$tm_file tm-dwarf2.h"
        case ${target} in
        *-*-solaris2.1[0-9]*)
                tm_file="${tm_file} i386/x86-64.h i386/sol2-10.h"
                tm_defines="${tm_defines} TARGET_BI_ARCH=1"
-               tmake_file="$tmake_file i386/t-crtstuff i386/t-sol2-10"
+               tmake_file="$tmake_file i386/t-sol2-10"
+               # i386/t-crtstuff only affects libgcc.  Its inclusion
+               # depends on a runtime test and is thus performed in
+               # libgcc/configure.ac instead.
                need_64bit_hwint=yes
-               # FIXME: -m64 for i[34567]86-*-* should be allowed just
-               # like -m32 for x86_64-*-*.
+               use_gcc_stdint=wrap
                case X"${with_cpu}" in
-               Xgeneric|Xcore2|Xnocona|Xx86-64|Xamdfam10|Xbarcelona|Xk8|Xopteron|Xathlon64|Xathlon-fx)
+               Xgeneric|Xatom|Xcore2|Xnocona|Xx86-64|Xamdfam10|Xbarcelona|Xk8|Xopteron|Xathlon64|Xathlon-fx)
                        ;;
                X)
-                       with_cpu=generic
+                       if test x$with_cpu_64 = x; then
+                               with_cpu_64=generic
+                       fi
                        ;;
                *)
                        echo "Unsupported CPU used in --with-cpu=$with_cpu, supported values:" 1>&2
-                       echo "generic core2 nocona x86-64 amdfam10 barcelona k8 opteron athlon64 athlon-fx" 1>&2
+                       echo "generic atom core2 nocona x86-64 amdfam10 barcelona k8 opteron athlon64 athlon-fx" 1>&2
                        exit 1
                        ;;
                esac
-               # Solaris 2.10 provides crt1.o, crti.o, crtn.o, and gcrt1.o as
-               # part of the base system.
-               extra_parts="gmon.o crtbegin.o crtend.o"
                ;;
        *)
-               extra_parts="crt1.o crti.o crtn.o gcrt1.o gmon.o crtbegin.o crtend.o"
+               use_gcc_stdint=provide
                ;;
        esac
        case ${enable_threads}:${have_pthread_h}:${have_thread_h} in
          "":yes:* | yes:yes:* )
-               case ${target} in
-                 *-*-solaris2.[0-6] | *-*-solaris2.[0-6].*)
-                       thread_file=posix95
-                       ;;
-                 *)
-                       thread_file=posix
-                       ;;
-               esac
+               thread_file=posix
                ;;
          "":*:yes | yes:*:yes )
                thread_file=solaris
                ;;
        esac
        ;;
-i[34567]86-*-sysv5*)           # Intel x86 on System V Release 5
-       tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h i386/sysv4.h i386/sysv5.h"
-       if test x$stabs = xyes
-       then
-               tm_file="${tm_file} dbx.h"
-       fi
-       tmake_file="i386/t-crtpic t-svr4"
-       extra_parts="crtbegin.o crtend.o"
-       if test x$enable_threads = xyes; then
-              thread_file='posix'
-       fi
-       use_fixproto=yes
-       ;;
-i[34567]86-*-sysv4*)           # Intel 80386's running system V.4
-       tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h i386/sysv4.h i386/sysv4-cpp.h"
-       if test x$stabs = xyes
-       then
-               tm_file="${tm_file} dbx.h"
-       fi
-       tmake_file="i386/t-crtpic t-svr4"
-       extra_parts="crtbegin.o crtend.o"
-       use_fixproto=yes
-       ;;
 i[4567]86-wrs-vxworks|i[4567]86-wrs-vxworksae)
        tm_file="${tm_file} i386/unix.h i386/att.h elfos.h svr4.h vx-common.h"
        case ${target} in
@@ -1378,32 +1290,87 @@ i[4567]86-wrs-vxworks|i[4567]86-wrs-vxworksae)
        esac
        ;;
 i[34567]86-*-pe | i[34567]86-*-cygwin*)
-       tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/cygming.h i386/cygwin.h"
+       tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/cygming.h i386/cygwin.h i386/cygwin-stdint.h"
        xm_file=i386/xm-cygwin.h
-       tmake_file="i386/t-cygwin i386/t-cygming"
+       # This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h
+       if test x$sjlj = x0; then
+               tmake_eh_file="i386/t-dw2-eh"
+       else
+               tmake_eh_file="i386/t-sjlj-eh"
+       fi
+       tmake_file="${tmake_file} ${tmake_eh_file} i386/t-cygming i386/t-cygwin"
        target_gtfiles="\$(srcdir)/config/i386/winnt.c"
        extra_options="${extra_options} i386/cygming.opt"
        extra_objs="winnt.o winnt-stubs.o"
-       c_target_objs="cygwin2.o msformat-c.o"
-       cxx_target_objs="cygwin2.o winnt-cxx.o msformat-c.o"
+       c_target_objs="${c_target_objs} cygwin2.o msformat-c.o"
+       cxx_target_objs="${cxx_target_objs} cygwin2.o winnt-cxx.o msformat-c.o"
        extra_gcc_objs=cygwin1.o
        if test x$enable_threads = xyes; then
                thread_file='posix'
        fi
+       use_gcc_stdint=wrap
        ;;
 i[34567]86-*-mingw* | x86_64-*-mingw*)
        tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/cygming.h i386/mingw32.h"
        xm_file=i386/xm-mingw32.h
-       tmake_file="i386/t-cygming i386/t-mingw32"
+       case ${target} in
+               x86_64-*-* | *-w64-*)
+                       need_64bit_hwint=yes
+                       ;;
+               *)
+                       ;;
+       esac
+       # This makes the logic if mingw's or the w64 feature set has to be used
+       case ${target} in
+               *-w64-*)
+                       tm_file="${tm_file} i386/mingw-w64.h"
+                       tmake_file="${tmake_file} i386/t-mingw-w64"
+                       if test x$enable_targets = xall; then
+                               tm_defines="${tm_defines} TARGET_BI_ARCH=1"
+                               case X"${with_cpu}" in
+                               Xgeneric|Xatom|Xcore2|Xnocona|Xx86-64|Xamdfam10|Xbarcelona|Xk8|Xopteron|Xathlon64|Xathlon-fx)
+                                       ;;
+                               X)
+                                       if test x$with_cpu_64 = x; then
+                                               with_cpu_64=generic
+                                       fi
+                                       ;;
+                               *)
+                                       echo "Unsupported CPU used in --with-cpu=$with_cpu, supported values:" 1>&2
+                                       echo "generic atom core2 nocona x86-64 amdfam10 barcelona k8 opteron athlon64 athlon-fx" 1>&2
+                                       exit 1
+                                       ;;
+                               esac
+                       fi
+                       ;;
+               *)
+                       tmake_file="${tmake_file} i386/t-mingw32"
+                       ;;
+       esac
+       tm_file="${tm_file} i386/mingw-stdint.h"
+       # This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h
+       if test x$sjlj = x0; then
+               tmake_eh_file="i386/t-dw2-eh"
+       else
+               tmake_eh_file="i386/t-sjlj-eh"
+       fi
+       tmake_file="${tmake_file} ${tmake_eh_file} i386/t-cygming"
        target_gtfiles="\$(srcdir)/config/i386/winnt.c"
-       extra_options="${extra_options} i386/cygming.opt"
+       extra_options="${extra_options} i386/cygming.opt i386/mingw.opt"
+       case ${target} in
+               *-w64-*)
+                       extra_options="${extra_options} i386/mingw-w64.opt"
+                       ;;
+               *)
+                       ;;
+       esac
        extra_objs="winnt.o winnt-stubs.o"
-       c_target_objs="msformat-c.o"
-       cxx_target_objs="winnt-cxx.o msformat-c.o"
+       c_target_objs="${c_target_objs} msformat-c.o"
+       cxx_target_objs="${cxx_target_objs} winnt-cxx.o msformat-c.o"
        default_use_cxa_atexit=yes
+       use_gcc_stdint=wrap
        case ${enable_threads} in
-         "" | yes | win32)
-         thread_file='win32'
+         "" | yes | win32)       thread_file='win32'
          tmake_file="${tmake_file} i386/t-gthr-win32"
          ;;
        esac
@@ -1422,20 +1389,9 @@ i[34567]86-*-mingw* | x86_64-*-mingw*)
                        ;;
        esac
        ;;
-i[34567]86-*-uwin*)
-       tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/cygwin.h i386/uwin.h"
-       tmake_file="i386/t-cygwin i386/t-uwin"
-       extra_objs=winnt.o
-       extra_options="${extra_options} i386/cygming.opt"
-       target_gtfiles="\$(srcdir)/config/i386/winnt.c"
-       if test x$enable_threads = xyes; then
-               thread_file='win32'
-       fi
-       use_fixproto=yes
-       ;;
 i[34567]86-*-interix3*)
        tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/i386-interix.h i386/i386-interix3.h interix.h interix3.h"
-       tmake_file="i386/t-interix"
+       tmake_file="${tmake_file} i386/t-interix"
        extra_objs=winnt.o
        target_gtfiles="\$(srcdir)/config/i386/winnt.c"
        if test x$enable_threads = xyes ; then
@@ -1445,12 +1401,8 @@ i[34567]86-*-interix3*)
                tm_file="${tm_file} dbxcoff.h"
        fi
        ;;
-i[34567]86-*-kaos*)
-       tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h i386/i386elf.h kaos.h i386/kaos-i386.h"
-       tmake_file="i386/t-i386elf t-svr4"
-       ;;
 ia64*-*-elf*)
-       tm_file="${tm_file} dbxelf.h elfos.h ia64/sysv4.h ia64/elf.h"
+       tm_file="${tm_file} dbxelf.h elfos.h newlib-stdint.h ia64/sysv4.h ia64/elf.h"
        tmake_file="ia64/t-ia64"
        target_cpu_default="0"
        if test x$gas = xyes
@@ -1462,7 +1414,6 @@ ia64*-*-elf*)
                target_cpu_default="${target_cpu_default}|MASK_GNU_LD"
        fi
        extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtfastmath.o"
-       use_fixproto=yes
        ;;
 ia64*-*-freebsd*)
        tm_file="${tm_file} dbxelf.h elfos.h ${fbsd_tm_file} ia64/sysv4.h ia64/freebsd.h"
@@ -1471,7 +1422,7 @@ ia64*-*-freebsd*)
        extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtfastmath.o"
        ;;
 ia64*-*-linux*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h ia64/sysv4.h ia64/linux.h"
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h glibc-stdint.h ia64/sysv4.h ia64/linux.h"
        tmake_file="${tmake_file} ia64/t-ia64 t-libunwind ia64/t-glibc"
        if test x$with_system_libunwind != xyes ; then
                tmake_file="${tmake_file} t-libunwind-elf ia64/t-glibc-libunwind"
@@ -1492,80 +1443,79 @@ ia64*-*-hpux*)
        c_target_objs="ia64-c.o"
        cxx_target_objs="ia64-c.o"
        extra_options="${extra_options} ia64/ilp32.opt"
-       # If we decide to run fixproto we should define FIXPROTO_DEFINES
-       # in ia64/t-hpux, and also fix the definition of putenv in
-       # sys-protos.h (const char not char).
+       use_gcc_stdint=wrap
+       tm_file="${tm_file} hpux-stdint.h"
+       ;;
+ia64-hp-*vms*)
+       tm_file="${tm_file} elfos.h ia64/sysv4.h ia64/elf.h ia64/vms.h ia64/vms64.h"
+       xm_file="vms/xm-vms.h vms/xm-vms64.h"
+       tmake_file="vms/t-vms vms/t-vms64 ia64/t-ia64 ia64/t-vms"
+       xmake_file=vms/x-vms
+       target_cpu_default="0"
+       if test x$gas = xyes
+       then
+               target_cpu_default="${target_cpu_default}|MASK_GNU_AS"
+       fi
+       exeext=.exe
+       install_headers_dir=install-headers-cp
+       extra_options="${extra_options} vms/vms.opt"
        ;;
 iq2000*-*-elf*)
-        tm_file="svr4.h elfos.h iq2000/iq2000.h"
+        tm_file="svr4.h elfos.h newlib-stdint.h iq2000/iq2000.h"
         tmake_file=iq2000/t-iq2000
         out_file=iq2000/iq2000.c
         md_file=iq2000/iq2000.md
-       use_fixproto=yes
         ;;
 m32r-*-elf*)
-       tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
+       tm_file="dbxelf.h elfos.h svr4.h newlib-stdint.h ${tm_file}"
        extra_parts="crtinit.o crtfini.o"
-       use_fixproto=yes
        ;;
 m32rle-*-elf*)
-       tm_file="dbxelf.h elfos.h svr4.h m32r/little.h ${tm_file}"
+       tm_file="dbxelf.h elfos.h svr4.h newlib-stdint.h m32r/little.h ${tm_file}"
        extra_parts="crtinit.o crtfini.o m32rx/crtinit.o m32rx/crtfini.o"
-       use_fixproto=yes
        ;;
+m32r-*-rtems*)
+       tm_file="dbxelf.h elfos.h svr4.h ${tm_file} m32r/rtems.h rtems.h newlib-stdint.h"
+       tmake_file="m32r/t-m32r t-rtems"
+       extra_parts="crtinit.o crtfini.o"
+       ;;
 m32r-*-linux*)
-       tm_file="dbxelf.h elfos.h svr4.h linux.h ${tm_file} m32r/linux.h"
+       tm_file="dbxelf.h elfos.h svr4.h linux.h glibc-stdint.h ${tm_file} m32r/linux.h"
        # We override the tmake_file for linux -- why?
        tmake_file="t-slibgcc-elf-ver m32r/t-linux"
        gnu_ld=yes
-       use_fixproto=yes
        if test x$enable_threads = xyes; then
                thread_file='posix'
        fi
        ;;
 m32rle-*-linux*)
-       tm_file="dbxelf.h elfos.h svr4.h linux.h m32r/little.h ${tm_file} m32r/linux.h"
+       tm_file="dbxelf.h elfos.h svr4.h linux.h glibc-stdint.h m32r/little.h ${tm_file} m32r/linux.h"
        # We override the tmake_file for linux -- why?
        tmake_file="t-slibgcc-elf-ver m32r/t-linux"
        gnu_ld=yes
-       use_fixproto=yes
        if test x$enable_threads = xyes; then
                thread_file='posix'
        fi
        ;;
 # m68hc11 and m68hc12 share the same machine description.
 m68hc11-*-*|m6811-*-*)
-       tm_file="dbxelf.h elfos.h usegas.h m68hc11/m68hc11.h"
+       tm_file="dbxelf.h elfos.h usegas.h newlib-stdint.h m68hc11/m68hc11.h"
        tm_p_file="m68hc11/m68hc11-protos.h"
        md_file="m68hc11/m68hc11.md"
        out_file="m68hc11/m68hc11.c"
        tmake_file="m68hc11/t-m68hc11"
-       use_fixproto=yes
+       use_gcc_stdint=wrap
         ;;
 m68hc12-*-*|m6812-*-*)
-       tm_file="m68hc11/m68hc12.h dbxelf.h elfos.h usegas.h m68hc11/m68hc11.h"
+       tm_file="m68hc11/m68hc12.h dbxelf.h elfos.h usegas.h newlib-stdint.h m68hc11/m68hc11.h"
        tm_p_file="m68hc11/m68hc11-protos.h"
        md_file="m68hc11/m68hc11.md"
        out_file="m68hc11/m68hc11.c"
        tmake_file="m68hc11/t-m68hc11"
        extra_options="${extra_options} m68hc11/m68hc11.opt"
-       use_fixproto=yes
+       use_gcc_stdint=wrap
         ;;
-m68k-*-aout*)
-       default_m68k_cpu=68020
-       default_cf_cpu=5206
-       tmake_file="m68k/t-floatlib m68k/t-m68kbare m68k/t-mlibs"
-       tm_file="${tm_file} m68k/m68k-none.h m68k/m68kemb.h m68k/m68k-aout.h libgloss.h"
-       ;;
-m68k-*-coff*)
-       default_m68k_cpu=68020
-       default_cf_cpu=5206
-       tmake_file="m68k/t-floatlib m68k/t-m68kbare m68k/t-mlibs"
-       tm_defines="${tm_defines} MOTOROLA=1"
-       tm_file="${tm_file} m68k/m68k-none.h m68k/m68kemb.h dbxcoff.h m68k/coff.h dbx.h"
-       use_fixproto=yes
-       ;;
-m68020-*-elf* | m68k-*-elf* | fido-*-elf*)
+m68k-*-elf* | fido-*-elf*)
        case ${target} in
        fido-*-elf*)
                # Check that $with_cpu makes sense.
@@ -1584,7 +1534,7 @@ m68020-*-elf* | m68k-*-elf* | fido-*-elf*)
                default_cf_cpu=5206
                ;;
        esac
-       tm_file="${tm_file} m68k/m68k-none.h m68k/m68kelf.h dbxelf.h elfos.h m68k/m68kemb.h m68k/m68020-elf.h"
+       tm_file="${tm_file} m68k/m68k-none.h m68k/m68kelf.h dbxelf.h elfos.h newlib-stdint.h m68k/m68kemb.h m68k/m68020-elf.h"
        tm_defines="${tm_defines} MOTOROLA=1"
        tmake_file="m68k/t-floatlib m68k/t-m68kbare m68k/t-m68kelf"
        # Add multilibs for targets other than fido.
@@ -1597,7 +1547,7 @@ m68020-*-elf* | m68k-*-elf* | fido-*-elf*)
        esac
        extra_parts="crtbegin.o crtend.o"
        ;;
-m68010-*-netbsdelf* | m68k*-*-netbsdelf*)
+m68k*-*-netbsdelf*)
        default_m68k_cpu=68020
        default_cf_cpu=5475
        tm_file="${tm_file} dbxelf.h elfos.h netbsd.h netbsd-elf.h m68k/netbsd-elf.h"
@@ -1618,30 +1568,30 @@ m68k-*-uclinuxoldabi*)          # Motorola m68k/ColdFire running uClinux
                                # m68k-elf-based ABI
        default_m68k_cpu=68020
        default_cf_cpu=5206
-       tm_file="${tm_file} m68k/m68k-none.h m68k/m68kelf.h dbxelf.h elfos.h m68k/uclinux-oldabi.h"
+       tm_file="${tm_file} m68k/m68k-none.h m68k/m68kelf.h dbxelf.h elfos.h m68k/uclinux-oldabi.h glibc-stdint.h"
        tm_defines="${tm_defines} MOTOROLA=1"
        tmake_file="m68k/t-floatlib m68k/t-uclinux"
-       use_fixproto=no
        ;;
 m68k-*-uclinux*)               # Motorola m68k/ColdFire running uClinux
                                # with uClibc, using the new GNU/Linux-style
                                # ABI.
        default_m68k_cpu=68020
        default_cf_cpu=5206
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h flat.h m68k/linux.h m68k/uclinux.h ./sysroot-suffix.h"
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h glibc-stdint.h flat.h m68k/linux.h m68k/uclinux.h ./sysroot-suffix.h"
        tm_defines="${tm_defines} MOTOROLA=1 UCLIBC_DEFAULT=1"
        extra_options="${extra_options} linux.opt"
        tmake_file="m68k/t-floatlib m68k/t-uclinux m68k/t-mlibs"
-       use_fixproto=no
        ;;
 m68k-*-linux*)         # Motorola m68k's running GNU/Linux
                                # with ELF format using glibc 2
                                # aka the GNU/Linux C library 6.
        default_m68k_cpu=68020
        default_cf_cpu=5475
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h m68k/linux.h"
+       with_arch=${with_arch:-m68k}
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h glibc-stdint.h m68k/linux.h ./sysroot-suffix.h"
        extra_options="${extra_options} m68k/ieee.opt"
        tm_defines="${tm_defines} MOTOROLA=1"
+       tmake_file="${tmake_file} m68k/t-floatlib m68k/t-linux m68k/t-mlibs"
        # if not configured with --enable-sjlj-exceptions, bump the
        # libgcc version number
        if test x$sjlj != x1; then
@@ -1652,21 +1602,32 @@ m68k-*-rtems*)
        default_m68k_cpu=68020
        default_cf_cpu=5206
        tmake_file="m68k/t-floatlib m68k/t-m68kbare m68k/t-crtstuff t-rtems m68k/t-rtems m68k/t-mlibs"
-       tm_file="${tm_file} m68k/m68k-none.h m68k/m68kelf.h dbxelf.h elfos.h m68k/m68kemb.h m68k/m68020-elf.h m68k/rtemself.h rtems.h"
+       tm_file="${tm_file} m68k/m68k-none.h m68k/m68kelf.h dbxelf.h elfos.h m68k/m68kemb.h m68k/m68020-elf.h m68k/rtemself.h rtems.h newlib-stdint.h"
        tm_defines="${tm_defines} MOTOROLA=1"
        extra_parts="crtbegin.o crtend.o"
        ;;
 mcore-*-elf)
-       tm_file="dbxelf.h elfos.h svr4.h ${tm_file} mcore/mcore-elf.h"
+       tm_file="dbxelf.h elfos.h svr4.h newlib-stdint.h ${tm_file} mcore/mcore-elf.h"
        tmake_file=mcore/t-mcore
-       use_fixproto=yes
        inhibit_libc=true
        ;;
 mcore-*-pe*)
-       tm_file="svr3.h dbxcoff.h ${tm_file} mcore/mcore-pe.h"
+       tm_file="svr3.h dbxcoff.h newlib-stdint.h ${tm_file} mcore/mcore-pe.h"
        tmake_file=mcore/t-mcore-pe
-       use_fixproto=yes
        inhibit_libc=true
+       use_gcc_stdint=wrap
+       ;;
+mep-*-*)
+       tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
+       tmake_file=mep/t-mep
+       extra_parts="crtbegin.o crtend.o"
+       c_target_objs="mep-pragma.o"
+       cxx_target_objs="mep-pragma.o"
+       if test -d "${srcdir}/../newlib/libc/include" &&
+          test "x$with_headers" = x; then
+               with_headers=yes
+       fi
+       use_gcc_stdint=wrap
        ;;
 mips-sgi-irix[56]*)
        tm_file="elfos.h ${tm_file} mips/iris.h"
@@ -1694,22 +1655,35 @@ mips-sgi-irix[56]*)
        case ${enable_threads}:${have_pthread_h} in
          "":yes | yes:yes ) thread_file=posix ;;
        esac
-       use_fixproto=yes
        ;;
 mips*-*-netbsd*)                       # NetBSD/mips, either endian.
        target_cpu_default="MASK_ABICALLS"
        tm_file="elfos.h ${tm_file} mips/elf.h netbsd.h netbsd-elf.h mips/netbsd.h"
        ;;
-mips64*-*-linux*)
-       tm_file="dbxelf.h elfos.h svr4.h linux.h ${tm_file} mips/linux.h mips/linux64.h"
-       tmake_file="${tmake_file} mips/t-linux64"
+mips64*-*-linux* | mipsisa64*-*-linux*)
+       tm_file="dbxelf.h elfos.h svr4.h linux.h glibc-stdint.h ${tm_file} mips/linux.h mips/linux64.h"
+       tmake_file="${tmake_file} mips/t-linux64 mips/t-libgcc-mips16"
        tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_N32"
+       case ${target} in
+               mips64el-st-linux-gnu)
+                       tm_file="${tm_file} mips/st.h"
+                       tmake_file="${tmake_file} mips/t-st"
+                       ;;
+               mips64octeon*-*-linux*)
+                       tm_defines="${tm_defines} MIPS_CPU_STRING_DEFAULT=\\\"octeon\\\""
+                       target_cpu_default=MASK_SOFT_FLOAT_ABI
+                       ;;
+               mipsisa64r2*-*-linux*)
+                       tm_defines="${tm_defines} MIPS_ISA_DEFAULT=65"
+                       ;;
+       esac
        gnu_ld=yes
        gas=yes
        test x$with_llsc != x || with_llsc=yes
        ;;
 mips*-*-linux*)                                # Linux MIPS, either endian.
-        tm_file="dbxelf.h elfos.h svr4.h linux.h ${tm_file} mips/linux.h"
+        tm_file="dbxelf.h elfos.h svr4.h linux.h glibc-stdint.h ${tm_file} mips/linux.h"
+       tmake_file="${tmake_file} mips/t-libgcc-mips16"
        case ${target} in
         mipsisa32r2*)
                tm_defines="${tm_defines} MIPS_ISA_DEFAULT=33"
@@ -1730,7 +1704,7 @@ mips*-*-openbsd*)
         esac
        ;;
 mips*-sde-elf*)
-       tm_file="elfos.h ${tm_file} mips/elf.h mips/sde.h"
+       tm_file="elfos.h newlib-stdint.h ${tm_file} mips/elf.h mips/sde.h"
        tmake_file="mips/t-sde mips/t-libgcc-mips16"
        case "${with_newlib}" in
          yes)
@@ -1755,6 +1729,9 @@ mips*-sde-elf*)
          mipsisa32*)
            tm_defines="MIPS_ISA_DEFAULT=32 MIPS_ABI_DEFAULT=ABI_32"
            ;;
+         mipsisa64r2*)
+           tm_defines="MIPS_ISA_DEFAULT=65 MIPS_ABI_DEFAULT=ABI_N32"
+           ;;
          mipsisa64*)
            tm_defines="MIPS_ISA_DEFAULT=64 MIPS_ABI_DEFAULT=ABI_N32"
            ;;
@@ -1762,8 +1739,9 @@ mips*-sde-elf*)
        ;;
 mipsisa32-*-elf* | mipsisa32el-*-elf* | \
 mipsisa32r2-*-elf* | mipsisa32r2el-*-elf* | \
-mipsisa64-*-elf* | mipsisa64el-*-elf*)
-       tm_file="elfos.h ${tm_file} mips/elf.h"
+mipsisa64-*-elf* | mipsisa64el-*-elf* | \
+mipsisa64r2-*-elf* | mipsisa64r2el-*-elf*)
+       tm_file="elfos.h newlib-stdint.h ${tm_file} mips/elf.h"
        tmake_file="mips/t-isa3264 mips/t-libgcc-mips16"
        case ${target} in
          mipsisa32r2*)
@@ -1772,6 +1750,9 @@ mipsisa64-*-elf* | mipsisa64el-*-elf*)
          mipsisa32*)
            tm_defines="${tm_defines} MIPS_ISA_DEFAULT=32"
            ;;
+         mipsisa64r2*)
+           tm_defines="${tm_defines} MIPS_ISA_DEFAULT=65"
+           ;;
          mipsisa64*)
            tm_defines="${tm_defines} MIPS_ISA_DEFAULT=64"
            ;;
@@ -1791,112 +1772,77 @@ mipsisa64-*-elf* | mipsisa64el-*-elf*)
        esac
        ;;
 mipsisa64sr71k-*-elf*)
-        tm_file="elfos.h ${tm_file} mips/elf.h"
+        tm_file="elfos.h newlib-stdint.h ${tm_file} mips/elf.h"
         tmake_file=mips/t-sr71k
        target_cpu_default="MASK_64BIT|MASK_FLOAT64"
        tm_defines="${tm_defines} MIPS_ISA_DEFAULT=64 MIPS_CPU_STRING_DEFAULT=\\\"sr71000\\\" MIPS_ABI_DEFAULT=ABI_EABI"
-       use_fixproto=yes
         ;;
 mipsisa64sb1-*-elf* | mipsisa64sb1el-*-elf*)
-       tm_file="elfos.h ${tm_file} mips/elf.h"
+       tm_file="elfos.h newlib-stdint.h ${tm_file} mips/elf.h"
        tmake_file="mips/t-elf mips/t-libgcc-mips16 mips/t-sb1"
        target_cpu_default="MASK_64BIT|MASK_FLOAT64"
        tm_defines="${tm_defines} MIPS_ISA_DEFAULT=64 MIPS_CPU_STRING_DEFAULT=\\\"sb1\\\" MIPS_ABI_DEFAULT=ABI_O64"
-       use_fixproto=yes
        ;;
 mips-*-elf* | mipsel-*-elf*)
-       tm_file="elfos.h ${tm_file} mips/elf.h"
+       tm_file="elfos.h newlib-stdint.h ${tm_file} mips/elf.h"
        tmake_file="mips/t-elf mips/t-libgcc-mips16"
-       use_fixproto=yes
        ;;
 mips64-*-elf* | mips64el-*-elf*)
-       tm_file="elfos.h ${tm_file} mips/elf.h"
+       tm_file="elfos.h newlib-stdint.h ${tm_file} mips/elf.h"
        tmake_file="mips/t-elf mips/t-libgcc-mips16"
        target_cpu_default="MASK_64BIT|MASK_FLOAT64"
        tm_defines="${tm_defines} MIPS_ISA_DEFAULT=3 MIPS_ABI_DEFAULT=ABI_O64"
-       use_fixproto=yes
        ;;
 mips64vr-*-elf* | mips64vrel-*-elf*)
-        tm_file="mips/vr.h elfos.h ${tm_file} mips/elf.h"
+        tm_file="elfos.h newlib-stdint.h ${tm_file} mips/vr.h mips/elf.h"
         tmake_file=mips/t-vr
-       use_fixproto=yes
+       tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_EABI"
         ;;
 mips64orion-*-elf* | mips64orionel-*-elf*)
-       tm_file="elfos.h ${tm_file} mips/elforion.h mips/elf.h"
+       tm_file="elfos.h newlib-stdint.h ${tm_file} mips/elforion.h mips/elf.h"
        tmake_file="mips/t-elf mips/t-libgcc-mips16"
        target_cpu_default="MASK_64BIT|MASK_FLOAT64"
        tm_defines="${tm_defines} MIPS_ISA_DEFAULT=3 MIPS_ABI_DEFAULT=ABI_O64"
-       use_fixproto=yes
        ;;
 mips*-*-rtems*)
-       tm_file="elfos.h ${tm_file} mips/elf.h mips/rtems.h rtems.h"
+       tm_file="elfos.h newlib-stdint.h ${tm_file} mips/elf.h mips/rtems.h rtems.h"
        tmake_file="mips/t-elf mips/t-libgcc-mips16 t-rtems mips/t-rtems"
        ;;
 mips-wrs-vxworks)
        tm_file="elfos.h ${tm_file} svr4.h mips/elf.h vx-common.h vxworks.h mips/vxworks.h"
        tmake_file="${tmake_file} mips/t-vxworks"
        ;;
-mips-wrs-windiss)      # Instruction-level simulator for VxWorks.
-       xm_defines=POSIX
-       tm_file="elfos.h mips/mips.h svr4.h mips/elf.h windiss.h mips/windiss.h"
-       tmake_file="${tmake_file} mips/t-elf mips/t-libgcc-mips16"
-       thread_file=
-       ;;
 mipstx39-*-elf* | mipstx39el-*-elf*)
-       tm_file="elfos.h ${tm_file} mips/r3900.h mips/elf.h"
+       tm_file="elfos.h newlib-stdint.h ${tm_file} mips/r3900.h mips/elf.h"
        tmake_file="mips/t-r3900 mips/t-libgcc-mips16"
-       use_fixproto=yes
        ;;
 mmix-knuth-mmixware)
+       tm_file="${tm_file} newlib-stdint.h"
        need_64bit_hwint=yes
+       use_gcc_stdint=wrap
        ;;
 mn10300-*-*)
-       tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
+       tm_file="dbxelf.h elfos.h svr4.h newlib-stdint.h ${tm_file}"
        if test x$stabs = xyes
        then
                tm_file="${tm_file} dbx.h"
        fi
        use_collect2=no
-       use_fixproto=yes
+       use_gcc_stdint=wrap
        ;;
-mt-*-elf)
-        tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
-        tmake_file="${tmake_file} mt/t-mt"
-        ;;
-pdp11-*-bsd)
-       tm_file="${tm_file} pdp11/2bsd.h"
-       use_fixproto=yes
-        ;;
 pdp11-*-*)
-       use_fixproto=yes
+       tm_file="${tm_file} newlib-stdint.h"
+       use_gcc_stdint=wrap
        ;;
+picochip-*)
+       tm_file="${tm_file} newlib-stdint.h"
+       use_gcc_stdint=wrap
+        ;;
 # port not yet contributed
 #powerpc-*-openbsd*)
 #      tmake_file="${tmake_file} rs6000/t-fprules rs6000/t-fprules-fpbit "
 #      extra_headers=
 #      ;;
-powerpc64-*-linux*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"
-       test x$with_cpu != x || cpu_is_64bit=yes
-       test x$cpu_is_64bit != xyes || tm_file="${tm_file} rs6000/default64.h"
-       tm_file="rs6000/biarch64.h ${tm_file} rs6000/linux64.h"
-       if test x${enable_secureplt} = xyes; then
-               tm_file="rs6000/secureplt.h ${tm_file}"
-       fi
-       extra_options="${extra_options} rs6000/sysv4.opt rs6000/linux64.opt"
-       tmake_file="t-dfprules rs6000/t-fprules ${tmake_file} rs6000/t-ppccomm rs6000/t-linux64 rs6000/t-fprules-softfp soft-fp/t-softfp"
-       ;;
-powerpc64-*-gnu*)
-       tm_file="${cpu_type}/${cpu_type}.h elfos.h svr4.h freebsd-spec.h gnu.h rs6000/sysv4.h rs6000/linux64.h rs6000/gnu.h"
-       extra_options="${extra_options} rs6000/sysv4.opt rs6000/linux64.opt"
-       tmake_file="rs6000/t-fprules t-slibgcc-elf-ver t-gnu rs6000/t-linux64 rs6000/t-fprules-softfp soft-fp/t-softfp"
-       ;;
-powerpc-*-beos*)
-       tm_file="${tm_file} rs6000/aix.h rs6000/beos.h rs6000/xcoff.h"
-       tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-beos"
-       extra_headers=
-       use_fixproto=yes
-       ;;
 powerpc-*-darwin*)
        extra_options="${extra_options} rs6000/darwin.opt"
        extra_parts="crt2.o"
@@ -1929,100 +1875,112 @@ powerpc-*-netbsd*)
        tmake_file="${tmake_file} rs6000/t-netbsd"
        extra_options="${extra_options} rs6000/sysv4.opt"
        ;;
-powerpc-*-chorusos*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h chorus.h"
-       tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcos rs6000/t-ppccomm"
-       extra_options="${extra_options} rs6000/sysv4.opt"
-       case ${enable_threads} in
-         yes | posix)
-           thread_file='posix'
-           ;;
-       esac
-       use_fixproto=yes
-       ;;
 powerpc-*-eabispe*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h rs6000/eabispe.h"
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h rs6000/eabispe.h"
        extra_options="${extra_options} rs6000/sysv4.opt"
        tmake_file="rs6000/t-spe rs6000/t-ppccomm"
+       use_gcc_stdint=wrap
        ;;
 powerpc-*-eabisimaltivec*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h rs6000/eabisim.h rs6000/eabialtivec.h"
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h rs6000/eabisim.h rs6000/eabialtivec.h"
        extra_options="${extra_options} rs6000/sysv4.opt"
        tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcendian rs6000/t-ppccomm"
+       use_gcc_stdint=wrap
        ;;
 powerpc-*-eabisim*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h rs6000/eabisim.h"
+       tm_file="${tm_file} dbxelf.h elfos.h usegas.h svr4.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h rs6000/eabisim.h"
        extra_options="${extra_options} rs6000/sysv4.opt"
        tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
+       use_gcc_stdint=wrap
        ;;
 powerpc-*-elf*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"
+       tm_file="${tm_file} dbxelf.h elfos.h usegas.h svr4.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h"
        extra_options="${extra_options} rs6000/sysv4.opt"
        tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
-       use_fixproto=yes
        ;;
 powerpc-*-eabialtivec*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h rs6000/eabialtivec.h"
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h rs6000/eabialtivec.h"
        extra_options="${extra_options} rs6000/sysv4.opt"
        tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcendian rs6000/t-ppccomm"
+       use_gcc_stdint=wrap
+       ;;
+powerpc-xilinx-eabi*)
+       tm_file="${tm_file} dbxelf.h elfos.h usegas.h svr4.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/eabi.h rs6000/singlefp.h rs6000/xfpu.h rs6000/xilinx.h"
+       extra_options="${extra_options} rs6000/sysv4.opt"
+       tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm rs6000/t-xilinx"
+       use_gcc_stdint=wrap
        ;;
 powerpc-*-eabi*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h"
+       tm_file="${tm_file} dbxelf.h elfos.h usegas.h svr4.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h"
        extra_options="${extra_options} rs6000/sysv4.opt"
        tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
+       use_gcc_stdint=wrap
        ;;
 powerpc-*-rtems*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h rs6000/rtems.h rtems.h"
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h rs6000/rtems.h rtems.h"
        extra_options="${extra_options} rs6000/sysv4.opt"
        tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-rtems t-rtems rs6000/t-ppccomm"
        ;;
-powerpc-*-linux*altivec*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/linux.h rs6000/linuxaltivec.h"
-       extra_options="${extra_options} rs6000/sysv4.opt"
-       tmake_file="rs6000/t-fprules rs6000/t-fprules-softfp soft-fp/t-softfp rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
-       ;;
-powerpc-*-linux*spe*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/linux.h rs6000/linuxspe.h rs6000/e500.h"
-       extra_options="${extra_options} rs6000/sysv4.opt"
-       tmake_file="rs6000/t-fprules rs6000/t-fprules-softfp soft-fp/t-softfp rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
-       ;;
-powerpc-*-linux*paired*)
-        tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/linux.h rs6000/750cl.h"
-        extra_options="${extra_options} rs6000/sysv4.opt"
-        tmake_file="rs6000/t-fprules rs6000/t-fprules-softfp soft-fp/t-softfp rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
-        ;;
-powerpc-*-linux*)
+powerpc-*-linux* | powerpc64-*-linux*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"
        extra_options="${extra_options} rs6000/sysv4.opt"
-       tmake_file="t-dfprules rs6000/t-fprules rs6000/t-fprules-softfp soft-fp/t-softfp rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
-       case ${enable_targets}:${cpu_is_64bit} in
-           *powerpc64* | all:* | *:yes)
+       tmake_file="t-dfprules rs6000/t-fprules rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
+       maybe_biarch=yes
+       case ${target} in
+           powerpc64-*-linux*spe* | powerpc64-*-linux*paired*)
+               echo "*** Configuration ${target} not supported" 1>&2
+               exit 1
+               ;;
+           powerpc-*-linux*spe* | powerpc-*-linux*paired*)
+               maybe_biarch=
+               ;;
+           powerpc64-*-linux*)
+               test x$with_cpu != x || cpu_is_64bit=yes
+               maybe_biarch=always
+               ;;
+       esac
+       case ${maybe_biarch}:${enable_targets}:${cpu_is_64bit} in
+           always:* | yes:*powerpc64* | yes:all:* | yes:*:yes)
                if test x$cpu_is_64bit = xyes; then
                    tm_file="${tm_file} rs6000/default64.h"
                fi
-               tm_file="rs6000/biarch64.h ${tm_file} rs6000/linux64.h"
+               tm_file="rs6000/biarch64.h ${tm_file} rs6000/linux64.h glibc-stdint.h"
                tmake_file="$tmake_file rs6000/t-linux64"
                extra_options="${extra_options} rs6000/linux64.opt"
                ;;
            *)
-               tm_file="${tm_file} rs6000/linux.h"
+               tm_file="${tm_file} rs6000/linux.h glibc-stdint.h"
                ;;
        esac
+       tmake_file="${tmake_file} t-slibgcc-libgcc rs6000/t-fprules-softfp soft-fp/t-softfp"
+       case ${target} in
+           powerpc*-*-linux*altivec*)
+               tm_file="${tm_file} rs6000/linuxaltivec.h" ;;
+           powerpc*-*-linux*spe*)
+               tm_file="${tm_file} rs6000/linuxspe.h rs6000/e500.h" ;;
+           powerpc*-*-linux*paired*)
+               tm_file="${tm_file} rs6000/750cl.h" ;;
+       esac
        if test x${enable_secureplt} = xyes; then
                tm_file="rs6000/secureplt.h ${tm_file}"
        fi
        ;;
+powerpc64-*-gnu*)
+       tm_file="${tm_file} elfos.h svr4.h freebsd-spec.h gnu.h rs6000/sysv4.h rs6000/default64.h rs6000/linux64.h rs6000/gnu.h glibc-stdint.h"
+       extra_options="${extra_options} rs6000/sysv4.opt rs6000/linux64.opt"
+       tmake_file="t-slibgcc-elf-ver t-slibgcc-libgcc t-gnu"
+       ;;
 powerpc-*-gnu-gnualtivec*)
-       tm_file="${cpu_type}/${cpu_type}.h elfos.h svr4.h freebsd-spec.h gnu.h rs6000/sysv4.h rs6000/linux.h rs6000/linuxaltivec.h rs6000/gnu.h"
+       tm_file="${cpu_type}/${cpu_type}.h elfos.h svr4.h freebsd-spec.h gnu.h rs6000/sysv4.h rs6000/linux.h rs6000/linuxaltivec.h rs6000/gnu.h glibc-stdint.h"
        extra_options="${extra_options} rs6000/sysv4.opt"
-       tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcos t-slibgcc-elf-ver t-gnu rs6000/t-ppccomm"
+       tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcos t-slibgcc-elf-ver t-slibgcc-libgcc t-gnu rs6000/t-ppccomm"
        if test x$enable_threads = xyes; then
                thread_file='posix'
        fi
        ;;
 powerpc-*-gnu*)
-       tm_file="${cpu_type}/${cpu_type}.h elfos.h svr4.h freebsd-spec.h gnu.h rs6000/sysv4.h rs6000/linux.h rs6000/gnu.h"
-       tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcos t-slibgcc-elf-ver t-gnu rs6000/t-ppccomm"
+       tm_file="${cpu_type}/${cpu_type}.h elfos.h svr4.h freebsd-spec.h gnu.h rs6000/sysv4.h rs6000/linux.h rs6000/gnu.h glibc-stdint.h"
+       tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcos t-slibgcc-elf-ver t-slibgcc-libgcc t-gnu rs6000/t-ppccomm"
        extra_options="${extra_options} rs6000/sysv4.opt"
        if test x$enable_threads = xyes; then
                thread_file='posix'
@@ -2043,13 +2001,6 @@ powerpc-wrs-vxworks|powerpc-wrs-vxworksae)
            ;;
        esac
        ;;
-powerpc-wrs-windiss*)  # Instruction-level simulator for VxWorks.
-       tm_file="${tm_file} elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/windiss.h"
-       tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
-       extra_options="${extra_options} rs6000/sysv4.opt"
-       thread_file=""
-       use_fixproto=yes
-       ;;
 powerpc-*-lynxos*)
        xm_defines=POSIX
        tm_file="${tm_file} dbxelf.h elfos.h rs6000/sysv4.h rs6000/lynx.h lynx.h"
@@ -2061,92 +2012,74 @@ powerpc-*-lynxos*)
        gnu_ld=yes
        gas=yes
        ;;
-powerpcle-*-sysv*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/sysv4le.h"
-       tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcos rs6000/t-ppccomm"
-       extra_options="${extra_options} rs6000/sysv4.opt"
-       use_fixproto=yes
-       ;;
 powerpcle-*-elf*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/sysv4le.h"
+       tm_file="${tm_file} dbxelf.h elfos.h usegas.h svr4.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/sysv4le.h"
        tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
        extra_options="${extra_options} rs6000/sysv4.opt"
-       use_fixproto=yes
        ;;
 powerpcle-*-eabisim*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/eabi.h rs6000/e500.h rs6000/eabisim.h"
+       tm_file="${tm_file} dbxelf.h elfos.h usegas.h svr4.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/eabi.h rs6000/e500.h rs6000/eabisim.h"
        tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
        extra_options="${extra_options} rs6000/sysv4.opt"
+       use_gcc_stdint=wrap
        ;;
 powerpcle-*-eabi*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/eabi.h rs6000/e500.h"
-       tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
-       extra_options="${extra_options} rs6000/sysv4.opt"
-       ;;
-powerpc-*-kaos*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h kaos.h rs6000/kaos-ppc.h"
+       tm_file="${tm_file} dbxelf.h elfos.h usegas.h svr4.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/eabi.h rs6000/e500.h"
        tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
        extra_options="${extra_options} rs6000/sysv4.opt"
-       ;;
-powerpcle-*-kaos*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/sysv4le.h kaos.h rs6000/kaos-ppc.h"
-       tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
-       extra_options="${extra_options} rs6000/sysv4.opt"
-       ;;
-rs6000-ibm-aix4.[12]* | powerpc-ibm-aix4.[12]*)
-       tm_file="${tm_file} rs6000/aix.h rs6000/aix41.h rs6000/xcoff.h"
-       tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-newas"
-       extra_options="${extra_options} rs6000/aix41.opt"
-       use_collect2=yes
-       extra_headers=
-       use_fixproto=yes
+       use_gcc_stdint=wrap
        ;;
 rs6000-ibm-aix4.[3456789]* | powerpc-ibm-aix4.[3456789]*)
-       tm_file="rs6000/biarch64.h ${tm_file} rs6000/aix.h rs6000/aix43.h rs6000/xcoff.h"
+       tm_file="rs6000/biarch64.h ${tm_file} rs6000/aix.h rs6000/aix43.h rs6000/xcoff.h rs6000/aix-stdint.h"
        tmake_file=rs6000/t-aix43
        extra_options="${extra_options} rs6000/aix64.opt"
        use_collect2=yes
        thread_file='aix'
+       use_gcc_stdint=provide
        extra_headers=
        ;;
 rs6000-ibm-aix5.1.* | powerpc-ibm-aix5.1.*)
-       tm_file="rs6000/biarch64.h ${tm_file} rs6000/aix.h rs6000/aix51.h rs6000/xcoff.h"
+       tm_file="rs6000/biarch64.h ${tm_file} rs6000/aix.h rs6000/aix51.h rs6000/xcoff.h rs6000/aix-stdint.h"
        extra_options="${extra_options} rs6000/aix64.opt"
        tmake_file=rs6000/t-aix43
        use_collect2=yes
        thread_file='aix'
+       use_gcc_stdint=wrap
        extra_headers=
        ;;
 rs6000-ibm-aix5.2.* | powerpc-ibm-aix5.2.*)
-       tm_file="${tm_file} rs6000/aix.h rs6000/aix52.h rs6000/xcoff.h"
+       tm_file="${tm_file} rs6000/aix.h rs6000/aix52.h rs6000/xcoff.h rs6000/aix-stdint.h"
        tmake_file=rs6000/t-aix52
        extra_options="${extra_options} rs6000/aix64.opt"
        use_collect2=yes
        thread_file='aix'
+       use_gcc_stdint=wrap
        extra_headers=
        ;;
 rs6000-ibm-aix5.3.* | powerpc-ibm-aix5.3.*)
-       tm_file="${tm_file} rs6000/aix.h rs6000/aix53.h rs6000/xcoff.h"
+       tm_file="${tm_file} rs6000/aix.h rs6000/aix53.h rs6000/xcoff.h rs6000/aix-stdint.h"
        tmake_file=rs6000/t-aix52
        extra_options="${extra_options} rs6000/aix64.opt"
        use_collect2=yes
        thread_file='aix'
+       use_gcc_stdint=wrap
        extra_headers=altivec.h
        ;;
 rs6000-ibm-aix[6789].* | powerpc-ibm-aix[6789].*)
-       tm_file="${tm_file} rs6000/aix.h rs6000/aix61.h rs6000/xcoff.h"
+       tm_file="${tm_file} rs6000/aix.h rs6000/aix61.h rs6000/xcoff.h rs6000/aix-stdint.h"
        tmake_file=rs6000/t-aix52
        extra_options="${extra_options} rs6000/aix64.opt"
        use_collect2=yes
        thread_file='aix'
+       use_gcc_stdint=wrap
        extra_headers=altivec.h
        ;;
 s390-*-linux*)
-       tm_file="s390/s390.h dbxelf.h elfos.h svr4.h linux.h s390/linux.h"
+       tm_file="s390/s390.h dbxelf.h elfos.h svr4.h linux.h glibc-stdint.h s390/linux.h"
        tmake_file="${tmake_file} t-dfprules s390/t-crtstuff s390/t-linux"
        ;;
 s390x-*-linux*)
-       tm_file="s390/s390x.h s390/s390.h dbxelf.h elfos.h svr4.h linux.h s390/linux.h"
+       tm_file="s390/s390x.h s390/s390.h dbxelf.h elfos.h svr4.h linux.h glibc-stdint.h s390/linux.h"
        tm_p_file=s390/s390-protos.h
        md_file=s390/s390.md
        extra_modes=s390/s390-modes.def
@@ -2165,11 +2098,11 @@ s390x-ibm-tpf*)
        extra_options="${extra_options} s390/tpf.opt"
        ;;
 score-*-elf)
-        tm_file="dbxelf.h elfos.h score/elf.h score/score.h"
+        tm_file="dbxelf.h elfos.h score/elf.h score/score.h newlib-stdint.h"
         tmake_file=score/t-score-elf
         extra_objs="score7.o score3.o"
         ;;
-sh-*-elf* | sh[12346l]*-*-elf* | sh*-*-kaos* | \
+sh-*-elf* | sh[12346l]*-*-elf* | \
 sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
   sh-*-linux* | sh[2346lbe]*-*-linux* | \
   sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \
@@ -2186,9 +2119,14 @@ sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
                *)                                 with_endian=big,little ;;
                esac
        fi
+       # TM_ENDIAN_CONFIG is used by t-sh to determine multilibs.
+       #  First word : the default endian.
+       #  Second word: the secondary endian (optional).
        case ${with_endian} in
-       big|little)     tmake_file="${tmake_file} sh/t-1e" ;;
-       big,little|little,big) ;;
+       big)            TM_ENDIAN_CONFIG=mb ;;
+       little)         TM_ENDIAN_CONFIG=ml ;;
+       big,little)     TM_ENDIAN_CONFIG="mb ml" ;;
+       little,big)     TM_ENDIAN_CONFIG="ml mb" ;;
        *)      echo "with_endian=${with_endian} not supported."; exit 1 ;;
        esac
        case ${with_endian} in
@@ -2202,15 +2140,14 @@ sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
        tm_file="${tm_file} sh/elf.h"
        case ${target} in
        sh*-*-linux*)   tmake_file="${tmake_file} sh/t-linux"
-                       tm_file="${tm_file} linux.h sh/linux.h" ;;
-       sh*-*-kaos*)    tm_file="${tm_file} sh/embed-elf.h kaos.h sh/kaos-sh.h"
-                       ;;
+                       tm_file="${tm_file} linux.h glibc-stdint.h sh/linux.h" ;;
        sh*-*-netbsd*)  tm_file="${tm_file} netbsd.h netbsd-elf.h sh/netbsd-elf.h" ;;
        sh*-superh-elf) if test x$with_libgloss != xno; then
-                               with_libgloss=yes
-                               tm_file="${tm_file} sh/newlib.h"
-                       fi
-                       tm_file="${tm_file} sh/embed-elf.h sh/superh.h"
+                                with_libgloss=yes
+                                tm_file="${tm_file} sh/newlib.h"
+                        fi
+                       tm_file="${tm_file} sh/embed-elf.h"
+                       tm_file="${tm_file} sh/superh.h"
                        tmake_file="${tmake_file} sh/t-superh"
                        extra_options="${extra_options} sh/superh.opt" ;;
        *)              if test x$with_newlib = xyes \
@@ -2247,6 +2184,9 @@ sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
                extra_objs="symbian.o"
                extra_parts="crt1.o crti.o crtn.o crtbegin.o crtend.o crtbeginS.o crtendS.o"
                ;;
+       *-*-elf*)
+               tm_file="${tm_file} newlib-stdint.h"
+               ;;
        esac
        # sed el/eb endian suffixes away to avoid confusion with sh[23]e
        case `echo ${target} | sed 's/e[lb]-/-/'` in
@@ -2297,7 +2237,7 @@ sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
        *)      echo "with_cpu=$with_cpu not supported"; exit 1 ;;
        esac
        sh_multilibs=${with_multilib_list}
-       if test x${sh_multilibs} = x ; then
+       if test "$sh_multilibs" = "default" ; then
                case ${target} in
                sh64-superh-linux* | \
                sh[1234]*)      sh_multilibs=${sh_cpu_target} ;;
@@ -2313,42 +2253,46 @@ sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
        fi
        target_cpu_default=SELECT_`echo ${sh_cpu_default}|tr abcdefghijklmnopqrstuvwxyz- ABCDEFGHIJKLMNOPQRSTUVWXYZ_`
        tm_defines=${tm_defines}' SH_MULTILIB_CPU_DEFAULT=\"'`echo $sh_cpu_default|sed s/sh/m/`'\"'
-       sh_multilibs=`echo $sh_multilibs,$sh_cpu_default | sed -e 's/[  ,/][    ,]*/ /g' -e 's/ $//' -e 's/^m/sh/' -e 's/ m/ sh/g' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ_ abcdefghijklmnopqrstuvwxyz-`
+       tm_defines="$tm_defines SUPPORT_`echo $sh_cpu_default | sed 's/^m/sh/' | tr abcdefghijklmnopqrstuvwxyz- ABCDEFGHIJKLMNOPQRSTUVWXYZ_`=1"
+       sh_multilibs=`echo $sh_multilibs | sed -e 's/,/ /g' -e 's/^sh/m/i' -e 's/ sh/ m/gi' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ_ abcdefghijklmnopqrstuvwxyz-`
        for sh_multilib in ${sh_multilibs}; do
                case ${sh_multilib} in
-               sh1 | sh2 | sh2e | sh3 | sh3e | \
-               sh4 | sh4-single | sh4-single-only | sh4-nofpu | sh4-300 |\
-               sh4a | sh4a-single | sh4a-single-only | sh4a-nofpu | sh4al | \
-               sh2a | sh2a-single | sh2a-single-only | sh2a-nofpu | \
-               sh5-64media | sh5-64media-nofpu | \
-               sh5-32media | sh5-32media-nofpu | \
-               sh5-compact | sh5-compact-nofpu)
-                       tmake_file="${tmake_file} sh/t-mlib-${sh_multilib}"
-                       tm_defines="$tm_defines SUPPORT_`echo $sh_multilib|tr abcdefghijklmnopqrstuvwxyz- ABCDEFGHIJKLMNOPQRSTUVWXYZ_`=1"
+               m1 | m2 | m2e | m3 | m3e | \
+               m4 | m4-single | m4-single-only | m4-nofpu | m4-300 |\
+               m4a | m4a-single | m4a-single-only | m4a-nofpu | m4al | \
+               m2a | m2a-single | m2a-single-only | m2a-nofpu | \
+               m5-64media | m5-64media-nofpu | \
+               m5-32media | m5-32media-nofpu | \
+               m5-compact | m5-compact-nofpu)
+                       # TM_MULTILIB_CONFIG is used by t-sh for the non-endian multilib definition
+                       # It is passed to MULTIILIB_OPTIONS verbatim.
+                       TM_MULTILIB_CONFIG="${TM_MULTILIB_CONFIG}/${sh_multilib}"
+                       tm_defines="$tm_defines SUPPORT_`echo $sh_multilib | sed 's/^m/sh/' | tr abcdefghijklmnopqrstuvwxyz- ABCDEFGHIJKLMNOPQRSTUVWXYZ_`=1"
                        ;;
+               \!*)    # TM_MULTILIB_EXCEPTIONS_CONFIG is used by t-sh
+                       # It is passed the MULTILIB_EXCEPTIONS verbatim.
+                       TM_MULTILIB_EXCEPTIONS_CONFIG="${TM_MULTILIB_EXCEPTIONS_CONFIG} `echo $sh_multilib | sed 's/^!//'`" ;;
                *)
                        echo "with_multilib_list=${sh_multilib} not supported."
                        exit 1
                        ;;
                esac
        done
+       TM_MULTILIB_CONFIG=`echo $TM_MULTILIB_CONFIG | sed 's:^/::'`
        if test x${enable_incomplete_targets} = xyes ; then
                tm_defines="$tm_defines SUPPORT_SH1=1 SUPPORT_SH2E=1 SUPPORT_SH4=1 SUPPORT_SH4_SINGLE=1 SUPPORT_SH2A=1 SUPPORT_SH2A_SINGLE=1 SUPPORT_SH5_32MEDIA=1 SUPPORT_SH5_32MEDIA_NOFPU=1 SUPPORT_SH5_64MEDIA=1 SUPPORT_SH5_64MEDIA_NOFPU=1"
        fi
-       use_fixproto=yes
+       tm_file="$tm_file ./sysroot-suffix.h"
+       tmake_file="$tmake_file t-sysroot-suffix"
        ;;
 sh-*-rtems*)
        tmake_file="sh/t-sh sh/t-elf t-rtems sh/t-rtems"
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sh/elf.h sh/embed-elf.h sh/rtemself.h rtems.h"
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sh/elf.h sh/embed-elf.h sh/rtemself.h rtems.h newlib-stdint.h"
        ;;
 sh-wrs-vxworks)
        tmake_file="$tmake_file sh/t-sh sh/t-elf sh/t-vxworks"
        tm_file="${tm_file} elfos.h svr4.h sh/elf.h sh/embed-elf.h vx-common.h vxworks.h sh/vxworks.h"
        ;;
-sh-*-*)
-       tm_file="${tm_file} dbxcoff.h sh/coff.h"
-       use_fixproto=yes
-       ;;
 sparc-*-netbsdelf*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h netbsd.h netbsd-elf.h sparc/netbsd-elf.h"
        extra_options="${extra_options} sparc/long-double-switch.opt"
@@ -2360,13 +2304,12 @@ sparc64-*-openbsd*)
        with_cpu=ultrasparc
        ;;
 sparc-*-elf*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/sp-elf.h"
+       tm_file="${tm_file} dbxelf.h elfos.h newlib-stdint.h svr4.h sparc/sysv4.h sparc/sp-elf.h"
        tmake_file="sparc/t-elf sparc/t-crtfm"
        extra_parts="crti.o crtn.o crtbegin.o crtend.o"
-       use_fixproto=yes
        ;;
 sparc-*-linux*)                # SPARC's running GNU/Linux, libc6
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h linux.h"
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h linux.h glibc-stdint.h"
        extra_options="${extra_options} sparc/long-double-switch.opt"
        tmake_file="${tmake_file} sparc/t-linux"
        if test x$enable_targets = xall; then
@@ -2378,7 +2321,7 @@ sparc-*-linux*)           # SPARC's running GNU/Linux, libc6
        tmake_file="${tmake_file} sparc/t-crtfm"
        ;;
 sparc-*-rtems*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/sp-elf.h sparc/rtemself.h rtems.h"
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/sp-elf.h sparc/rtemself.h rtems.h newlib-stdint.h"
        tmake_file="sparc/t-elf sparc/t-crtfm t-rtems"
        extra_parts="crti.o crtn.o crtbegin.o crtend.o"
        ;;
@@ -2387,6 +2330,10 @@ sparc64-*-solaris2* | sparcv9-*-solaris2*)
        case ${target} in
        *-*-solaris2.1[0-9]*)
                tm_file="${tm_file} sol2-10.h"
+               use_gcc_stdint=wrap
+               ;;
+       *)
+               use_gcc_stdint=provide
                ;;
        esac
        tm_file="${tm_file} sparc/sol2.h sparc/sol2-64.h sparc/sol2-bi.h"
@@ -2416,11 +2363,12 @@ sparc64-*-solaris2* | sparcv9-*-solaris2*)
 sparc-*-solaris2*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h"
        case ${target} in
-       *-*-solaris2.[0-6] | *-*-solaris2.[0-6].*)
-               tm_file="${tm_file} sol2-6.h"
-               ;;
        *-*-solaris2.1[0-9]*)
                tm_file="${tm_file} sol2-10.h"
+               use_gcc_stdint=wrap
+               ;;
+       *)
+               use_gcc_stdint=provide
                ;;
        esac
        tm_file="${tm_file} sparc/sol2.h"
@@ -2436,25 +2384,16 @@ sparc-*-solaris2*)
        else
                tmake_file="$tmake_file t-slibgcc-sld"
        fi
-       case ${target} in
-       *-*-solaris2.[0-6] | *-*-solaris2.[0-6].*)
-               if test x$gnu_ld = xno; then
-                       tm_file="${tm_file} sparc/sol26-sld.h"
-               fi
-               ;;
-       *-*-solaris2.[789] | *-*-solaris2.1[0-9]*)
-               tm_file="sparc/biarch64.h ${tm_file} sparc/sol2-bi.h"
-               if test x$gnu_ld = xyes; then
-                       tm_file="${tm_file} sparc/sol2-gld-bi.h"
-               fi
-               if test x$gas = xyes; then
-                       tm_file="${tm_file} sparc/sol2-gas-bi.h"
-               fi
-               tm_file="${tm_file} tm-dwarf2.h"
-               tmake_file="$tmake_file sparc/t-sol2-64"
-               test x$with_cpu != x || with_cpu=v9
-               ;;
-       esac
+       tm_file="sparc/biarch64.h ${tm_file} sparc/sol2-bi.h"
+       if test x$gnu_ld = xyes; then
+               tm_file="${tm_file} sparc/sol2-gld-bi.h"
+       fi
+       if test x$gas = xyes; then
+               tm_file="${tm_file} sparc/sol2-gas-bi.h"
+       fi
+       tm_file="${tm_file} tm-dwarf2.h"
+       tmake_file="$tmake_file sparc/t-sol2-64"
+       test x$with_cpu != x || with_cpu=v9
        c_target_objs="sol2-c.o"
        cxx_target_objs="sol2-c.o"
        extra_objs="sol2.o"
@@ -2462,36 +2401,22 @@ sparc-*-solaris2*)
        extra_parts="crt1.o crti.o crtn.o gcrt1.o gmon.o crtbegin.o crtend.o"
        case ${enable_threads}:${have_pthread_h}:${have_thread_h} in
          "":yes:* | yes:yes:* )
-               case ${target} in
-                 *-*-solaris2.[0-6] | *-*-solaris2.[0-6].*)
-                       thread_file=posix95
-                       ;;
-                 *)
-                       thread_file=posix
-                       ;;
-               esac
+               thread_file=posix
                ;;
          "":*:yes | yes:*:yes )
                thread_file=solaris
                ;;
        esac
        ;;
-sparc-*-sysv4*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/sysv4-only.h"
-       tmake_file=t-svr4
-       extra_parts="crtbegin.o crtend.o"
-       use_fixproto=yes
-       ;;
 sparc-wrs-vxworks)
        tm_file="${tm_file} elfos.h svr4.h sparc/sysv4.h vx-common.h vxworks.h sparc/vxworks.h"
        tmake_file="${tmake_file} sparc/t-vxworks"
        ;;
 sparc64-*-elf*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/sp64-elf.h"
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h newlib-stdint.h sparc/sysv4.h sparc/sp64-elf.h"
        extra_options="${extra_options} sparc/little-endian.opt"
        tmake_file="${tmake_file} sparc/t-crtfm"
        extra_parts="crtbegin.o crtend.o"
-       use_fixproto=yes
        ;;
 sparc64-*-freebsd*|ultrasparc-*-freebsd*)
        tm_file="${tm_file} ${fbsd_tm_file} dbxelf.h elfos.h sparc/sysv4.h sparc/freebsd.h"
@@ -2504,7 +2429,7 @@ sparc64-*-freebsd*|ultrasparc-*-freebsd*)
        esac
        ;;
 sparc64-*-linux*)              # 64-bit SPARC's running GNU/Linux
-       tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h linux.h sparc/linux64.h"
+       tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h linux.h glibc-stdint.h sparc/linux64.h"
        extra_options="${extra_options} sparc/long-double-switch.opt"
        tmake_file="${tmake_file} sparc/t-linux sparc/t-linux64 sparc/t-crtfm"
        ;;
@@ -2515,41 +2440,16 @@ sparc64-*-netbsd*)
        tmake_file="${tmake_file} sparc/t-netbsd64"
        ;;
 spu-*-elf*)
-       tm_file="dbxelf.h elfos.h spu/spu-elf.h spu/spu.h"
+       tm_file="dbxelf.h elfos.h spu/spu-elf.h spu/spu.h newlib-stdint.h"
        tmake_file="spu/t-spu-elf"
        extra_headers="spu_intrinsics.h spu_internals.h vmx2spu.h spu_mfcio.h vec_types.h"
        extra_modes=spu/spu-modes.def
        c_target_objs="${c_target_objs} spu-c.o"
        cxx_target_objs="${cxx_target_objs} spu-c.o"
        ;;
-strongarm-*-elf*)
-       tm_file="arm/strongarm-elf.h dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h"
-       tmake_file="arm/t-arm arm/t-strongarm-elf"
-       out_file=arm/arm.c
-       md_file=arm/arm.md
-       extra_modes=arm/arm-modes.def
-       use_fixproto=yes
-       ;;
-strongarm-*-pe)
-       tm_file="arm/semi.h arm/aout.h arm/coff.h dbxcoff.h arm/strongarm-coff.h arm/arm.h arm/pe.h arm/strongarm-pe.h"
-       tmake_file="arm/t-arm arm/t-strongarm-pe"
-       out_file=arm/arm.c
-       md_file=arm/arm.md
-       extra_modes=arm/arm-modes.def
-       extra_options="${extra_options} arm/pe.opt"
-       extra_objs=pe.o
-       use_fixproto=yes
-       ;;
-strongarm-*-kaos*)
-       tm_file="arm/strongarm-elf.h dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h kaos.h arm/kaos-strongarm.h"
-       tmake_file="arm/t-arm arm/t-strongarm-elf"
-       out_file=arm/arm.c
-       md_file=arm/arm.md
-       extra_modes=arm/arm-modes.def
-       ;;
 v850e1-*-*)
        target_cpu_default="TARGET_CPU_v850e1"
-       tm_file="dbxelf.h elfos.h svr4.h v850/v850.h"
+       tm_file="dbxelf.h elfos.h svr4.h newlib-stdint.h v850/v850.h"
        tm_p_file=v850/v850-protos.h
        tmake_file=v850/t-v850e
        md_file=v850/v850.md
@@ -2562,11 +2462,11 @@ v850e1-*-*)
        use_collect2=no
        c_target_objs="v850-c.o"
        cxx_target_objs="v850-c.o"
-       use_fixproto=yes
+       use_gcc_stdint=wrap
        ;;
 v850e-*-*)
        target_cpu_default="TARGET_CPU_v850e"
-       tm_file="dbxelf.h elfos.h svr4.h v850/v850.h"
+       tm_file="dbxelf.h elfos.h svr4.h newlib-stdint.h v850/v850.h"
        tm_p_file=v850/v850-protos.h
        tmake_file=v850/t-v850e
        md_file=v850/v850.md
@@ -2579,11 +2479,11 @@ v850e-*-*)
        use_collect2=no
        c_target_objs="v850-c.o"
        cxx_target_objs="v850-c.o"
-       use_fixproto=yes
+       use_gcc_stdint=wrap
        ;;
 v850-*-*)
        target_cpu_default="TARGET_CPU_generic"
-       tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
+       tm_file="dbxelf.h elfos.h svr4.h newlib-stdint.h ${tm_file}"
        tmake_file=v850/t-v850
        if test x$stabs = xyes
        then
@@ -2592,18 +2492,11 @@ v850-*-*)
        use_collect2=no
        c_target_objs="v850-c.o"
        cxx_target_objs="v850-c.o"
-       use_fixproto=yes
-       ;;
-vax-*-bsd*)                    # VAXen running BSD
-       tm_file="${tm_file} vax/bsd.h"
-       tmake_file=vax/t-memfuncs
-       use_collect2=yes
-       use_fixproto=yes
+       use_gcc_stdint=wrap
        ;;
-vax-*-sysv*)                   # VAXen running system V
-       tm_file="${tm_file} vax/vaxv.h"
-       tmake_file=vax/t-memfuncs
-       use_fixproto=yes
+vax-*-linux*)
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h vax/elf.h vax/linux.h"
+       tmake_file=vax/t-linux
        ;;
 vax-*-netbsdelf*)
        tm_file="${tm_file} elfos.h netbsd.h netbsd-elf.h vax/elf.h vax/netbsd-elf.h"
@@ -2618,58 +2511,41 @@ vax-*-openbsd*)
        tm_file="vax/vax.h vax/openbsd1.h openbsd.h vax/openbsd.h"
        use_collect2=yes
        ;;
-vax-*-ultrix*)                 # VAXen running ultrix
-       tm_file="${tm_file} vax/ultrix.h"
-       tmake_file=vax/t-memfuncs
-       use_fixproto=yes
-       ;;
-xscale-*-elf)
-       tm_file="arm/xscale-elf.h dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h"
-       tmake_file="arm/t-arm arm/t-xscale-elf"
-       out_file=arm/arm.c
-       md_file=arm/arm.md
-       extra_modes=arm/arm-modes.def
-       use_fixproto=yes
-       ;;
-xscale-*-coff)
-       tm_file="arm/semi.h arm/aout.h arm/coff.h dbxcoff.h arm/xscale-coff.h arm/arm.h"
-       tmake_file="arm/t-arm arm/t-xscale-coff"
-       out_file=arm/arm.c
-       md_file=arm/arm.md
-       extra_modes=arm/arm-modes.def
-       use_fixproto=yes
-       ;;
 xstormy16-*-elf)
        # For historical reasons, the target files omit the 'x'.
-       tm_file="dbxelf.h elfos.h svr4.h stormy16/stormy16.h"
+       tm_file="dbxelf.h elfos.h svr4.h newlib-stdint.h stormy16/stormy16.h"
        tm_p_file=stormy16/stormy16-protos.h
        md_file=stormy16/stormy16.md
        out_file=stormy16/stormy16.c
        extra_options=stormy16/stormy16.opt
        tmake_file="stormy16/t-stormy16"
        extra_parts="crtbegin.o crtend.o"
-       use_fixproto=yes
        ;;
-xtensa-*-elf*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h xtensa/elf.h"
+xtensa*-*-elf*)
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h newlib-stdint.h xtensa/elf.h"
        tmake_file="xtensa/t-xtensa xtensa/t-elf"
        ;;
-xtensa-*-linux*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h xtensa/linux.h"
+xtensa*-*-linux*)
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h glibc-stdint.h xtensa/linux.h"
        tmake_file="${tmake_file} xtensa/t-xtensa xtensa/t-linux"
        ;;
 am33_2.0-*-linux*)
-       tm_file="mn10300/mn10300.h dbxelf.h elfos.h linux.h mn10300/linux.h"
+       tm_file="mn10300/mn10300.h dbxelf.h elfos.h linux.h glibc-stdint.h mn10300/linux.h"
        tmake_file="${tmake_file} mn10300/t-linux"
        gas=yes gnu_ld=yes
        extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
        use_collect2=no
        ;;
+m32c-*-rtems*)
+       tm_file="dbxelf.h elfos.h svr4.h ${tm_file} m32c/rtems.h rtems.h newlib-stdint.h"
+       tmake_file="${tmake_file} t-rtems"
+       c_target_objs="m32c-pragma.o"
+       cxx_target_objs="m32c-pragma.o"
+       ;;
 m32c-*-elf*)
-       tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
+       tm_file="dbxelf.h elfos.h svr4.h newlib-stdint.h ${tm_file}"
        c_target_objs="m32c-pragma.o"
        cxx_target_objs="m32c-pragma.o"
-       use_fixproto=yes
        ;;
 *)
        echo "*** Configuration ${target} not supported" 1>&2
@@ -2678,15 +2554,14 @@ m32c-*-elf*)
 esac
 
 case ${target} in
-i[34567]86-*-linux*aout* | i[34567]86-*-linux*libc1)
-       tmake_file="${tmake_file} i386/t-gmm_malloc"
-       ;;
 i[34567]86-*-linux* | x86_64-*-linux*)
-       tmake_file="${tmake_file} i386/t-pmm_malloc"
+       tmake_file="${tmake_file} i386/t-pmm_malloc i386/t-i386"
        ;;
 i[34567]86-*-* | x86_64-*-*)
-       tmake_file="${tmake_file} i386/t-gmm_malloc"
+       tmake_file="${tmake_file} i386/t-gmm_malloc i386/t-i386"
        ;;
+powerpc*-*-* | rs6000-*-*)
+       tm_file="${tm_file} rs6000/option-defaults.h"
 esac
 
 # Support for --with-cpu and related options (and a few unrelated options,
@@ -2702,10 +2577,6 @@ esac
 # This block sets nothing except for with_cpu.
 if test x$with_cpu = x ; then
   case ${target} in
-    ep9312-*-*)
-      # A Cirrus ARM variant.
-      with_cpu="ep9312"
-      ;;
     i386-*-*)
       with_cpu=i386
       ;;
@@ -2817,9 +2688,6 @@ if test x$with_cpu = x ; then
     frv550-*-*linux*)
       with_cpu=fr550
       ;;
-    m680[012]0-*-*)
-      with_cpu=`echo ${target} | sed 's/-.*$//'`
-      ;;
     m68k*-*-*)
       case "$with_arch" in
        "cf")
@@ -2837,21 +2705,29 @@ if test x$with_cpu = x ; then
       with_cpu="`echo ${target} | sed 's/-.*$//'`"
       ;;
   esac
-fi
 
-# Similarly for --with-float
-if test x$with_float = x; then
-       case ${target} in
-       ep9312-*-*)
-               with_float=hard
-               ;;
-       esac
+  # Avoid overriding --with-cpu-32 and --with-cpu-64 values.
+  case ${target} in
+    i[34567]86-*-*|x86_64-*-*)
+      if test x$with_cpu != x; then
+        if test x$with_cpu_32 != x || test x$with_cpu_64 != x; then
+          if test x$with_cpu_32 = x; then
+            with_cpu_32=$with_cpu
+          fi
+          if test x$with_cpu_64 = x; then
+            with_cpu_64=$with_cpu
+          fi
+          with_cpu=
+        fi
+      fi
+      ;;
+  esac
 fi
 
 # Similarly for --with-schedule.
 if test x$with_schedule = x; then
        case ${target} in
-       hppa1* | parisc1*)
+       hppa1*)
                # Override default PA8000 scheduling model.
                with_schedule=7100LC
                ;;
@@ -2945,7 +2821,7 @@ case "${target}" in
 
                case "$with_abi" in
                "" \
-               | apcs-gnu | atpcs | aapcs | iwmmxt )
+               | apcs-gnu | atpcs | aapcs | iwmmxt | aapcs-linux )
                        #OK
                        ;;
                *)
@@ -2982,7 +2858,7 @@ case "${target}" in
                esac
                ;;
 
-       fido-*-* | m680[012]0-*-* | m68k*-*-*)
+       fido-*-* | m68k*-*-*)
                supported_defaults="arch cpu"
                case "$with_arch" in
                "" | "m68k"| "cf")
@@ -3022,7 +2898,7 @@ case "${target}" in
                esac
                ;;
 
-       hppa*-*-* | parisc*-*-*)
+       hppa*-*-*)
                supported_defaults="arch schedule"
 
                case "$with_arch" in
@@ -3047,8 +2923,8 @@ case "${target}" in
                ;;
 
        i[34567]86-*-* | x86_64-*-*)
-               supported_defaults="arch cpu tune"
-               for which in arch cpu tune; do
+               supported_defaults="arch arch_32 arch_64 cpu cpu_32 cpu_64 tune tune_32 tune_64"
+               for which in arch arch_32 arch_64 cpu cpu_32 cpu_64 tune tune_32 tune_64; do
                        eval "val=\$with_$which"
                        case ${val} in
                        i386 | i486 \
@@ -3059,13 +2935,19 @@ case "${target}" in
                        | prescott | pentium-m | pentium4m | pentium3m)
                                case "${target}" in
                                  x86_64-*-*)
-                                     echo "CPU given in --with-$which=$val doesn't support 64bit mode." 1>&2
-                                     exit 1
+                                     case "x$which" in
+                                       *_32)
+                                               ;;
+                                       *)
+                                               echo "CPU given in --with-$which=$val doesn't support 64bit mode." 1>&2
+                                               exit 1
+                                               ;;
+                                     esac
                                      ;;
                                esac
                                # OK
                                ;;
-                       "" | amdfam10 | barcelona | k8 | opteron | athlon64 | athlon-fx | nocona | core2 | generic)
+                       "" | amdfam10 | barcelona | k8 | opteron | athlon64 | athlon-fx | nocona | core2 | atom | generic)
                                # OK
                                ;;
                        *)
@@ -3077,7 +2959,7 @@ case "${target}" in
                ;;
 
        mips*-*-*)
-               supported_defaults="abi arch float tune divide llsc"
+               supported_defaults="abi arch arch_32 arch_64 float tune tune_32 tune_64 divide llsc mips-plt synci"
 
                case ${with_float} in
                "" | soft | hard)
@@ -3124,34 +3006,52 @@ case "${target}" in
                        exit 1
                        ;;
                esac
-               ;;
 
-       mt-*-*)
-               supported_defaults="arch"
+               case ${with_mips_plt} in
+               yes)
+                       with_mips_plt=plt
+                       ;;
+               no)
+                       with_mips_plt=no-plt
+                       ;;
+               "")
+                       ;;
+               *)
+                       echo "Unknown --with-mips-plt argument: $with_mips_plt" 1>&2
+                       exit 1
+                       ;;
+               esac
 
-               case "$with_arch" in
-               "" \
-               | ms1-64-001 \
-               | ms1-16-002 \
-               | ms1-16-003 \
-               | ms2 \
-               | "")
-                       # OK
+               case ${with_synci} in
+               yes)
+                       with_synci=synci
+                       ;;
+               "" | no)
+                       # No is the default.
+                       with_synci=no-synci
                        ;;
                *)
-                       echo "Unknown arch used in --with-arch=$with_arch" 1>&2
+                       echo "Unknown synci type used in --with-synci" 1>&2
                        exit 1
                        ;;
                esac
                ;;
 
        powerpc*-*-* | rs6000-*-*)
-               supported_defaults="cpu float tune"
+               supported_defaults="cpu cpu_32 cpu_64 float tune tune_32 tune_64"
 
-               for which in cpu tune; do
+               for which in cpu cpu_32 cpu_64 tune tune_32 tune_64; do
                        eval "val=\$with_$which"
                        case ${val} in
                        default32 | default64)
+                               case $which in
+                               cpu | tune)
+                                       ;;
+                               *)
+                                       echo "$val only valid for --with-cpu and --with-tune." 1>&2
+                                       exit 1
+                                       ;;
+                               esac
                                with_which="with_$which"
                                eval $with_which=
                                ;;
@@ -3160,12 +3060,13 @@ case "${target}" in
                                eval "with_$which=405"
                                ;;
                        "" | common \
-                       | power | power[23456] | power6x | powerpc | powerpc64 \
+                       | power | power[234567] | power6x | powerpc | powerpc64 \
                        | rios | rios1 | rios2 | rsc | rsc1 | rs64a \
                        | 401 | 403 | 405 | 405fp | 440 | 440fp | 464 | 464fp \
                        | 505 | 601 | 602 | 603 | 603e | ec603e | 604 \
-                       | 604e | 620 | 630 | 740 | 750 | 7400 | 7450 | e300c[23] \
-                       | 854[08] | 801 | 821 | 823 | 860 | 970 | G3 | G4 | G5 | cell)
+                       | 604e | 620 | 630 | 740 | 750 | 7400 | 7450 \
+                       | e300c[23] | 854[08] | e500mc \
+                       | 801 | 821 | 823 | 860 | 970 | G3 | G4 | G5 | cell)
                                # OK
                                ;;
                        *)
@@ -3302,7 +3203,7 @@ case ${target} in
                fi
                ;;
 
-       hppa*-*-* | parisc*-*-*)
+       hppa*-*-*)
                target_cpu_default2="MASK_BIG_SWITCH"
                if test x$gas = xyes
                then
@@ -3310,13 +3211,26 @@ case ${target} in
                fi
                ;;
 
-       fido*-*-* | m680[012]0-*-* | m68k*-*-*)
+       fido*-*-* | m68k*-*-*)
                target_cpu_default2=$m68k_cpu_ident
                if [ x"$m68k_arch_family" != x ]; then
                        tmake_file="m68k/t-$m68k_arch_family $tmake_file"
                fi
                ;;
 
+       i[34567]86-*-darwin* | x86_64-*-darwin*)
+               tmake_file="${tmake_file} i386/t-fprules-softfp soft-fp/t-softfp"
+               ;;
+       i[34567]86-*-linux* | x86_64-*-linux* | i[34567]86-*-kfreebsd*-gnu | x86_64-*-kfreebsd*-gnu)
+               tmake_file="${tmake_file} i386/t-fprules-softfp soft-fp/t-softfp i386/t-linux"
+               ;;
+       i[34567]86-*-cygwin* | i[34567]86-*-mingw* | x86_64-*-mingw*)
+               tmake_file="${tmake_file} i386/t-fprules-softfp soft-fp/t-softfp"
+               ;;
+       ia64*-*-linux*)
+               tmake_file="${tmake_file} ia64/t-fprules-softfp soft-fp/t-softfp"
+               ;;
+
        mips*-*-*)
                if test x$gnu_ld = xyes
                then
@@ -3387,10 +3301,10 @@ case ${target} in
 esac
 
 t=
-all_defaults="abi cpu arch tune schedule float mode fpu divide llsc"
+all_defaults="abi cpu cpu_32 cpu_64 arch arch_32 arch_64 tune tune_32 tune_64 schedule float mode fpu divide llsc mips-plt synci"
 for option in $all_defaults
 do
-       eval "val=\$with_$option"
+       eval "val=\$with_"`echo $option | sed s/-/_/g`
        if test -n "$val"; then
                case " $supported_defaults " in
                *" $option "*)