OSDN Git Service

Initial x32 support.
[pf3gnuchains/gcc-fork.git] / gcc / config.gcc
index 491a5aa..f8d7274 100644 (file)
@@ -1,6 +1,6 @@
 # GCC target-specific configuration file.
 # Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-# 2008, 2009, 2010 Free Software Foundation, Inc.
+# 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 #This file is part of GCC.
 
@@ -72,7 +72,7 @@
 #  tm_file             A list of target macro files, if different from
 #                      "$cpu_type/$cpu_type.h". Usually it's constructed
 #                      per target in a way like this:
-#                      tm_file="${tm_file} dbxelf.h elfos.h svr4.h ${cpu_type.h}/elf.h"
+#                      tm_file="${tm_file} dbxelf.h elfos.h ${cpu_type.h}/elf.h"
 #                      Note that the preferred order is:
 #                      - specific target header "${cpu_type}/${cpu_type.h}"
 #                      - generic headers like dbxelf.h elfos.h, etc.
 #                      build-directory files by prefixing them with "./".
 #                      All other files should relative to $srcdir/config.
 #
+#  libgcc_tm_file      A list of target macro files used only for code
+#                      built for the target, not the host.  These files
+#                      are relative to $srcdir/../libgcc/config and
+#                      must not have the same names as files in
+#                      $srcdir/config.
+#
 #  tm_p_file           Location of file with declarations for functions
 #                      in $out_file.
 #
 #  out_file            The name of the machine description C support
 #                      file, if different from "$cpu_type/$cpu_type.c".
 #
+#  common_out_file     The name of the source file for code shared between
+#                      the compiler proper and the driver.
+#
 #  md_file             The name of the machine-description file, if
 #                      different from "$cpu_type/$cpu_type.md".
 #
 #
 #  gnu_ld              Set to yes or no depending on whether the target
 #                      system normally uses GNU ld.
+#
+#  target_has_targetcm Set to yes or no depending on whether the target
+#                      has its own definition of targetcm.
+#
+#  target_has_targetm_common   Set to yes or no depending on whether the
+#                      target has its own definition of targetm_common.
 
 out_file=
+common_out_file=
 tmake_file=
 extra_headers=
 user_headers_inc_next_pre=
@@ -200,8 +216,11 @@ extra_options=
 c_target_objs=
 cxx_target_objs=
 fortran_target_objs=
+target_has_targetcm=no
+target_has_targetm_common=yes
 tm_defines=
 xm_defines=
+libgcc_tm_file=
 # Set this to force installation and use of collect2.
 use_collect2=
 # Set this to override the default target model.
@@ -225,16 +244,22 @@ xm_file=
 md_file=
 
 # Obsolete configurations.
-#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
+case ${target} in
+   alpha*-dec-osf5.1*                  \
+ | i[34567]86-*-interix3*              \
+ | mips-sgi-irix6.5                    \
+ | mips*-*-openbsd*                    \
+ | score-*                             \
+ | *-*-solaris2.8*                     \
+ )
+    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
@@ -242,10 +267,13 @@ md_file=
 case ${target} in
    i[34567]86-go32-*                   \
  | i[34567]86-*-go32*                  \
+ | m68k-*-uclinuxoldabi*               \
  | mips64orion*-*-rtems*               \
  | pdp11-*-bsd                         \
  | sparc-hal-solaris2*                 \
  | thumb-*-*                           \
+ | *-*-freebsd[12] | *-*-freebsd[12].* \
+ | *-*-freebsd*aout*                   \
  | *-*-linux*aout*                     \
  | *-*-linux*coff*                     \
  | *-*-linux*libc1*                    \
@@ -272,6 +300,7 @@ case ${target} in
 m32c*-*-*)
         cpu_type=m32c
        tmake_file=m32c/t-m32c
+       target_has_targetm_common=no
         ;;
 alpha*-*-*)
        cpu_type=alpha
@@ -286,11 +315,13 @@ arm*-*-*)
        extra_headers="mmintrin.h arm_neon.h"
        c_target_objs="arm-c.o"
        cxx_target_objs="arm-c.o"
+       extra_options="${extra_options} arm/arm-tables.opt"
        ;;
 avr-*-*)
        cpu_type=avr
        c_target_objs="avr-c.o"
        cxx_target_objs="avr-c.o"
+       extra_options="${extra_options} avr/avr-tables.opt"
        ;;
 bfin*-*)
        cpu_type=bfin
@@ -302,10 +333,12 @@ frv*)     cpu_type=frv
        extra_options="${extra_options} g.opt"
        ;;
 moxie*)        cpu_type=moxie
+       target_has_targetm_common=no
        ;;
 fido-*-*)
        cpu_type=m68k
        extra_headers=math-68881.h
+       extra_options="${extra_options} m68k/m68k-tables.opt"
         ;;
 i[34567]86-*-*)
        cpu_type=i386
@@ -349,6 +382,7 @@ m32r*-*-*)
         ;;
 m68k-*-*)
        extra_headers=math-68881.h
+       extra_options="${extra_options} m68k/m68k-tables.opt"
        ;;
 microblaze*-*-*)
         cpu_type=microblaze
@@ -358,7 +392,7 @@ mips*-*-*)
        cpu_type=mips
        need_64bit_hwint=yes
        extra_headers="loongson.h"
-       extra_options="${extra_options} g.opt"
+       extra_options="${extra_options} g.opt mips/mips-tables.opt"
        ;;
 picochip-*-*)
         cpu_type=picochip
@@ -372,11 +406,11 @@ powerpc*-*-*)
                cpu_is_64bit=yes
                ;;
        esac
-       extra_options="${extra_options} g.opt fused-madd.opt"
+       extra_options="${extra_options} g.opt fused-madd.opt rs6000/rs6000-tables.opt"
        ;;
 rs6000*-*-*)
        need_64bit_hwint=yes
-       extra_options="${extra_options} g.opt fused-madd.opt"
+       extra_options="${extra_options} g.opt fused-madd.opt rs6000/rs6000-tables.opt"
        ;;
 score*-*-*)
        cpu_type=score
@@ -400,6 +434,9 @@ sh[123456789lbe]*-*-* | sh-*-*)
        cpu_type=sh
        need_64bit_hwint=yes
        ;;
+v850*-*-*)
+       cpu_type=v850
+       ;;
 xtensa*-*-*)
        extra_options="${extra_options} fused-madd.opt"
        ;;
@@ -472,6 +509,7 @@ case ${target} in
   c_target_objs="${c_target_objs} darwin-c.o"
   cxx_target_objs="${cxx_target_objs} darwin-c.o"
   fortran_target_objs="darwin-f.o"
+  target_has_targetcm=yes
   extra_objs="darwin.o"
   extra_gcc_objs="darwin-driver.o"
   default_use_cxa_atexit=yes
@@ -480,15 +518,6 @@ case ${target} in
     "" | yes | posix) thread_file='posix' ;;
   esac
   ;;
-*-*-freebsd[12] | *-*-freebsd[12].* | *-*-freebsd*aout*)
-  # This is the place-holder for the generic a.out configuration
-  # of FreeBSD.  No actual configuration resides here since
-  # there was only ever a bare-bones ix86 configuration for
-  # a.out and it exists solely in the machine-specific section.
-  # This place-holder must exist to avoid dropping into
-  # the generic ELF configuration of FreeBSD (i.e. it must be
-  # ordered before that section).
-  ;;
 *-*-freebsd*)
   # This is the generic ELF configuration of FreeBSD.  Later
   # machine-specific sections may refine and add to this
@@ -543,6 +572,7 @@ case ${target} in
   use_gcc_stdint=wrap
   ;;
 *-*-linux* | frv-*-*linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu | *-*-gnu* | *-*-kopensolaris*-gnu)
+  extra_options="$extra_options gnu-user.opt"
   extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
   gas=yes
   gnu_ld=yes
@@ -561,8 +591,6 @@ case ${target} in
   case $target in
     *linux*)
       extra_options="$extra_options linux.opt";;
-    *)
-      tm_defines="$tm_defines OPTION_GLIBC=1";;
   esac
   case $target in
     *-*-*android*)
@@ -653,13 +681,57 @@ case ${target} in
   case ${enable_threads} in
     yes) thread_file='rtems' ;;
   esac
+  extra_options="${extra_options} rtems.opt"
   use_gcc_stdint=wrap
   ;;
 *-*-uclinux*)
+  extra_options="$extra_options gnu-user.opt"
   use_gcc_stdint=wrap
+  tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC SINGLE_LIBC"
   ;;
 *-*-solaris2*)
+  # i?86-*-solaris2* needs to insert headers between cpu default and
+  # Solaris 2 specific ones.
+  sol2_tm_file="dbxelf.h elfos.h ${cpu_type}/sysv4.h sol2.h ${cpu_type}/sol2.h"
+  case ${target} in
+    *-*-solaris2.1[0-9]*)
+      sol2_tm_file="${sol2_tm_file} sol2-10.h"
+      use_gcc_stdint=wrap
+      ;;
+    *)
+      use_gcc_stdint=provide
+      ;;
+  esac
+  if test x$gnu_ld = xyes; then
+    tm_file="usegld.h ${tm_file}"
+  fi
+  if test x$gas = xyes; then
+    tm_file="usegas.h ${tm_file}"
+  fi
+  tm_p_file="${tm_p_file} sol2-protos.h"
+  tmake_file="${tmake_file} t-sol2 t-slibgcc-dummy"
+  c_target_objs="${c_target_objs} sol2-c.o"
+  cxx_target_objs="${cxx_target_objs} sol2-c.o"
+  extra_objs="sol2.o"
   extra_options="${extra_options} sol2.opt"
+  case ${enable_threads}:${have_pthread_h}:${have_thread_h} in
+    "":yes:* | yes:yes:* )
+      thread_file=posix
+      ;;
+  esac
+  ;;
+*-*-*vms*)
+  extra_options="${extra_options} vms/vms.opt"
+  xmake_file=vms/x-vms
+  tmake_file="vms/t-vms"
+  extra_objs="vms.o"
+  target_gtfiles="$target_gtfiles \$(srcdir)/config/vms/vms.c"
+  tm_p_file="${tm_p_file} vms/vms-protos.h"
+  if test x$gnu_ld != xyes; then
+    # Build wrappers for native case.
+    extra_programs="ld\$(exeext) ar\$(exeext)"
+    tmake_file="$tmake_file vms/t-vmsnative"
+  fi
   ;;
 *-*-vxworks*)
   tmake_file=t-vxworks
@@ -693,28 +765,28 @@ case ${target} in
        ;;
 alpha*-*-linux*)
        tm_file="${tm_file} alpha/elf.h alpha/linux.h alpha/linux-elf.h glibc-stdint.h"
+       extra_options="${extra_options} alpha/elf.opt"
        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"
-       ;;
 alpha*-*-freebsd*)
        tm_file="${tm_file} ${fbsd_tm_file} alpha/elf.h alpha/freebsd.h"
+       extra_options="${extra_options} alpha/elf.opt"
        target_cpu_default="MASK_GAS"
        tmake_file="${tmake_file} alpha/t-crtfm alpha/t-alpha alpha/t-ieee"
        extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o"
        ;;
 alpha*-*-netbsd*)
        tm_file="${tm_file} netbsd.h alpha/elf.h netbsd-elf.h alpha/netbsd.h"
+       extra_options="${extra_options} netbsd.opt netbsd-elf.opt \
+                      alpha/elf.opt"
        target_cpu_default="MASK_GAS"
        tmake_file="${tmake_file} alpha/t-alpha alpha/t-ieee"
        ;;
 alpha*-*-openbsd*)
        tm_defines="${tm_defines} OBSD_HAS_DECLARE_FUNCTION_NAME OBSD_HAS_DECLARE_FUNCTION_SIZE OBSD_HAS_DECLARE_OBJECT"
        tm_file="alpha/alpha.h alpha/elf.h openbsd.h openbsd-stdint.h alpha/openbsd.h openbsd-libpthread.h"
+       extra_options="${extra_options} openbsd.opt alpha/elf.opt"
        # default x-alpha is only appropriate for dec-osf.
        target_cpu_default="MASK_GAS"
        tmake_file="${tmake_file} alpha/t-alpha alpha/t-ieee"
@@ -724,48 +796,38 @@ alpha*-dec-osf5.1*)
        then
                tm_file="${tm_file} dbx.h"
        fi
-       if test x$gas != xyes
+       # mips-tfile and mips-tdump are only used with the native assembler
+       # and require the Tru64 UNIX <a.out.h>, so only build native.
+       if test x$gas != xyes && test x${host} = x${target}
        then
                extra_passes="mips-tfile mips-tdump"
        fi
        use_collect2=yes
-       tmake_file="alpha/t-alpha alpha/t-ieee alpha/t-crtfm alpha/t-osf5"
+       tmake_file="t-slibgcc-dummy"
        tm_file="${tm_file} alpha/osf5.h"
        tm_defines="${tm_defines} TARGET_SUPPORT_ARCH=1"
-       extra_options="${extra_options} rpath.opt"
+       extra_options="${extra_options} rpath.opt alpha/osf5.opt"
        extra_headers=va_list.h
        use_gcc_stdint=provide
        case ${enable_threads} in
          "" | yes | posix)
            thread_file='posix'
-           tmake_file="${tmake_file} alpha/t-osf-pthread"
            ;;
        esac
        ;;
 alpha64-dec-*vms*)
        tm_file="${tm_file} alpha/vms.h alpha/vms64.h"
        xm_file="alpha/xm-vms.h vms/xm-vms64.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"
+       tmake_file="${tmake_file} alpha/t-alpha vms/t-vms64 alpha/t-vms alpha/t-ieee"
        ;;
 alpha*-dec-*vms*)
        tm_file="${tm_file} alpha/vms.h"
        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 newlib-stdint.h ${tm_file}"
-       extra_parts="crtinit.o crtfini.o"
+       tmake_file="${tmake_file} alpha/t-alpha alpha/t-vms alpha/t-ieee"
        ;;
 arm-wrs-vxworks)
        tm_file="elfos.h arm/elf.h arm/aout.h ${tm_file} vx-common.h vxworks.h arm/vxworks.h"
+       extra_options="${extra_options} arm/vxworks.opt"
        tmake_file="${tmake_file} arm/t-arm arm/t-vxworks"
        ;;
 arm*-*-freebsd*)
@@ -774,16 +836,11 @@ arm*-*-freebsd*)
        ;;
 arm*-*-netbsdelf*)
        tm_file="dbxelf.h elfos.h netbsd.h netbsd-elf.h arm/elf.h arm/aout.h arm/arm.h arm/netbsd-elf.h"
+       extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
        tmake_file="${tmake_file} arm/t-arm arm/t-netbsd"
        ;;
-arm*-*-netbsd*)
-       tm_file="arm/aout.h arm/arm.h netbsd.h netbsd-aout.h arm/netbsd.h"
-       tmake_file="t-netbsd arm/t-arm arm/t-netbsd"
-       extra_parts=""
-       use_collect2=yes
-       ;;
 arm*-*-linux*)                 # ARM GNU/Linux with ELF
-       tm_file="dbxelf.h elfos.h linux.h linux-android.h glibc-stdint.h arm/elf.h arm/linux-gas.h arm/linux-elf.h"
+       tm_file="dbxelf.h elfos.h gnu-user.h linux.h linux-android.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"
@@ -793,7 +850,7 @@ arm*-*-linux*)                      # ARM GNU/Linux with ELF
        case ${target} in
        arm*-*-linux-*eabi)
            tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h"
-           tm_file="$tm_file ../../libgcc/config/arm/bpabi.h"
+           libgcc_tm_file="$libgcc_tm_file arm/bpabi-lib.h"
            tmake_file="$tmake_file arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi t-slibgcc-libgcc"
            # Define multilib configuration for arm-linux-androideabi.
            case ${target} in
@@ -812,6 +869,7 @@ arm*-*-linux*)                      # ARM GNU/Linux with ELF
            tmake_file="$tmake_file arm/t-linux"
            ;;
        esac
+       with_tls=${with_tls:-gnu}
        tm_file="$tm_file arm/aout.h arm/arm.h"
        tmake_file="${tmake_file} arm/t-arm-softfp soft-fp/t-softfp"
        ;;
@@ -821,7 +879,7 @@ arm*-*-uclinux*)            # ARM ucLinux
        case ${target} in
        arm*-*-uclinux*eabi)
            tm_file="$tm_file arm/bpabi.h arm/uclinux-eabi.h"
-           tm_file="$tm_file ../../libgcc/config/arm/bpabi.h"
+           libgcc_tm_file="$libgcc_tm_file arm/bpabi-lib.h"
            tmake_file="$tmake_file arm/t-bpabi"
            # The BPABI long long divmod functions return a 128-bit value in
            # registers r0-r3.  Correctly modeling that requires the use of
@@ -845,7 +903,7 @@ arm*-*-eabi* | arm*-*-symbianelf* )
        need_64bit_hwint=yes
        default_use_cxa_atexit=yes
        tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/bpabi.h"
-       tm_file="$tm_file ../../libgcc/config/arm/bpabi.h"
+       libgcc_tm_file="$libgcc_tm_file arm/bpabi-lib.h"
        tmake_file="arm/t-arm arm/t-arm-elf"
        case ${target} in
        arm*-*-eabi*)
@@ -855,6 +913,7 @@ arm*-*-eabi* | arm*-*-symbianelf* )
          ;;
        arm*-*-symbianelf*)
          tm_file="${tm_file} arm/symbian.h"
+         libgcc_tm_file="$libgcc_tm_file arm/symbian-lib.h"
          # We do not include t-bpabi for Symbian OS because the system
          # provides its own implementation of the BPABI functions.
          tmake_file="${tmake_file} arm/t-symbian"
@@ -879,21 +938,14 @@ arm*-wince-pe*)
        extra_options="${extra_options} arm/pe.opt"
        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 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"
-       ;;
 avr-*-rtems*)
-       tm_file="avr/avr.h dbxelf.h avr/rtems.h rtems.h newlib-stdint.h"
+       tm_file="elfos.h avr/elf.h 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 newlib-stdint.h"
+       tm_file="elfos.h avr/elf.h 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"
@@ -904,14 +956,12 @@ bfin*-elf*)
        use_collect2=no
        ;;
 bfin*-uclinux*)
-       tm_file="${tm_file} dbxelf.h elfos.h bfin/elf.h linux.h glibc-stdint.h bfin/uclinux.h"
+       tm_file="${tm_file} dbxelf.h elfos.h bfin/elf.h gnu-user.h linux.h glibc-stdint.h bfin/uclinux.h"
        tmake_file=bfin/t-bfin-uclinux
-       tm_defines="${tm_defines} DEFAULT_LIBC=LIBC_UCLIBC"
-       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 glibc-stdint.h bfin/linux.h ./linux-sysroot-suffix.h"
+       tm_file="${tm_file} dbxelf.h elfos.h bfin/elf.h gnu-user.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
@@ -942,7 +992,7 @@ cris-*-elf | cris-*-none)
        use_gcc_stdint=wrap
        ;;
 crisv32-*-linux* | cris-*-linux*)
-       tm_file="dbxelf.h elfos.h ${tm_file} linux.h glibc-stdint.h cris/linux.h"
+       tm_file="dbxelf.h elfos.h ${tm_file} gnu-user.h 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"
@@ -955,11 +1005,6 @@ crisv32-*-linux* | cris-*-linux*)
                ;;
        esac
        ;;
-crx-*-elf)
-       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 newlib-stdint.h ${tm_file}"
        tmake_file=fr30/t-fr30
@@ -967,30 +1012,28 @@ fr30-*-elf)
        ;;
 frv-*-elf)
        tm_file="dbxelf.h elfos.h newlib-stdint.h ${tm_file}"
-       tm_file="${tm_file} ../../libgcc/config/frv/frv-abi.h"
+       libgcc_tm_file="${libgcc_tm_file} frv/frv-abi.h"
        tmake_file=frv/t-frv
        ;;
 frv-*-*linux*)
        tm_file="dbxelf.h elfos.h ${tm_file} \
-                linux.h glibc-stdint.h frv/linux.h"
-       tm_file="${tm_file} ../../libgcc/config/frv/frv-abi.h"
+                gnu-user.h linux.h glibc-stdint.h frv/linux.h"
+       libgcc_tm_file="${libgcc_tm_file} 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 ${tm_file}"
+       tm_file="dbxelf.h elfos.h newlib-stdint.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 ${tm_file} linux.h glibc-stdint.h moxie/uclinux.h"
+       tm_file="dbxelf.h elfos.h ${tm_file} gnu-user.h 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} DEFAULT_LIBC=LIBC_UCLIBC"
-       extra_options="${extra_options} linux.opt"
        ;;
 moxie-*-rtems*)
        tmake_file="${tmake_file} moxie/t-moxie moxie/t-moxie-softfp soft-fp/t-softfp t-rtems"
@@ -1006,7 +1049,7 @@ h8300-*-elf*)
        ;;
 hppa*64*-*-linux*)
        target_cpu_default="MASK_PA_11|MASK_PA_20"
-       tm_file="pa/pa64-start.h ${tm_file} dbxelf.h elfos.h linux.h \
+       tm_file="pa/pa64-start.h ${tm_file} dbxelf.h elfos.h gnu-user.h 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"
@@ -1015,7 +1058,7 @@ hppa*64*-*-linux*)
        ;;
 hppa*-*-linux*)
        target_cpu_default="MASK_PA_11|MASK_NO_SPACE_REGS"
-       tm_file="${tm_file} dbxelf.h elfos.h linux.h glibc-stdint.h pa/pa-linux.h \
+       tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h pa/pa-linux.h \
                 pa/pa32-regs.h pa/pa32-linux.h"
        tmake_file="${tmake_file} pa/t-linux t-slibgcc-libgcc"
        # Set the libgcc version number
@@ -1037,7 +1080,7 @@ hppa[12]*-*-hpux10*)
        esac
        tm_file="${tm_file} pa/pa32-regs.h dbxelf.h pa/som.h \
                 pa/pa-hpux.h pa/pa-hpux10.h"
-       extra_options="${extra_options} pa/pa-hpux.opt"
+       extra_options="${extra_options} pa/pa-hpux.opt pa/pa-hpux10.opt"
        case ${target} in
        *-*-hpux10.[1-9]*)
                tm_file="${tm_file} pa/pa-hpux1010.h"
@@ -1080,16 +1123,20 @@ hppa*64*-*-hpux11*)
                 pa/pa64-regs.h pa/pa-hpux.h pa/pa-hpux1010.h \
                 pa/pa-hpux11.h"
        case ${target} in
-       *-*-hpux11.[1-9]*)
+       *-*-hpux11.[12]*)
                tm_file="${tm_file} pa/pa-hpux1111.h pa/pa-64.h pa/pa64-hpux.h"
                extra_options="${extra_options} pa/pa-hpux1111.opt"
                ;;
+       *-*-hpux11.[3-9]*)
+               tm_file="${tm_file} pa/pa-hpux1131.h pa/pa-64.h pa/pa64-hpux.h"
+               extra_options="${extra_options} pa/pa-hpux1131.opt"
+               ;;
        *)
                tm_file="${tm_file} pa/pa-64.h pa/pa64-hpux.h"
                ;;
        esac
        extra_options="${extra_options} pa/pa-hpux.opt \
-                      pa/pa-hpux1010.opt pa/pa64-hpux.opt"
+                      pa/pa-hpux1010.opt pa/pa64-hpux.opt hpux11.opt"
        need_64bit_hwint=yes
        tmake_file="pa/t-pa64 pa/t-pa-hpux pa/t-hpux-shlib"
        # Set the libgcc version number
@@ -1125,12 +1172,17 @@ hppa[12]*-*-hpux11*)
        esac
        tm_file="${tm_file} pa/pa32-regs.h dbxelf.h pa/som.h \
                 pa/pa-hpux.h pa/pa-hpux1010.h pa/pa-hpux11.h"
-       extra_options="${extra_options} pa/pa-hpux.opt pa/pa-hpux1010.opt"
+       extra_options="${extra_options} pa/pa-hpux.opt pa/pa-hpux1010.opt \
+                      hpux11.opt"
        case ${target} in
-       *-*-hpux11.[1-9]*)
+       *-*-hpux11.[12]*)
                tm_file="${tm_file} pa/pa-hpux1111.h"
                extra_options="${extra_options} pa/pa-hpux1111.opt"
                ;;
+       *-*-hpux11.[3-9]*)
+               tm_file="${tm_file} pa/pa-hpux1131.h"
+               extra_options="${extra_options} pa/pa-hpux1131.opt"
+               ;;
        esac
        tmake_file="pa/t-pa-hpux11 pa/t-pa-hpux pa/t-hpux-shlib"
        # Set the libgcc version number
@@ -1167,12 +1219,14 @@ i[34567]86-*-darwin*)
        need_64bit_isa=yes
        # Baseline choice for a machine that allows m64 support.
        with_cpu=${with_cpu:-core2}
-       tmake_file="${tmake_file} t-slibgcc-darwin i386/t-crtpc i386/t-crtfm"
+       tmake_file="${tmake_file} t-slibgcc-dummy i386/t-crtpc i386/t-crtfm"
+       libgcc_tm_file="$libgcc_tm_file i386/darwin-lib.h"
        ;;
 x86_64-*-darwin*)
        with_cpu=${with_cpu:-core2}
-       tmake_file="${tmake_file} ${cpu_type}/t-darwin64 t-slibgcc-darwin i386/t-crtpc i386/t-crtfm"
+       tmake_file="${tmake_file} ${cpu_type}/t-darwin64 t-slibgcc-dummy i386/t-crtpc i386/t-crtfm"
        tm_file="${tm_file} ${cpu_type}/darwin64.h"
+       libgcc_tm_file="$libgcc_tm_file i386/darwin-lib.h"
        ;;
 i[34567]86-*-elf*)
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h newlib-stdint.h i386/i386elf.h"
@@ -1184,6 +1238,7 @@ x86_64-*-elf*)
        ;;
 i[34567]86-*-freebsd*)
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${fbsd_tm_file} i386/freebsd.h"
+       tmake_file="${tmake_file} i386/t-crtstuff"
        ;;
 x86_64-*-freebsd*)
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${fbsd_tm_file} i386/x86-64.h i386/freebsd.h i386/freebsd64.h"
@@ -1191,19 +1246,16 @@ x86_64-*-freebsd*)
        ;;
 i[34567]86-*-netbsdelf*)
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h netbsd-elf.h i386/netbsd-elf.h"
-       ;;
-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="${tmake_file} t-netbsd"
-       extra_parts=""
-       use_collect2=yes
+       extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
        ;;
 x86_64-*-netbsd*)
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h netbsd-elf.h i386/x86-64.h i386/netbsd64.h"
+       extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
        tmake_file="${tmake_file} i386/t-crtstuff"
        ;;
 i[34567]86-*-openbsd2.*|i[34567]86-*openbsd3.[0123])
        tm_file="i386/i386.h i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h openbsd-oldgas.h openbsd.h i386/openbsd.h"
+       extra_options="${extra_options} openbsd.opt"
        # needed to unconfuse gdb
        tmake_file="${tmake_file} t-libc-ok t-openbsd i386/t-openbsd"
        # we need collect2 until our bug is fixed...
@@ -1212,25 +1264,43 @@ i[34567]86-*-openbsd2.*|i[34567]86-*openbsd3.[0123])
 i[34567]86-*-openbsd*)
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h"
        tm_file="${tm_file} openbsd.h openbsd-stdint.h openbsd-libpthread.h i386/openbsdelf.h"
+       extra_options="${extra_options} openbsd.opt"
        gas=yes
        gnu_ld=yes
        ;;
 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 glibc-stdint.h"
+       tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h gnu-user.h glibc-stdint.h"
        case ${target} in
        i[34567]86-*-linux*)
+               tm_file="${tm_file} linux.h"
                # Assume modern glibc
                default_gnu_indirect_function=yes
                if test x$enable_targets = xall; then
-                       tm_file="${tm_file} i386/x86-64.h i386/linux64.h"
+                       tm_file="${tm_file} i386/x86-64.h i386/gnu-user64.h i386/linux64.h"
                        tm_defines="${tm_defines} TARGET_BI_ARCH=1"
                        tmake_file="${tmake_file} i386/t-linux64"
+                       x86_multilibs="${with_multilib_list}"
+                       if test "$x86_multilibs" = "default"; then
+                               x86_multilibs="m64,m32"
+                       fi
+                       x86_multilibs=`echo $x86_multilibs | sed -e 's/,/ /g'`
+                       for x86_multilib in ${x86_multilibs}; do
+                               case ${x86_multilib} in
+                               m32 | m64 | mx32)
+                                       TM_MULTILIB_CONFIG="${TM_MULTILIB_CONFIG},${x86_multilib}"
+                                       ;;
+                               *)
+                                       echo "--with-multilib-list=${x86_with_multilib} not supported."
+                                       exit 1
+                               esac
+                       done
+                       TM_MULTILIB_CONFIG=`echo $TM_MULTILIB_CONFIG | sed 's/^,//'`
                        need_64bit_hwint=yes
                        need_64bit_isa=yes
                        case X"${with_cpu}" in
-                       Xgeneric|Xatom|Xcore2|Xcorei7|Xcorei7-avx|Xnocona|Xx86-64|Xbdver1|Xamdfam10|Xbarcelona|Xk8|Xopteron|Xathlon64|Xathlon-fx|Xathlon64-sse3|Xk8-sse3|Xopteron-sse3)
+                       Xgeneric|Xatom|Xcore2|Xcorei7|Xcorei7-avx|Xnocona|Xx86-64|Xbdver1|Xbtver1|Xamdfam10|Xbarcelona|Xk8|Xopteron|Xathlon64|Xathlon-fx|Xathlon64-sse3|Xk8-sse3|Xopteron-sse3)
                                ;;
                        X)
                                if test x$with_cpu_64 = x; then
@@ -1239,35 +1309,52 @@ i[34567]86-*-linux* | i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-knetbsd*-gnu | i
                                ;;
                        *)
                                echo "Unsupported CPU used in --with-cpu=$with_cpu, supported values:" 1>&2
-                               echo "generic atom core2 corei7 corei7-avx nocona x86-64 bdver1 amdfam10 barcelona k8 opteron athlon64 athlon-fx athlon64-sse3 k8-sse3 opteron-sse3" 1>&2
+                               echo "generic atom core2 corei7 corei7-avx nocona x86-64 bdver1 btver1 amdfam10 barcelona k8 opteron athlon64 athlon-fx athlon64-sse3 k8-sse3 opteron-sse3" 1>&2
                                exit 1
                                ;;
                        esac
                else
-                       tm_file="${tm_file} i386/linux.h"
+                       tm_file="${tm_file} i386/gnu-user.h i386/linux.h"
                fi
                ;;
-       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";;
+       i[34567]86-*-knetbsd*-gnu) tm_file="${tm_file} i386/gnu-user.h knetbsd-gnu.h i386/knetbsd-gnu.h" ;;
+       i[34567]86-*-kfreebsd*-gnu) tm_file="${tm_file} i386/gnu-user.h kfreebsd-gnu.h i386/kfreebsd-gnu.h" ;;
+       i[34567]86-*-kopensolaris*-gnu) tm_file="${tm_file} i386/gnu-user.h kopensolaris-gnu.h i386/kopensolaris-gnu.h" ;;
+       i[34567]86-*-gnu*) tm_file="$tm_file i386/gnu-user.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 glibc-stdint.h \
-                i386/x86-64.h i386/linux64.h"
+       tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h gnu-user.h glibc-stdint.h \
+                i386/x86-64.h i386/gnu-user64.h"
        case ${target} in
        x86_64-*-linux*)
+         tm_file="${tm_file} linux.h i386/linux64.h"
          default_gnu_indirect_function=glibc-2011 ;;
-       x86_64-*-kfreebsd*-gnu) tm_file="${tm_file} kfreebsd-gnu.h" ;;
+       x86_64-*-kfreebsd*-gnu) tm_file="${tm_file} kfreebsd-gnu.h i386/kfreebsd-gnu64.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 t-dfprules"
+       x86_multilibs="${with_multilib_list}"
+       if test "$x86_multilibs" = "default"; then
+               x86_multilibs="m64,m32"
+       fi
+       x86_multilibs=`echo $x86_multilibs | sed -e 's/,/ /g'`
+       for x86_multilib in ${x86_multilibs}; do
+               case ${x86_multilib} in
+               m32 | m64 | mx32)
+                       TM_MULTILIB_CONFIG="${TM_MULTILIB_CONFIG},${x86_multilib}"
+                       ;;
+               *)
+                       echo "--with-multilib-list=${x86_with_multilib} not supported."
+                       exit 1
+               esac
+       done
+       TM_MULTILIB_CONFIG=`echo $TM_MULTILIB_CONFIG | sed 's/^,//'`
        ;;
 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"
+       tm_file="dbxcoff.h ${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/djgpp.h i386/djgpp-stdint.h"
        tmake_file="${tmake_file} i386/t-djgpp"
        extra_options="${extra_options} i386/djgpp.opt"
        gnu_ld=yes
@@ -1285,14 +1372,15 @@ i[34567]86-*-lynxos*)
        gas=yes
        ;;
 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"
+       tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h tm-dwarf2.h i386/netware.h"
        tmake_file="${tmake_file} i386/t-netware"
        extra_objs=netware.o
+       extra_options="${extra_options} i386/netware.opt"
        case /${with_ld} in
        */nwld)
                extra_objs="$extra_objs nwld.o"
                tm_file="${tm_file} i386/nwld.h"
-               tmake_file="${tmake_file} i386/t-nwld"
+               tmake_file="${tmake_file} i386/t-nwld t-slibgcc-dummy"
                extra_parts="crt0.o libgcc.def libc.def libcpre.def posixpre.def"
                ;;
        esac
@@ -1304,18 +1392,18 @@ i[3456x]86-*-netware*)
        esac
        ;;
 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"
+       tm_file="${tm_file} i386/att.h dbxelf.h tm-dwarf2.h elfos.h i386/unix.h i386/nto.h"
+       extra_options="${extra_options} i386/nto.opt"
        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 newlib-stdint.h"
-       extra_parts="crtbegin.o crtend.o crti.o crtn.o"
-       tmake_file="${tmake_file} i386/t-rtems-i386 i386/t-crtstuff t-rtems"
+       tmake_file="${tmake_file} i386/t-rtems 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"
+i[34567]86-*-solaris2* | x86_64-*-solaris2.1[0-9]*)
+       tm_file="${tm_file} i386/unix.h i386/att.h ${sol2_tm_file}"
        # Set default arch_32 to pentium4, tune_32 to generic like the other
        # i386 targets, although config.guess defaults to i386-pc-solaris2*.
        case ${target} in
@@ -1331,44 +1419,13 @@ i[34567]86-*-solaris2*)
        with_tune_32=${with_tune_32:-generic}
        case ${target} in
        *-*-solaris2.1[0-9]*)
-               tm_file="${tm_file} sol2-10.h"
-               ;;
-       esac
-       tm_file="${tm_file} i386/sol2.h"
-       if test x$gnu_ld = xyes; then
-               tm_file="${tm_file} sol2-gld.h"
-       fi
-       if test x$gas = xyes; then
-               tm_file="${tm_file} i386/sol2-gas.h"
-       fi
-       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
-               tmake_file="$tmake_file t-slibgcc-elf-ver"
-               tm_defines="${tm_defines} TARGET_GNU_LD=1"
-       else
-               tmake_file="$tmake_file t-slibgcc-sld"
-       fi
-       if test x$gas = xyes; then
-               tm_file="usegas.h ${tm_file}"
-       fi
-       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_file="${tm_file} i386/x86-64.h i386/sol2-bi.h sol2-bi.h"
                tm_defines="${tm_defines} TARGET_BI_ARCH=1"
-               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.
+               tmake_file="$tmake_file i386/t-sol2-64"
                need_64bit_hwint=yes
                need_64bit_isa=yes
-               use_gcc_stdint=wrap
                case X"${with_cpu}" in
-               Xgeneric|Xatom|Xcore2|Xcorei7|Xcorei7-avx|Xnocona|Xx86-64|Xbdver1|Xamdfam10|Xbarcelona|Xk8|Xopteron|Xathlon64|Xathlon-fx|Xathlon64-sse3|Xk8-sse3|Xopteron-sse3)
+               Xgeneric|Xatom|Xcore2|Xcorei7|Xcorei7-avx|Xnocona|Xx86-64|Xbdver1|Xbtver1|Xamdfam10|Xbarcelona|Xk8|Xopteron|Xathlon64|Xathlon-fx|Xathlon64-sse3|Xk8-sse3|Xopteron-sse3)
                        ;;
                X)
                        if test x$with_cpu_64 = x; then
@@ -1377,26 +1434,15 @@ i[34567]86-*-solaris2*)
                        ;;
                *)
                        echo "Unsupported CPU used in --with-cpu=$with_cpu, supported values:" 1>&2
-                       echo "generic atom core2 corei7 corei7-avx nocona x86-64 bdver1 amdfam10 barcelona k8 opteron athlon64 athlon-fx athlon64-sse3 k8-sse3 opteron-sse3" 1>&2
+                       echo "generic atom core2 corei7 corei7-avx nocona x86-64 bdver1 btver1 amdfam10 barcelona k8 opteron athlon64 athlon-fx athlon64-sse3 k8-sse3 opteron-sse3" 1>&2
                        exit 1
                        ;;
                esac
                ;;
-       *)
-               use_gcc_stdint=provide
-               ;;
-       esac
-       case ${enable_threads}:${have_pthread_h}:${have_thread_h} in
-         "":yes:* | yes:yes:* )
-               thread_file=posix
-               ;;
-         "":*:yes | yes:*:yes )
-               thread_file=solaris
-               ;;
        esac
        ;;
 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"
+       tm_file="${tm_file} i386/unix.h i386/att.h elfos.h vx-common.h"
        case ${target} in
          *-vxworksae*)
            tm_file="${tm_file} vxworksae.h i386/vx-common.h i386/vxworksae.h"
@@ -1408,7 +1454,7 @@ i[4567]86-wrs-vxworks|i[4567]86-wrs-vxworksae)
            ;;
        esac
        ;;
-i[34567]86-*-pe | i[34567]86-*-cygwin*)
+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 i386/cygwin-stdint.h"
        xm_file=i386/xm-cygwin.h
        # This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h
@@ -1417,7 +1463,13 @@ i[34567]86-*-pe | i[34567]86-*-cygwin*)
        else
                tmake_eh_file="i386/t-sjlj-eh"
        fi
-       tmake_file="${tmake_file} ${tmake_eh_file} i386/t-cygming i386/t-cygwin"
+       # Shared libgcc DLL install dir depends on cross/native build.
+       if test x${host} = x${target} ; then
+               tmake_dlldir_file="i386/t-dlldir"
+       else
+               tmake_dlldir_file="i386/t-dlldir-x"
+       fi
+       tmake_file="${tmake_file} ${tmake_eh_file} ${tmake_dlldir_file} i386/t-cygming i386/t-cygwin t-dfprules"
        target_gtfiles="\$(srcdir)/config/i386/winnt.c"
        extra_options="${extra_options} i386/cygming.opt"
        extra_objs="winnt.o winnt-stubs.o"
@@ -1429,7 +1481,7 @@ i[34567]86-*-pe | i[34567]86-*-cygwin*)
        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"
+       tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/cygming.h"
        xm_file=i386/xm-mingw32.h
        case ${target} in
                x86_64-*-* | *-w64-*)
@@ -1439,6 +1491,10 @@ i[34567]86-*-mingw* | x86_64-*-mingw*)
                *)
                        ;;
        esac
+       if test x$enable_threads = xposix ; then
+               tm_file="${tm_file} i386/mingw-pthread.h"
+       fi
+       tm_file="${tm_file} i386/mingw32.h"
        # This makes the logic if mingw's or the w64 feature set has to be used
        case ${target} in
                *-w64-*)
@@ -1448,7 +1504,7 @@ i[34567]86-*-mingw* | x86_64-*-mingw*)
                        if test x$enable_targets = xall; then
                                tm_defines="${tm_defines} TARGET_BI_ARCH=1"
                                case X"${with_cpu}" in
-                               Xgeneric|Xatom|Xcore2|Xcorei7|Xcorei7-avx|Xnocona|Xx86-64|Xbdver1|Xamdfam10|Xbarcelona|Xk8|Xopteron|Xathlon64|Xathlon-fx|Xathlon64-sse3|Xk8-sse3|Xopteron-sse3)
+                               Xgeneric|Xatom|Xcore2|Xcorei7|Xcorei7-avx|Xnocona|Xx86-64|Xbdver1|Xbtver1|Xamdfam10|Xbarcelona|Xk8|Xopteron|Xathlon64|Xathlon-fx|Xathlon64-sse3|Xk8-sse3|Xopteron-sse3)
                                        ;;
                                X)
                                        if test x$with_cpu_64 = x; then
@@ -1457,7 +1513,7 @@ i[34567]86-*-mingw* | x86_64-*-mingw*)
                                        ;;
                                *)
                                        echo "Unsupported CPU used in --with-cpu=$with_cpu, supported values:" 1>&2
-                                       echo "generic atom core2 corei7 Xcorei7-avx nocona x86-64 bdver1 amdfam10 barcelona k8 opteron athlon64 athlon-fx athlon64-sse3 k8-sse3 opteron-sse3" 1>&2
+                                       echo "generic atom core2 corei7 Xcorei7-avx nocona x86-64 bdver1 btver1 amdfam10 barcelona k8 opteron athlon64 athlon-fx athlon64-sse3 k8-sse3 opteron-sse3" 1>&2
                                        exit 1
                                        ;;
                                esac
@@ -1473,7 +1529,13 @@ i[34567]86-*-mingw* | x86_64-*-mingw*)
        else
                tmake_eh_file="i386/t-sjlj-eh"
        fi
-       tmake_file="${tmake_file} ${tmake_eh_file} i386/t-cygming t-dfprules"
+       # Shared libgcc DLL install dir depends on cross/native build.
+       if test x${host} = x${target} ; then
+               tmake_dlldir_file="i386/t-dlldir"
+       else
+               tmake_dlldir_file="i386/t-dlldir-x"
+       fi
+       tmake_file="${tmake_file} ${tmake_eh_file} ${tmake_dlldir_file} i386/t-cygming t-dfprules"
         case ${target} in
                x86_64-w64-*)
                                tmake_file="${tmake_file} i386/t-mingw-w64"
@@ -1501,8 +1563,12 @@ i[34567]86-*-mingw* | x86_64-*-mingw*)
        use_gcc_stdint=wrap
        case ${enable_threads} in
          "" | yes | win32)       thread_file='win32'
-         tmake_file="${tmake_file} i386/t-gthr-win32"
-         ;;
+           tmake_file="${tmake_file} i386/t-gthr-win32"
+           ;;
+         posix)
+           thread_file='posix'
+           tmake_file="i386/t-mingw-pthread ${tmake_file}"
+           ;;
        esac
        case ${target} in
                x86_64-*-mingw*)
@@ -1522,7 +1588,7 @@ i[34567]86-*-mingw* | x86_64-*-mingw*)
 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="${tmake_file} i386/t-interix"
-       extra_options="${extra_options} rpath.opt"
+       extra_options="${extra_options} rpath.opt interix.opt"
        extra_objs=winnt.o
        target_gtfiles="\$(srcdir)/config/i386/winnt.c"
        if test x$enable_threads = xyes ; then
@@ -1553,7 +1619,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 linux.h glibc-stdint.h ia64/sysv4.h ia64/linux.h"
+       tm_file="${tm_file} dbxelf.h elfos.h gnu-user.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"
@@ -1573,23 +1639,25 @@ ia64*-*-hpux*)
        use_collect2=no
        c_target_objs="ia64-c.o"
        cxx_target_objs="ia64-c.o"
-       extra_options="${extra_options} ia64/ilp32.opt"
+       extra_options="${extra_options} ia64/ilp32.opt hpux11.opt"
        use_gcc_stdint=wrap
        tm_file="${tm_file} hpux-stdint.h"
+       case ${target} in
+       *-*-hpux11.3*)
+               tm_file="${tm_file} ia64/hpux-unix2003.h"
+               ;;
+       esac
        ;;
 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 ia64/t-ia64 ia64/t-vms"
-       xmake_file=vms/x-vms
+       tmake_file="${tmake_file} vms/t-vms64 ia64/t-ia64 ia64/t-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"
+       extra_options="${extra_options} ia64/vms.opt"
        ;;
 iq2000*-*-elf*)
         tm_file="elfos.h newlib-stdint.h iq2000/iq2000.h"
@@ -1607,7 +1675,7 @@ lm32-*-rtems*)
        tmake_file="${tmake_file} t-rtems"
          ;;
 lm32-*-uclinux*)
-        tm_file="dbxelf.h elfos.h ${tm_file} linux.h lm32/uclinux-elf.h"
+        tm_file="dbxelf.h elfos.h ${tm_file} gnu-user.h linux.h lm32/uclinux-elf.h"
        tmake_file="${tmake_file} lm32/t-lm32 lm32/t-fprules-softfp soft-fp/t-softfp"
         ;;
 m32r-*-elf*)
@@ -1624,7 +1692,7 @@ m32r-*-rtems*)
        extra_parts="crtinit.o crtfini.o"
        ;;
 m32r-*-linux*)
-       tm_file="dbxelf.h elfos.h linux.h glibc-stdint.h ${tm_file} m32r/linux.h"
+       tm_file="dbxelf.h elfos.h gnu-user.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
@@ -1633,7 +1701,7 @@ m32r-*-linux*)
        fi
        ;;
 m32rle-*-linux*)
-       tm_file="dbxelf.h elfos.h linux.h glibc-stdint.h m32r/little.h ${tm_file} m32r/linux.h"
+       tm_file="dbxelf.h elfos.h gnu-user.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
@@ -1641,24 +1709,6 @@ m32rle-*-linux*)
                thread_file='posix'
        fi
        ;;
-# m68hc11 and m68hc12 share the same machine description.
-m68hc11-*-*|m6811-*-*)
-       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_gcc_stdint=wrap
-        ;;
-m68hc12-*-*|m6812-*-*)
-       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_gcc_stdint=wrap
-        ;;
 m68k-*-elf* | fido-*-elf*)
        case ${target} in
        fido-*-elf*)
@@ -1695,6 +1745,7 @@ 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"
+       extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
        tm_defines="${tm_defines} MOTOROLA=1"
        ;;
 m68k*-*-openbsd*)
@@ -1703,27 +1754,19 @@ m68k*-*-openbsd*)
        # needed to unconfuse gdb
        tm_defines="${tm_defines} OBSD_OLD_GAS"
        tm_file="${tm_file} openbsd.h openbsd-stdint.h openbsd-libpthread.h m68k/openbsd.h"
+       extra_options="${extra_options} openbsd.opt"
        tmake_file="t-libc-ok t-openbsd m68k/t-openbsd"
        # we need collect2 until our bug is fixed...
        use_collect2=yes
        ;;
-m68k-*-uclinuxoldabi*)         # Motorola m68k/ColdFire running uClinux
-                               # with uClibc, using the original
-                               # 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 glibc-stdint.h"
-       tm_defines="${tm_defines} MOTOROLA=1"
-       tmake_file="m68k/t-floatlib m68k/t-uclinux"
-       ;;
 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 linux.h glibc-stdint.h flat.h m68k/linux.h m68k/uclinux.h ./sysroot-suffix.h"
-       tm_defines="${tm_defines} MOTOROLA=1 DEFAULT_LIBC=LIBC_UCLIBC"
-       extra_options="${extra_options} linux.opt"
+       tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h flat.h m68k/linux.h m68k/uclinux.h ./sysroot-suffix.h"
+       extra_options="${extra_options} m68k/uclinux.opt"
+       tm_defines="${tm_defines} MOTOROLA=1"
        tmake_file="m68k/t-floatlib m68k/t-uclinux m68k/t-mlibs"
        ;;
 m68k-*-linux*)         # Motorola m68k's running GNU/Linux
@@ -1732,7 +1775,7 @@ m68k-*-linux*)            # Motorola m68k's running GNU/Linux
        default_m68k_cpu=68020
        default_cf_cpu=5475
        with_arch=${with_arch:-m68k}
-       tm_file="${tm_file} dbxelf.h elfos.h linux.h glibc-stdint.h m68k/linux.h ./sysroot-suffix.h"
+       tm_file="${tm_file} dbxelf.h elfos.h gnu-user.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"
@@ -1755,12 +1798,6 @@ mcore-*-elf)
        tmake_file=mcore/t-mcore
        inhibit_libc=true
        ;;
-mcore-*-pe*)
-       tm_file="svr3.h dbxcoff.h newlib-stdint.h ${tm_file} mcore/mcore-pe.h"
-       tmake_file=mcore/t-mcore-pe
-       inhibit_libc=true
-       use_gcc_stdint=wrap
-       ;;
 mep-*-*)
        tm_file="dbxelf.h elfos.h ${tm_file}"
        tmake_file=mep/t-mep
@@ -1774,7 +1811,7 @@ mep-*-*)
        use_gcc_stdint=wrap
        ;;
 microblaze*-linux*)
-       tm_file="${tm_file} dbxelf.h linux.h microblaze/linux.h"
+       tm_file="${tm_file} dbxelf.h gnu-user.h linux.h microblaze/linux.h"
        c_target_objs="${c_target_objs} microblaze-c.o"
        cxx_target_objs="${cxx_target_objs} microblaze-c.o"
        tmake_file="${tmake_file} t-slibgcc-elf-ver t-slibgcc-nolc-override t-linux microblaze/t-microblaze"
@@ -1788,8 +1825,8 @@ microblaze*-*-*)
         ;;
 mips-sgi-irix6.5*)
        tm_file="elfos.h ${tm_file} mips/iris6.h"
-       tmake_file="mips/t-iris mips/t-iris6 mips/t-slibgcc-irix"
-       extra_options="${extra_options} rpath.opt"
+       tmake_file="mips/t-irix6 t-slibgcc-dummy"
+       extra_options="${extra_options} rpath.opt mips/iris6.opt"
        target_cpu_default="MASK_ABICALLS"
        tm_defines="${tm_defines} MIPS_ISA_DEFAULT=3 MIPS_ABI_DEFAULT=ABI_N32"
        # Only IRIX Development Foundation 1.3 for IRIX 6.5 provides stdint.h.
@@ -1809,9 +1846,10 @@ mips-sgi-irix6.5*)
 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"
+       extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
        ;;
 mips64*-*-linux* | mipsisa64*-*-linux*)
-       tm_file="dbxelf.h elfos.h linux.h glibc-stdint.h ${tm_file} mips/linux.h mips/linux64.h"
+       tm_file="dbxelf.h elfos.h gnu-user.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
@@ -1833,7 +1871,7 @@ mips64*-*-linux* | mipsisa64*-*-linux*)
        test x$with_llsc != x || with_llsc=yes
        ;;
 mips*-*-linux*)                                # Linux MIPS, either endian.
-        tm_file="dbxelf.h elfos.h linux.h glibc-stdint.h ${tm_file} mips/linux.h"
+        tm_file="dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h ${tm_file} mips/linux.h"
        tmake_file="${tmake_file} mips/t-libgcc-mips16"
        case ${target} in
         mipsisa32r2*)
@@ -1849,6 +1887,7 @@ mips*-*-openbsd*)
        tm_defines="${tm_defines} OBSD_HAS_DECLARE_FUNCTION_NAME OBSD_HAS_DECLARE_OBJECT OBSD_HAS_CORRECT_SPECS"
        target_cpu_default="MASK_ABICALLS"
        tm_file="mips/mips.h openbsd.h openbsd-stdint.h openbsd-libpthread.h mips/openbsd.h mips/sdb.h"
+       extra_options="${extra_options} openbsd.opt"
        case ${target} in
        mips*el-*-openbsd*)
            tm_defines="${tm_defines} TARGET_ENDIAN_DEFAULT=0";;
@@ -2010,74 +2049,76 @@ powerpc-*-darwin*)
          *-darwin[0-6]*)
            ;;
        esac
-       tmake_file="${tmake_file} t-slibgcc-darwin"
+       tmake_file="${tmake_file} t-slibgcc-dummy"
        extra_headers=altivec.h
        ;;
 powerpc64-*-darwin*)
        extra_options="${extra_options} ${cpu_type}/darwin.opt"
        extra_parts="crt2.o"
-       tmake_file="${tmake_file} ${cpu_type}/t-darwin64 t-slibgcc-darwin"
+       tmake_file="${tmake_file} ${cpu_type}/t-darwin64 t-slibgcc-dummy"
        tm_file="${tm_file} ${cpu_type}/darwin8.h ${cpu_type}/darwin64.h"
        extra_headers=altivec.h
        ;;
-powerpc*-*-freebsd*)
+powerpc-*-freebsd*)
        tm_file="${tm_file} dbxelf.h elfos.h ${fbsd_tm_file} rs6000/sysv4.h rs6000/freebsd.h"
-       tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
+       tmake_file="rs6000/t-fprules rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm rs6000/t-freebsd"
+       tmake_file="${tmake_file} t-slibgcc-libgcc rs6000/t-fprules-softfp soft-fp/t-softfp"
        extra_options="${extra_options} rs6000/sysv4.opt"
        ;;
 powerpc-*-netbsd*)
        tm_file="${tm_file} dbxelf.h elfos.h netbsd.h netbsd-elf.h freebsd-spec.h rs6000/sysv4.h rs6000/netbsd.h"
+       extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
        tmake_file="${tmake_file} rs6000/t-netbsd"
        extra_options="${extra_options} rs6000/sysv4.opt"
        ;;
 powerpc-*-eabispe*)
-       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"
+       tm_file="${tm_file} dbxelf.h elfos.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 newlib-stdint.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h rs6000/eabisim.h rs6000/eabialtivec.h"
+       tm_file="${tm_file} dbxelf.h elfos.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 usegas.h svr4.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h rs6000/eabisim.h"
+       tm_file="${tm_file} dbxelf.h elfos.h usegas.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 usegas.h svr4.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h"
+       tm_file="${tm_file} dbxelf.h elfos.h usegas.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"
        ;;
 powerpc-*-eabialtivec*)
-       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"
+       tm_file="${tm_file} dbxelf.h elfos.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"
+       tm_file="${tm_file} dbxelf.h elfos.h usegas.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 rs6000/xilinx.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 usegas.h svr4.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h"
+       tm_file="${tm_file} dbxelf.h elfos.h usegas.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 newlib-stdint.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h rs6000/rtems.h rtems.h"
+       tm_file="${tm_file} dbxelf.h elfos.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* | powerpc64-*-linux*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"
+       tm_file="${tm_file} dbxelf.h elfos.h freebsd-spec.h rs6000/sysv4.h"
        extra_options="${extra_options} rs6000/sysv4.opt"
        tmake_file="t-dfprules rs6000/t-fprules rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
        maybe_biarch=yes
@@ -2120,35 +2161,14 @@ powerpc-*-linux* | powerpc64-*-linux*)
                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 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-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 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'
-       fi
-       ;;
 powerpc-wrs-vxworks|powerpc-wrs-vxworksae)
-       tm_file="${tm_file} elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"
+       tm_file="${tm_file} elfos.h freebsd-spec.h rs6000/sysv4.h"
        tmake_file="${tmake_file} rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppccomm rs6000/t-vxworks"
        extra_options="${extra_options} rs6000/sysv4.opt"
        extra_headers=ppc-asm.h
        case ${target} in
          *-vxworksae*)
-           tm_file="${tm_file} vx-common.h vxworksae.h rs6000/vxworks.h rs6000/e500.h rs6000/vxworksae.h"
+           tm_file="${tm_file} vx-common.h vxworksae.h rs6000/vxworks.h rs6000/e500.h"
            tmake_file="${tmake_file} rs6000/t-vxworksae"
            ;;
          *-vxworks*)
@@ -2162,24 +2182,23 @@ powerpc-*-lynxos*)
        tmake_file="t-lynx rs6000/t-lynx"
        extra_options="${extra_options} rs6000/sysv4.opt lynx.opt"
        extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-       extra_options="${extra_options} lynx.opt"
        thread_file=lynx
        gnu_ld=yes
        gas=yes
        ;;
 powerpcle-*-elf*)
-       tm_file="${tm_file} dbxelf.h elfos.h usegas.h svr4.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/sysv4le.h"
+       tm_file="${tm_file} dbxelf.h elfos.h usegas.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"
        ;;
 powerpcle-*-eabisim*)
-       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"
+       tm_file="${tm_file} dbxelf.h elfos.h usegas.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 usegas.h svr4.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/eabi.h rs6000/e500.h"
+       tm_file="${tm_file} dbxelf.h elfos.h usegas.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"
        use_gcc_stdint=wrap
@@ -2230,14 +2249,15 @@ rs6000-ibm-aix[6789].* | powerpc-ibm-aix[6789].*)
        extra_headers=altivec.h
        ;;
 rx-*-elf*)
-       tm_file="dbxelf.h elfos.h svr4.h newlib-stdint.h ${tm_file} ../../libgcc/config/rx/rx-abi.h"
+       tm_file="dbxelf.h elfos.h newlib-stdint.h ${tm_file}"
+       libgcc_tm_file="${libgcc_tm_file} rx/rx-abi.h"
        tmake_file="${tmake_file} rx/t-rx"
        ;;
 s390-*-linux*)
-       tm_file="s390/s390.h dbxelf.h elfos.h svr4.h linux.h glibc-stdint.h s390/linux.h"
+       tm_file="s390/s390.h dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h s390/linux.h"
        ;;
 s390x-*-linux*)
-       tm_file="s390/s390x.h s390/s390.h dbxelf.h elfos.h svr4.h linux.h glibc-stdint.h s390/linux.h"
+       tm_file="s390/s390x.h s390/s390.h dbxelf.h elfos.h gnu-user.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
@@ -2245,7 +2265,7 @@ s390x-*-linux*)
        tmake_file="${tmake_file} s390/t-linux64"
        ;;
 s390x-ibm-tpf*)
-        tm_file="s390/s390x.h s390/s390.h dbxelf.h elfos.h svr4.h s390/tpf.h"
+        tm_file="s390/s390x.h s390/s390.h dbxelf.h elfos.h s390/tpf.h"
         tm_p_file=s390/s390-protos.h
         md_file=s390/s390.md
         extra_modes=s390/s390-modes.def
@@ -2255,12 +2275,13 @@ s390x-ibm-tpf*)
        extra_options="${extra_options} s390/tpf.opt"
        ;;
 score-*-elf)
+       gas=yes
+       gnu_ld=yes
         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"
+       extra_parts="crti.o crtn.o crtbegin.o crtend.o"
+        tmake_file="${tmake_file} score/t-score-elf score/t-score-softfp soft-fp/t-softfp"
         ;;
 sh-*-elf* | sh[12346l]*-*-elf* | \
-sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
   sh-*-linux* | sh[2346lbe]*-*-linux* | \
   sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \
    sh64-*-netbsd* | sh64l*-*-netbsd*)
@@ -2289,16 +2310,15 @@ sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
        case ${with_endian} in
        little*)        tm_file="sh/little.h ${tm_file}" ;;
        esac
-       tm_file="${tm_file} dbxelf.h elfos.h"
-       case ${target} in
-       sh*-*-netbsd*)  ;;
-       *)              tm_file="${tm_file} svr4.h" ;;
-       esac
-       tm_file="${tm_file} sh/elf.h"
+       tm_file="${tm_file} dbxelf.h elfos.h sh/elf.h"
        case ${target} in
        sh*-*-linux*)   tmake_file="${tmake_file} sh/t-linux"
-                       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" ;;
+                       tm_file="${tm_file} gnu-user.h linux.h glibc-stdint.h sh/linux.h" ;;
+       sh*-*-netbsd*)
+                       tm_file="${tm_file} netbsd.h netbsd-elf.h sh/netbsd-elf.h"
+                       extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
+
+                       ;;
        sh*-superh-elf) if test x$with_libgloss != xno; then
                                 with_libgloss=yes
                                 tm_file="${tm_file} sh/newlib.h"
@@ -2338,13 +2358,6 @@ sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
                fi
                extra_headers="shmedia.h ushmedia.h sshmedia.h"
                ;;
-       *-*-symbianelf*)
-               tmake_file="sh/t-symbian"
-               tm_file="sh/symbian-pre.h sh/little.h ${tm_file} sh/symbian-post.h"
-               c_target_objs="symbian-base.o symbian-c.o"
-               cxx_target_objs="symbian-base.o symbian-cxx.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"
                ;;
@@ -2448,26 +2461,44 @@ sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
        ;;
 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 newlib-stdint.h"
+       tm_file="${tm_file} dbxelf.h elfos.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"
+       tm_file="${tm_file} elfos.h sh/elf.h sh/embed-elf.h vx-common.h vxworks.h sh/vxworks.h"
        ;;
 sparc-*-elf*)
-       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"
+       tm_file="${tm_file} dbxelf.h elfos.h newlib-stdint.h sparc/sysv4.h sparc/sp-elf.h"
+       case ${target} in
+           *-leon-*)
+               tmake_file="sparc/t-leon"
+               ;;
+           *-leon[3-9]*)
+               tmake_file="sparc/t-leon3"
+               ;;
+           *)
+               tmake_file="sparc/t-elf"
+               ;;
+       esac
        ;;
 sparc-*-rtems*)
-       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"
+       tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h sparc/sp-elf.h sparc/rtemself.h rtems.h newlib-stdint.h"
+       tmake_file="sparc/t-elf t-rtems"
        ;;
 sparc-*-linux*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h linux.h glibc-stdint.h"
+       tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h gnu-user.h linux.h glibc-stdint.h"
        extra_options="${extra_options} sparc/long-double-switch.opt"
-       tmake_file="${tmake_file} sparc/t-linux"
+       case ${target} in
+           *-leon-*)
+               tmake_file="${tmake_file} sparc/t-leon"
+               ;;
+           *-leon[3-9]*)
+               tmake_file="${tmake_file} sparc/t-leon3"
+               ;;
+           *)
+               tmake_file="${tmake_file} sparc/t-linux"
+               ;;
+       esac
        if test x$enable_targets = xall; then
                tm_file="sparc/biarch64.h ${tm_file} sparc/linux64.h"
                tmake_file="${tmake_file} sparc/t-linux64"
@@ -2477,78 +2508,37 @@ sparc-*-linux*)
        tmake_file="${tmake_file} sparc/t-crtfm"
        ;;
 sparc-*-netbsdelf*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h netbsd.h netbsd-elf.h sparc/netbsd-elf.h"
+       tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h netbsd.h netbsd-elf.h sparc/netbsd-elf.h"
+       extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
        extra_options="${extra_options} sparc/long-double-switch.opt"
        ;;
 sparc*-*-solaris2*)
-       tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h"
-       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"
+       tm_file="sparc/biarch64.h ${tm_file} ${sol2_tm_file} sol2-bi.h"
        case ${target} in
            sparc64-*-* | sparcv9-*-*)
-               tm_file="${tm_file} sparc/sol2-64.h"
+               tm_file="sparc/sol2-64.h ${tm_file}"
                ;;
            *)
                test x$with_cpu != x || with_cpu=v9
                ;;
        esac
-       tm_file="${tm_file} sparc/sol2-bi.h"
-       if test x$gas = xyes; then
-               tm_file="${tm_file} sparc/sol2-gas.h sparc/sol2-gas-bi.h"
-       fi
-       if test x$gnu_ld = xyes; then
-               tm_file="${tm_file} sol2-gld.h sparc/sol2-gld-bi.h"
-       fi
-       tm_file="${tm_file} tm-dwarf2.h"
-       tmake_file="t-sol2 sparc/t-sol2 sparc/t-sol2-64 sparc/t-crtfm"
-       if test x$gnu_ld = xyes; then
-               tmake_file="$tmake_file t-slibgcc-elf-ver"
-       else
-               tmake_file="$tmake_file t-slibgcc-sld"
-       fi
-       if test x$gas = xyes; then
-               tm_file="usegas.h ${tm_file}"
-       fi
-       c_target_objs="sol2-c.o"
-       cxx_target_objs="sol2-c.o"
-       extra_objs="sol2.o"
-       tm_p_file="${tm_p_file} sol2-protos.h"
-       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:* )
-               thread_file=posix
-               ;;
-         "":*:yes | yes:*:yes )
-               thread_file=solaris
-               ;;
-       esac
+       tmake_file="${tmake_file} sparc/t-sol2-64"
        ;;
 sparc-wrs-vxworks)
-       tm_file="${tm_file} elfos.h svr4.h sparc/sysv4.h vx-common.h vxworks.h sparc/vxworks.h"
+       tm_file="${tm_file} elfos.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 newlib-stdint.h sparc/sysv4.h sparc/sp64-elf.h"
+       tm_file="${tm_file} dbxelf.h elfos.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"
        ;;
 sparc64-*-rtems*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h newlib-stdint.h sparc/sysv4.h sparc/sp64-elf.h sparc/rtemself.h rtems.h"
+       tm_file="${tm_file} dbxelf.h elfos.h newlib-stdint.h sparc/sysv4.h sparc/sp64-elf.h sparc/rtemself.h rtems.h"
        extra_options="${extra_options} sparc/little-endian.opt"
-       tmake_file="${tmake_file} sparc/t-crtfm t-rtems"
-       extra_parts="crtbegin.o crtend.o"
+       tmake_file="${tmake_file} t-rtems"
        ;;
 sparc64-*-linux*)
-       tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h linux.h glibc-stdint.h sparc/linux64.h"
+       tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h sparc/sysv4.h gnu-user.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"
        ;;
@@ -2564,13 +2554,15 @@ sparc64-*-freebsd*|ultrasparc-*-freebsd*)
        ;;
 sparc64-*-netbsd*)
        tm_file="sparc/biarch64.h ${tm_file}"
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h netbsd.h netbsd-elf.h sparc/netbsd-elf.h"
+       tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h netbsd.h netbsd-elf.h sparc/netbsd-elf.h"
+       extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
        extra_options="${extra_options} sparc/long-double-switch.opt"
        tmake_file="${tmake_file} sparc/t-netbsd64"
        ;;
 sparc64-*-openbsd*)
-       tm_file="sparc/openbsd1-64.h ${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/sp64-elf.h"
+       tm_file="sparc/openbsd1-64.h ${tm_file} dbxelf.h elfos.h sparc/sysv4.h sparc/sp64-elf.h"
        tm_file="${tm_file} openbsd.h openbsd-stdint.h openbsd-libpthread.h sparc/openbsd64.h"
+       extra_options="${extra_options} openbsd.opt"
        extra_options="${extra_options} sparc/little-endian.opt"
        gas=yes gnu_ld=yes
        with_cpu=ultrasparc
@@ -2583,46 +2575,26 @@ spu-*-elf*)
        c_target_objs="${c_target_objs} spu-c.o"
        cxx_target_objs="${cxx_target_objs} spu-c.o"
        ;;
-v850e1-*-*)
-       target_cpu_default="TARGET_CPU_v850e1"
-       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
-       extra_modes=v850/v850-modes.def
-       out_file=v850/v850.c
-       extra_options="${extra_options} v850/v850.opt"
-       if test x$stabs = xyes
-       then
-               tm_file="${tm_file} dbx.h"
-       fi
-       use_collect2=no
-       c_target_objs="v850-c.o"
-       cxx_target_objs="v850-c.o"
-       use_gcc_stdint=wrap
-       ;;
-v850e-*-*)
-       target_cpu_default="TARGET_CPU_v850e"
-       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
-       extra_modes=v850/v850-modes.def
-       out_file=v850/v850.c
-       extra_options="${extra_options} v850/v850.opt"
-       if test x$stabs = xyes
-       then
-               tm_file="${tm_file} dbx.h"
-       fi
-       use_collect2=no
-       c_target_objs="v850-c.o"
-       cxx_target_objs="v850-c.o"
-       use_gcc_stdint=wrap
-       ;;
-v850-*-*)
-       target_cpu_default="TARGET_CPU_generic"
-       tm_file="dbxelf.h elfos.h svr4.h newlib-stdint.h ${tm_file}"
-       tmake_file=v850/t-v850
+
+v850*-*-*)
+       case ${target} in
+       v850e2v3-*-*)
+               target_cpu_default="TARGET_CPU_v850e2v3"
+               ;;
+       v850e2-*-*)
+               target_cpu_default="TARGET_CPU_v850e2"
+               ;;
+       v850e1-*-* | v850es-*-*)
+               target_cpu_default="TARGET_CPU_v850e1"
+               ;;
+       v850e-*-*)
+               target_cpu_default="TARGET_CPU_v850e"
+               ;;
+       v850-*-*)
+               target_cpu_default="TARGET_CPU_generic"
+               ;;
+       esac
+       tm_file="dbxelf.h elfos.h newlib-stdint.h v850/v850.h"
        if test x$stabs = xyes
        then
                tm_file="${tm_file} dbx.h"
@@ -2633,25 +2605,22 @@ v850-*-*)
        use_gcc_stdint=wrap
        ;;
 vax-*-linux*)
-       tm_file="${tm_file} dbxelf.h elfos.h linux.h vax/elf.h vax/linux.h"
+       tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h linux.h vax/elf.h vax/linux.h"
+       extra_options="${extra_options} vax/elf.opt"
        tmake_file="${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"
-       ;;
-vax-*-netbsd*)
-       tm_file="${tm_file} netbsd.h netbsd-aout.h vax/netbsd.h"
-       tmake_file=t-netbsd
-       extra_parts=""
-       use_collect2=yes
+       extra_options="${extra_options} netbsd.opt netbsd-elf.opt vax/elf.opt"
        ;;
 vax-*-openbsd*)
        tm_file="vax/vax.h vax/openbsd1.h openbsd.h openbsd-stdint.h openbsd-pthread.h vax/openbsd.h"
+       extra_options="${extra_options} openbsd.opt"
        use_collect2=yes
        ;;
 xstormy16-*-elf)
        # For historical reasons, the target files omit the 'x'.
-       tm_file="dbxelf.h elfos.h svr4.h newlib-stdint.h stormy16/stormy16.h"
+       tm_file="dbxelf.h elfos.h newlib-stdint.h stormy16/stormy16.h"
        tm_p_file=stormy16/stormy16-protos.h
        md_file=stormy16/stormy16.md
        out_file=stormy16/stormy16.c
@@ -2660,28 +2629,29 @@ xstormy16-*-elf)
        extra_parts="crtbegin.o crtend.o"
        ;;
 xtensa*-*-elf*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h newlib-stdint.h xtensa/elf.h"
+       tm_file="${tm_file} dbxelf.h elfos.h newlib-stdint.h xtensa/elf.h"
+       extra_options="${extra_options} xtensa/elf.opt"
        tmake_file="xtensa/t-xtensa xtensa/t-elf"
        ;;
 xtensa*-*-linux*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h glibc-stdint.h xtensa/linux.h"
+       tm_file="${tm_file} dbxelf.h elfos.h gnu-user.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 glibc-stdint.h mn10300/linux.h"
+       tm_file="mn10300/mn10300.h dbxelf.h elfos.h gnu-user.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"
+       tm_file="dbxelf.h elfos.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 newlib-stdint.h ${tm_file}"
+       tm_file="dbxelf.h elfos.h newlib-stdint.h ${tm_file}"
        c_target_objs="m32c-pragma.o"
        cxx_target_objs="m32c-pragma.o"
        ;;
@@ -2702,6 +2672,19 @@ powerpc*-*-* | rs6000-*-*)
        tm_file="${tm_file} rs6000/option-defaults.h"
 esac
 
+if [ "$target_has_targetcm" = "no" ]; then
+  c_target_objs="$c_target_objs default-c.o"
+  cxx_target_objs="$cxx_target_objs default-c.o"
+fi
+
+if [ "$common_out_file" = "" ]; then
+  if [ "$target_has_targetm_common" = "yes" ]; then
+    common_out_file="$cpu_type/$cpu_type-common.c"
+  else
+    common_out_file="default-common.c"
+  fi
+fi
+
 # Support for --with-cpu and related options (and a few unrelated options,
 # too).
 case ${with_cpu} in
@@ -2718,6 +2701,16 @@ cpu=
 arch_without_sse2=no
 arch_without_64bit=no
 case ${target} in
+  i386-*-freebsd*)
+    if test $fbsd_major -ge 6; then
+      arch=i486
+    else
+      arch=i386
+    fi
+    cpu=generic
+    arch_without_sse2=yes
+    arch_without_64bit=yes
+    ;;
   i386-*-*)
     arch=i386
     cpu=i386
@@ -2762,6 +2755,10 @@ case ${target} in
        arch=bdver1
        cpu=bdver1
        ;;
+      btver1-*)
+       arch=btver1
+       cpu=btver1
+       ;;
       amdfam10-*|barcelona-*)
        arch=amdfam10
        cpu=amdfam10
@@ -2851,6 +2848,10 @@ case ${target} in
        arch=bdver1
        cpu=bdver1
        ;;
+      btver1-*)
+       arch=btver1
+       cpu=btver1
+       ;;
       amdfam10-*|barcelona-*)
        arch=amdfam10
        cpu=amdfam10
@@ -2928,6 +2929,9 @@ if test x$with_cpu = x ; then
     mips*-*-vxworks)
       with_arch=mips2
       ;;
+    sparc-leon*-*)
+      with_cpu=v8;
+      ;;
     sparc*-*-*)
       with_cpu="`echo ${target} | sed 's/-.*$//'`"
       ;;
@@ -3073,7 +3077,7 @@ case "${target}" in
                ;;
 
        arm*-*-*)
-               supported_defaults="arch cpu float tune fpu abi mode"
+               supported_defaults="arch cpu float tune fpu abi mode tls"
                for which in cpu tune; do
                        # See if it matches any of the entries in arm-cores.def
                        eval "val=\$with_$which"
@@ -3156,6 +3160,17 @@ case "${target}" in
                        ;;
                esac
 
+               case "$with_tls" in
+               "" \
+               | gnu | gnu2)
+                       # OK
+                       ;;
+               *)
+                       echo "Unknown TLS method used in --with-tls=$with_tls" 1>&2
+                       exit 1
+                       ;;
+               esac
+
                if test "x$with_arch" != x && test "x$with_cpu" != x; then
                        echo "Warning: --with-arch overrides --with-cpu=$with_cpu" 1>&2
                fi
@@ -3264,7 +3279,7 @@ case "${target}" in
                                ;;
                        "" | x86-64 | generic | native \
                        | k8 | k8-sse3 | athlon64 | athlon64-sse3 | opteron \
-                       | opteron-sse3 | athlon-fx | bdver1 | amdfam10 \
+                       | opteron-sse3 | athlon-fx | bdver1 | btver1 | amdfam10 \
                        | barcelona | nocona | core2 | corei7 | corei7-avx | atom)
                                # OK
                                ;;
@@ -3447,9 +3462,11 @@ case "${target}" in
                for which in cpu tune; do
                        eval "val=\$with_$which"
                        case ${val} in
-                       "" | sparc | sparcv9 | sparc64 | sparc86x \
-                       | v7 | cypress | v8 | supersparc | sparclite | f930 \
-                       | f934 | hypersparc | sparclite86x | sparclet | tsc701 \
+                       "" | sparc | sparcv9 | sparc64 \
+                       | v7 | cypress \
+                       | v8 | supersparc | hypersparc | leon \
+                       | sparclite | f930 | f934 | sparclite86x \
+                       | sparclet | tsc701 \
                        | v9 | ultrasparc | ultrasparc3 | niagara | niagara2)
                                # OK
                                ;;
@@ -3491,7 +3508,7 @@ case "${target}" in
        v850*-*-*)
                supported_defaults=cpu
                case ${with_cpu} in
-               "" | v850e | v850e1)
+               "" | v850e | v850e1 | v850e2 | v850es | v850e2v3)
                        # OK
                        ;;
                *)
@@ -3531,6 +3548,7 @@ case ${target} in
 
        fido*-*-* | m68k*-*-*)
                target_cpu_default2=$m68k_cpu_ident
+               tmake_file="m68k/t-opts $tmake_file"
                if [ x"$m68k_arch_family" != x ]; then
                        tmake_file="m68k/t-$m68k_arch_family $tmake_file"
                fi
@@ -3544,7 +3562,7 @@ case ${target} in
          i[34567]86-*-gnu*)
                tmake_file="${tmake_file} i386/t-fprules-softfp soft-fp/t-softfp i386/t-linux"
                ;;
-       i[34567]86-*-solaris2*)
+       i[34567]86-*-solaris2* | x86_64-*-solaris2.1[0-9]*)
                tmake_file="${tmake_file} i386/t-fprules-softfp soft-fp/t-softfp"
                ;;
        i[34567]86-*-cygwin* | i[34567]86-*-mingw* | x86_64-*-mingw*)
@@ -3567,13 +3585,7 @@ case ${target} in
                                tm_defines="TARGET_ENDIAN_DEFAULT=0 $tm_defines"
                                ;;
                esac
-               if test "x$enable_gofast" = xyes
-               then
-                       tm_defines="US_SOFTWARE_GOFAST $tm_defines"
-                       tmake_file="mips/t-gofast $tmake_file"
-               else
-                       tmake_file="mips/t-mips $tmake_file"
-               fi
+               tmake_file="mips/t-mips $tmake_file"
                ;;
 
        powerpc*-*-* | rs6000-*-*)
@@ -3599,6 +3611,15 @@ case ${target} in
                cxx_target_objs="${cxx_target_objs} sh-c.o"
                ;;
 
+       sparc-leon*-*)
+               if test x$with_tune = x ; then
+                 with_tune=leon;
+               fi
+
+               # The SPARC port checks this value at compile-time.
+               target_cpu_default2="TARGET_CPU_$with_cpu"
+               ;;
+
        sparc*-*-*)
                # Some standard aliases.
                case x$with_cpu in
@@ -3613,21 +3634,23 @@ case ${target} in
                # The SPARC port checks this value at compile-time.
                target_cpu_default2="TARGET_CPU_$with_cpu"
                ;;
+
        v850*-*-*)
-               # FIXME: The v850 is "special" in that it does not support
-               # runtime CPU selection, only --with-cpu.
                case "x$with_cpu" in
                x)
                        ;;
-               xv850e)
+               xv850e | xv850e1 | xv850e2 | xv850e2v3)
                        target_cpu_default2="TARGET_CPU_$with_cpu"
                        ;;
+               xv850es)
+                       target_cpu_default2="TARGET_CPU_v850e1"
+                       ;;
                esac
                ;;
 esac
 
 t=
-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"
+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 tls"
 for option in $all_defaults
 do
        eval "val=\$with_"`echo $option | sed s/-/_/g`