OSDN Git Service

2010-09-18 Kai Tietz <kai.tietz@onevision.com>
[pf3gnuchains/gcc-fork.git] / gcc / config.gcc
index 1d3c3fc..241e878 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 Free Software Foundation, Inc.
+# 2008, 2009, 2010 Free Software Foundation, Inc.
 
 #This file is part of GCC.
 
 #  extra_headers       List of used header files from the directory
 #                      config/${cpu_type}.
 #
+#  user_headers_inc_next_pre
+#                      List of header file names of internal gcc header
+#                      files, which should be prefixed by an include_next.
+#  user_headers_inc_next_post
+#                      List of header file names of internal gcc header
+#                      files, which should be postfixed by an include_next.
 #  use_gcc_tgmath      If set, add tgmath.h to the list of used header
 #                      files.
 #
 out_file=
 tmake_file=
 extra_headers=
+user_headers_inc_next_pre=
+user_headers_inc_next_post=
 use_gcc_tgmath=yes
 use_gcc_stdint=none
 extra_passes=
@@ -199,6 +207,9 @@ gnu_ld="$gnu_ld_flag"
 default_use_cxa_atexit=no
 target_gtfiles=
 need_64bit_hwint=
+need_64bit_isa=
+# Selects the object file format reader/writer used by LTO.
+lto_binary_reader=lto-elf
 
 # Don't carry these over build->host->target.  Please.
 xm_file=
@@ -232,8 +243,8 @@ case ${target} in
  | *-*-linux*oldld*                    \
  | *-*-rtemsaout*                      \
  | *-*-rtemscoff*                      \
- | *-*-solaris2.[0-6]                  \
- | *-*-solaris2.[0-6].*                        \
+ | *-*-solaris2.[0-7]                  \
+ | *-*-solaris2.[0-7].*                        \
  | *-*-sysv*           \
  | vax-*-vms*                          \
  )
@@ -256,6 +267,7 @@ m32c*-*-*)
 alpha*-*-*)
        cpu_type=alpha
        need_64bit_hwint=yes
+       extra_options="${extra_options} g.opt"
        ;;
 am33_2.0-*-linux*)
        cpu_type=mn10300
@@ -266,6 +278,11 @@ arm*-*-*)
        c_target_objs="arm-c.o"
        cxx_target_objs="arm-c.o"
        ;;
+avr-*-*)
+       cpu_type=avr
+       c_target_objs="avr-c.o"
+       cxx_target_objs="avr-c.o"
+       ;;
 bfin*-*)
        cpu_type=bfin
        ;;
@@ -273,6 +290,7 @@ crisv32-*)
        cpu_type=cris
        ;;
 frv*)  cpu_type=frv
+       extra_options="${extra_options} g.opt"
        ;;
 moxie*)        cpu_type=moxie
        ;;
@@ -288,7 +306,8 @@ i[34567]86-*-*)
                       pmmintrin.h tmmintrin.h ammintrin.h smmintrin.h
                       nmmintrin.h bmmintrin.h fma4intrin.h wmmintrin.h
                       immintrin.h x86intrin.h avxintrin.h xopintrin.h
-                      ia32intrin.h cross-stdarg.h lwpintrin.h"
+                      ia32intrin.h cross-stdarg.h lwpintrin.h popcntintrin.h
+                      abmintrin.h"
        ;;
 x86_64-*-*)
        cpu_type=i386
@@ -298,18 +317,24 @@ x86_64-*-*)
                       pmmintrin.h tmmintrin.h ammintrin.h smmintrin.h
                       nmmintrin.h bmmintrin.h fma4intrin.h wmmintrin.h
                       immintrin.h x86intrin.h avxintrin.h xopintrin.h
-                      ia32intrin.h cross-stdarg.h lwpintrin.h"
+                      ia32intrin.h cross-stdarg.h lwpintrin.h popcntintrin.h
+                      abmintrin.h"
        need_64bit_hwint=yes
        ;;
 ia64-*-*)
        extra_headers=ia64intrin.h
        need_64bit_hwint=yes
+       extra_options="${extra_options} g.opt"
        ;;
 hppa*-*-*)
        cpu_type=pa
        ;;
+lm32*)
+       extra_options="${extra_options} g.opt"
+       ;;
 m32r*-*-*)
         cpu_type=m32r
+       extra_options="${extra_options} g.opt"
         ;;
 m68k-*-*)
        extra_headers=math-68881.h
@@ -318,6 +343,7 @@ mips*-*-*)
        cpu_type=mips
        need_64bit_hwint=yes
        extra_headers="loongson.h"
+       extra_options="${extra_options} g.opt"
        ;;
 picochip-*-*)
         cpu_type=picochip
@@ -327,16 +353,19 @@ powerpc*-*-*)
        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[34567]|xpower6x|xrs64a|xcell|xa2)
+           xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[34567]|xpower6x|xrs64a|xcell|xa2|xe500mc64)
                cpu_is_64bit=yes
                ;;
        esac
+       extra_options="${extra_options} g.opt"
        ;;
 rs6000*-*-*)
        need_64bit_hwint=yes
+       extra_options="${extra_options} g.opt"
        ;;
 score*-*-*)
        cpu_type=score
+       extra_options="${extra_options} g.opt"
        ;;
 sparc*-*-*)
        cpu_type=sparc
@@ -377,6 +406,9 @@ i[34567]86-*-*)
        if test "x$enable_cld" = xyes; then
                tm_defines="${tm_defines} USE_IX86_CLD=1"
        fi
+       if test "x$enable_frame_pointer" = xyes; then
+               tm_defines="${tm_defines} USE_IX86_FRAME_POINTER=1"
+       fi
        tm_file="vxworks-dummy.h ${tm_file}"
        ;;
 x86_64-*-*)
@@ -384,6 +416,9 @@ x86_64-*-*)
        if test "x$enable_cld" = xyes; then
                tm_defines="${tm_defines} USE_IX86_CLD=1"
        fi
+       if test "x$enable_frame_pointer" = xyes; then
+               tm_defines="${tm_defines} USE_IX86_FRAME_POINTER=1"
+       fi
        tm_file="vxworks-dummy.h ${tm_file}"
        ;;
 esac
@@ -395,9 +430,13 @@ case ${target} in
        ;;
 esac
 
+# Common C libraries.
+tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3"
+
 # Common parts for widely ported systems.
 case ${target} in
 *-*-darwin*)
+  tmake_file="t-darwin ${cpu_type}/t-darwin"
   tm_file="${tm_file} darwin.h"
   case ${target} in
   *-*-darwin9*)
@@ -409,7 +448,6 @@ case ${target} in
   esac
   tm_file="${tm_file} ${cpu_type}/darwin.h"
   tm_p_file="${tm_p_file} darwin-protos.h"
-  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="${c_target_objs} darwin-c.o"
@@ -498,26 +536,46 @@ case ${target} in
     *-*-gnu*)
       tmake_file="$tmake_file t-gnu";;
   esac
-  # glibc / uclibc switch.  uclibc isn't usable for GNU/Hurd and neither for
-  # GNU/k*BSD.
+  # glibc / uclibc / bionic switch.
+  # uclibc and bionic aren'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
+  case $target in
+    *-*-*android*)
+      tm_defines="$tm_defines DEFAULT_LIBC=LIBC_BIONIC"
+      ;;
     *-*-*uclibc*)
-      tm_defines="${tm_defines} UCLIBC_DEFAULT=1"
+      tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC"
       ;;
     *)
-      tm_defines="${tm_defines} UCLIBC_DEFAULT=0"
+      tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC"
       ;;
   esac
-  # Assume that glibc or uClibc are being used and so __cxa_atexit is provided.
+  # Assume that glibc or uClibc or Bionic are being used and so __cxa_atexit
+  # is provided.
   default_use_cxa_atexit=yes
   use_gcc_tgmath=no
   use_gcc_stdint=wrap
+  # Add Android userspace support to Linux targets.
+  case $target in
+    *linux*)
+      tm_file="$tm_file linux-android.h"
+      extra_options="$extra_options linux-android.opt"
+      ;;
+  esac
+  # Enable compilation for Android by default for *android* targets.
+  case $target in
+    *-*-*android*)
+      tm_defines="$tm_defines ANDROID_DEFAULT=1"
+      ;;
+    *)
+      tm_defines="$tm_defines ANDROID_DEFAULT=0"
+      ;;
+  esac
   ;;
 *-*-netbsd*)
   tmake_file="t-slibgcc-elf-ver t-libc-ok t-netbsd t-libgcc-pic"
@@ -638,7 +696,7 @@ alpha*-*-openbsd*)
        target_cpu_default="MASK_GAS"
        tmake_file="${tmake_file} alpha/t-alpha alpha/t-ieee"
        ;;
-alpha*-dec-osf[45]*)
+alpha*-dec-osf5.1*)
        if test x$stabs = xyes
        then
                tm_file="${tm_file} dbx.h"
@@ -648,22 +706,11 @@ alpha*-dec-osf[45]*)
                extra_passes="mips-tfile mips-tdump"
        fi
        use_collect2=yes
-       tmake_file="alpha/t-alpha alpha/t-ieee alpha/t-crtfm alpha/t-osf4"
-       tm_file="${tm_file} alpha/osf.h"
+       tmake_file="alpha/t-alpha alpha/t-ieee alpha/t-crtfm alpha/t-osf5"
+       tm_file="${tm_file} alpha/osf5.h"
+       tm_defines="${tm_defines} TARGET_SUPPORT_ARCH=1"
        extra_headers=va_list.h
-       case ${target} in
-         *-*-osf4*)
-           # Define TARGET_SUPPORT_ARCH except on 4.0a.
-           case ${target} in
-               *-*-osf4.0a) ;;
-               *) tm_defines="${tm_defines} TARGET_SUPPORT_ARCH=1"
-           esac
-           ;;
-         *-*-osf5*)
-           tm_file="${tm_file} alpha/osf5.h"
-           tm_defines="${tm_defines} TARGET_SUPPORT_ARCH=1"
-           ;;
-       esac
+       use_gcc_stdint=provide
        case ${enable_threads} in
          "" | yes | posix)
            thread_file='posix'
@@ -712,7 +759,7 @@ arm*-*-netbsd*)
        use_collect2=yes
        ;;
 arm*-*-linux*)                 # ARM GNU/Linux with ELF
-       tm_file="dbxelf.h elfos.h linux.h glibc-stdint.h arm/elf.h arm/linux-gas.h arm/linux-elf.h"
+       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"
        case $target in
        arm*b-*)
                tm_defines="${tm_defines} TARGET_BIG_ENDIAN_DEFAULT=1"
@@ -723,6 +770,12 @@ arm*-*-linux*)                     # ARM GNU/Linux with ELF
        arm*-*-linux-*eabi)
            tm_file="$tm_file arm/bpabi.h arm/linux-eabi.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
+           *-androideabi)
+               tmake_file="$tmake_file arm/t-linux-androideabi"
+               ;;
+           esac
            # The BPABI long long divmod functions return a 128-bit value in
            # registers r0-r3.  Correctly modeling that requires the use of
            # TImode.
@@ -769,9 +822,8 @@ 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"
+         tm_file="$tm_file newlib-stdint.h"
          tmake_file="${tmake_file} arm/t-bpabi"
-         extra_options="${extra_options} arm/eabi.opt"
          use_gcc_stdint=wrap
          ;;
        arm*-*-symbianelf*)
@@ -827,7 +879,7 @@ bfin*-elf*)
 bfin*-uclinux*)
        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"
+       tm_defines="${tm_defines} DEFAULT_LIBC=LIBC_UCLIBC"
        extra_options="${extra_options} linux.opt"
        use_collect2=no
        ;;
@@ -908,9 +960,13 @@ moxie-*-uclinux*)
        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"
+       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 moxie/t-rtems"
+       tm_file="moxie/moxie.h dbxelf.h elfos.h moxie/rtems.h rtems.h newlib-stdint.h"
+       ;;
 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 newlib-stdint.h"
@@ -932,7 +988,7 @@ hppa*-*-linux*)
        target_cpu_default="MASK_PA_11|MASK_NO_SPACE_REGS"
        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"
+       tmake_file="${tmake_file} pa/t-linux t-slibgcc-libgcc"
        # Set the libgcc version number
        if test x$sjlj = x1; then
            tmake_file="$tmake_file pa/t-slibgcc-sjlj-ver"
@@ -1050,6 +1106,7 @@ hppa[12]*-*-hpux11*)
        else
            tmake_file="$tmake_file pa/t-slibgcc-dwarf-ver"
        fi
+       extra_parts="libgcc_stub.a"
        case x${enable_threads} in
        x | xyes | xposix )
                thread_file=posix
@@ -1070,18 +1127,23 @@ hppa[12]*-*-hpux11*)
        ;;
 i[34567]86-*-darwin*)
        need_64bit_hwint=yes
+       need_64bit_isa=yes
 
        # This is so that '.../configure && make' doesn't fail due to
        # config.guess deciding that the configuration is i386-*-darwin* and
        # 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-crtpc i386/t-crtfm"
+       tmake_file="${tmake_file} t-slibgcc-darwin i386/t-crtpc i386/t-crtfm"
+       extra_options="${extra_options} i386/darwin.opt"
+       lto_binary_reader=lto-macho
        ;;
 x86_64-*-darwin*)
        with_cpu=${with_cpu:-generic}
-       tmake_file="${tmake_file} t-darwin ${cpu_type}/t-darwin64 t-slibgcc-darwin i386/t-crtpc i386/t-crtfm"
+       tmake_file="${tmake_file} ${cpu_type}/t-darwin64 t-slibgcc-darwin i386/t-crtpc i386/t-crtfm"
        tm_file="${tm_file} ${cpu_type}/darwin64.h"
+       extra_options="${extra_options} i386/darwin.opt"
+       lto_binary_reader=lto-macho
        ;;
 i[34567]86-*-elf*)
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h newlib-stdint.h i386/i386elf.h"
@@ -1135,8 +1197,9 @@ i[34567]86-*-linux* | i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-knetbsd*-gnu | i
                        tm_defines="${tm_defines} TARGET_BI_ARCH=1"
                        tmake_file="${tmake_file} i386/t-linux64"
                        need_64bit_hwint=yes
+                       need_64bit_isa=yes
                        case X"${with_cpu}" in
-                       Xgeneric|Xatom|Xcore2|Xnocona|Xx86-64|Xamdfam10|Xbarcelona|Xk8|Xopteron|Xathlon64|Xathlon-fx)
+                       Xgeneric|Xatom|Xcore2|Xnocona|Xx86-64|Xbdver1|Xamdfam10|Xbarcelona|Xk8|Xopteron|Xathlon64|Xathlon-fx|Xathlon64-sse3|Xk8-sse3|Xopteron-sse3)
                                ;;
                        X)
                                if test x$with_cpu_64 = x; then
@@ -1145,7 +1208,7 @@ 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 nocona x86-64 amdfam10 barcelona k8 opteron athlon64 athlon-fx" 1>&2
+                               echo "generic atom core2 nocona x86-64 bdver1 amdfam10 barcelona k8 opteron athlon64 athlon-fx athlon64-sse3 k8-sse3 opteron-sse3" 1>&2
                                exit 1
                                ;;
                        esac
@@ -1220,12 +1283,31 @@ i[34567]86-*-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"
+       # 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
+       *-*-solaris2.[89]*)
+               # Solaris 8 and 9/x86 cannot execute SSE/SSE2 instructions by
+               # default.
+               with_arch_32=${with_arch_32:-pentiumpro}
+               ;;
+       *)
+               with_arch_32=${with_arch_32:-pentium4}
+               ;;
+       esac
+       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"
@@ -1250,9 +1332,10 @@ i[34567]86-*-solaris2*)
                # depends on a runtime test and is thus performed in
                # libgcc/configure.ac instead.
                need_64bit_hwint=yes
+               need_64bit_isa=yes
                use_gcc_stdint=wrap
                case X"${with_cpu}" in
-               Xgeneric|Xatom|Xcore2|Xnocona|Xx86-64|Xamdfam10|Xbarcelona|Xk8|Xopteron|Xathlon64|Xathlon-fx)
+               Xgeneric|Xatom|Xcore2|Xnocona|Xx86-64|Xbdver1|Xamdfam10|Xbarcelona|Xk8|Xopteron|Xathlon64|Xathlon-fx|Xathlon64-sse3|Xk8-sse3|Xopteron-sse3)
                        ;;
                X)
                        if test x$with_cpu_64 = x; then
@@ -1261,7 +1344,7 @@ i[34567]86-*-solaris2*)
                        ;;
                *)
                        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
+                       echo "generic atom core2 nocona x86-64 bdver1 amdfam10 barcelona k8 opteron athlon64 athlon-fx athlon64-sse3 k8-sse3 opteron-sse3" 1>&2
                        exit 1
                        ;;
                esac
@@ -1312,6 +1395,7 @@ i[34567]86-*-pe | i[34567]86-*-cygwin*)
                thread_file='posix'
        fi
        use_gcc_stdint=wrap
+       lto_binary_reader=lto-coff
        ;;
 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"
@@ -1319,6 +1403,7 @@ i[34567]86-*-mingw* | x86_64-*-mingw*)
        case ${target} in
                x86_64-*-* | *-w64-*)
                        need_64bit_hwint=yes
+                       need_64bit_isa=yes
                        ;;
                *)
                        ;;
@@ -1326,12 +1411,13 @@ i[34567]86-*-mingw* | x86_64-*-mingw*)
        # This makes the logic if mingw's or the w64 feature set has to be used
        case ${target} in
                *-w64-*)
+                       user_headers_inc_next_post="${user_headers_inc_next_post} float.h"
+                       user_headers_inc_next_pre="${user_headers_inc_next_pre} stddef.h stdarg.h"
                        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)
+                               Xgeneric|Xatom|Xcore2|Xnocona|Xx86-64|Xbdver1|Xamdfam10|Xbarcelona|Xk8|Xopteron|Xathlon64|Xathlon-fx|Xathlon64-sse3|Xk8-sse3|Xopteron-sse3)
                                        ;;
                                X)
                                        if test x$with_cpu_64 = x; then
@@ -1340,14 +1426,13 @@ i[34567]86-*-mingw* | x86_64-*-mingw*)
                                        ;;
                                *)
                                        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
+                                       echo "generic atom core2 nocona x86-64 bdver1 amdfam10 barcelona k8 opteron athlon64 athlon-fx athlon64-sse3 k8-sse3 opteron-sse3" 1>&2
                                        exit 1
                                        ;;
                                esac
                        fi
                        ;;
                *)
-                       tmake_file="${tmake_file} i386/t-mingw32"
                        ;;
        esac
        tm_file="${tm_file} i386/mingw-stdint.h"
@@ -1357,7 +1442,18 @@ 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"
+       tmake_file="${tmake_file} ${tmake_eh_file} i386/t-cygming t-dfprules"
+        case ${target} in
+               x86_64-w64-*)
+                               tmake_file="${tmake_file} i386/t-mingw-w64"
+                       ;;
+              i[34567]86-w64-*)
+                       tmake_file="${tmake_file} i386/t-mingw-w32"
+                       ;;
+               *)
+                               tmake_file="${tmake_file} i386/t-mingw32"
+                       ;;
+       esac
        target_gtfiles="\$(srcdir)/config/i386/winnt.c"
        extra_options="${extra_options} i386/cygming.opt i386/mingw.opt"
        case ${target} in
@@ -1372,6 +1468,7 @@ i[34567]86-*-mingw* | x86_64-*-mingw*)
        cxx_target_objs="${cxx_target_objs} winnt-cxx.o msformat-c.o"
        default_use_cxa_atexit=yes
        use_gcc_stdint=wrap
+       lto_binary_reader=lto-coff
        case ${enable_threads} in
          "" | yes | win32)       thread_file='win32'
          tmake_file="${tmake_file} i386/t-gthr-win32"
@@ -1469,6 +1566,19 @@ iq2000*-*-elf*)
         out_file=iq2000/iq2000.c
         md_file=iq2000/iq2000.md
         ;;
+lm32-*-elf*)
+        tm_file="dbxelf.h elfos.h ${tm_file}"
+       tmake_file="${tmake_file} lm32/t-lm32 lm32/t-fprules-softfp soft-fp/t-softfp"
+        ;;
+lm32-*-rtems*)
+       tm_file="dbxelf.h elfos.h ${tm_file} lm32/rtems.h rtems.h"
+       tmake_file="${tmake_file} lm32/t-lm32 lm32/t-fprules-softfp soft-fp/t-softfp"
+       tmake_file="${tmake_file} t-rtems"
+         ;;
+lm32-*-uclinux*)
+        tm_file="dbxelf.h elfos.h ${tm_file} linux.h lm32/uclinux-elf.h"
+       tmake_file="${tmake_file} lm32/t-lm32 lm32/t-fprules-softfp soft-fp/t-softfp"
+        ;;
 m32r-*-elf*)
        tm_file="dbxelf.h elfos.h svr4.h newlib-stdint.h ${tm_file}"
        extra_parts="crtinit.o crtfini.o"
@@ -1581,7 +1691,7 @@ m68k-*-uclinux*)          # Motorola m68k/ColdFire running uClinux
        default_m68k_cpu=68020
        default_cf_cpu=5206
        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"
+       tm_defines="${tm_defines} MOTOROLA=1 DEFAULT_LIBC=LIBC_UCLIBC"
        extra_options="${extra_options} linux.opt"
        tmake_file="m68k/t-floatlib m68k/t-uclinux m68k/t-mlibs"
        ;;
@@ -1632,24 +1742,16 @@ mep-*-*)
        fi
        use_gcc_stdint=wrap
        ;;
-mips-sgi-irix[56]*)
-       tm_file="elfos.h ${tm_file} mips/iris.h"
-       tmake_file="mips/t-iris mips/t-slibgcc-irix"
+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"
        target_cpu_default="MASK_ABICALLS"
-       case ${target} in
-       *-*-irix5*)
-               tm_file="${tm_file} mips/iris5.h"
-               ;;
-
-       *-*-irix6*)
-               tm_file="${tm_file} mips/iris6.h"
-               tmake_file="${tmake_file} mips/t-iris6"
-               tm_defines="${tm_defines} MIPS_ISA_DEFAULT=3 MIPS_ABI_DEFAULT=ABI_N32"
-               ;;
-       esac
+       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.
+       use_gcc_stdint=wrap
        if test "x$stabs" = xyes
        then
-               tm_file="${tm_file} dbx.h mips/dbxmdebug.h"
+               tm_file="${tm_file} dbx.h"
        fi
        if test "x$gnu_ld" = xyes
        then
@@ -1680,6 +1782,7 @@ mips64*-*-linux* | mipsisa64*-*-linux*)
                        tm_defines="${tm_defines} MIPS_ISA_DEFAULT=65"
                        ;;
        esac
+       extra_parts="$extra_parts crtfastmath.o"
        gnu_ld=yes
        gas=yes
        test x$with_llsc != x || with_llsc=yes
@@ -1694,6 +1797,7 @@ mips*-*-linux*)                           # Linux MIPS, either endian.
         mipsisa32*)
                tm_defines="${tm_defines} MIPS_ISA_DEFAULT=32"
         esac
+       extra_parts="$extra_parts crtfastmath.o"
        test x$with_llsc != x || with_llsc=yes
        ;;
 mips*-*-openbsd*)
@@ -1709,6 +1813,7 @@ mips*-*-openbsd*)
 mips*-sde-elf*)
        tm_file="elfos.h newlib-stdint.h ${tm_file} mips/elf.h mips/sde.h"
        tmake_file="mips/t-sde mips/t-libgcc-mips16"
+       extra_options="${extra_options} mips/sde.opt"
        case "${with_newlib}" in
          yes)
            # newlib / libgloss.
@@ -1717,7 +1822,6 @@ mips*-sde-elf*)
            # MIPS toolkit libraries.
            tm_file="$tm_file mips/sdemtk.h"
            tmake_file="$tmake_file mips/t-sdemtk"
-           extra_options="$extra_options mips/sdemtk.opt"
            case ${enable_threads} in
              "" | yes | mipssde)
                thread_file='mipssde'
@@ -1860,12 +1964,16 @@ powerpc-*-darwin*)
          *-darwin[0-6]*)
            ;;
        esac
+       tmake_file="${tmake_file} t-slibgcc-darwin"
+       lto_binary_reader=lto-macho
        extra_headers=altivec.h
        ;;
 powerpc64-*-darwin*)
-       tm_file="${tm_file} ${cpu_type}/darwin8.h ${cpu_type}/darwin64.h"
        extra_options="${extra_options} ${cpu_type}/darwin.opt"
-       # We're omitting t-darwin8 to avoid building any multilibs
+       extra_parts="crt2.o"
+       tmake_file="${tmake_file} ${cpu_type}/t-darwin64 t-slibgcc-darwin"
+       tm_file="${tm_file} ${cpu_type}/darwin8.h ${cpu_type}/darwin64.h"
+       lto_binary_reader=lto-macho
        extra_headers=altivec.h
        ;;
 powerpc*-*-freebsd*)
@@ -2260,7 +2368,7 @@ sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
        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/`'\"'
        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-`
+       sh_multilibs=`echo $sh_multilibs | sed -e 's/,/ /g' -e 's/^[Ss][Hh]/m/' -e 's/ [Ss][Hh]/ m/g' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ_ abcdefghijklmnopqrstuvwxyz-`
        for sh_multilib in ${sh_multilibs}; do
                case ${sh_multilib} in
                m1 | m2 | m2e | m3 | m3e | \
@@ -2332,75 +2440,49 @@ sparc-*-rtems*)
        tmake_file="sparc/t-elf sparc/t-crtfm t-rtems"
        extra_parts="crti.o crtn.o crtbegin.o crtend.o"
        ;;
-sparc64-*-solaris2* | sparcv9-*-solaris2*)
+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"
+       extra_options="${extra_options} sparc/little-endian.opt"
+       tmake_file="${tmake_file} sparc/t-crtfm t-rtems"
+       extra_parts="crtbegin.o crtend.o"
+       ;;
+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]*)
+           *-*-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"
-       if test x$gnu_ld = xyes; then
-               tm_file="${tm_file} sparc/sol2-gld.h sparc/sol2-gld-bi.h"
-       fi
-       if test x$gas = xyes; then
-               tm_file="${tm_file} sparc/sol2-gas.h sparc/sol2-gas-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
-       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 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
-       ;;
-sparc-*-solaris2*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h"
+       tm_file="${tm_file} sparc/sol2.h"
        case ${target} in
-       *-*-solaris2.1[0-9]*)
-               tm_file="${tm_file} sol2-10.h"
-               use_gcc_stdint=wrap
+           sparc64-*-* | sparcv9-*-*)
+               tm_file="${tm_file} sparc/sol2-64.h"
                ;;
-       *)
-               use_gcc_stdint=provide
+           *)
+               test x$with_cpu != x || with_cpu=v9
                ;;
        esac
-       tm_file="${tm_file} sparc/sol2.h"
-       if test x$gnu_ld = xyes; then
-               tm_file="${tm_file} sparc/sol2-gld.h"
-       fi
+       tm_file="${tm_file} sparc/sol2-bi.h"
        if test x$gas = xyes; then
-               tm_file="${tm_file} sparc/sol2-gas.h"
+               tm_file="${tm_file} sparc/sol2-gas.h sparc/sol2-gas-bi.h"
        fi
-       tmake_file="t-sol2 sparc/t-sol2 sparc/t-crtfm"
+       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
-       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"
+               tm_file="usegas.h ${tm_file}"
        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"
@@ -2460,6 +2542,7 @@ v850e1-*-*)
        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
@@ -2477,6 +2560,7 @@ v850e-*-*)
        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
@@ -2580,99 +2664,176 @@ case ${with_cpu} in
     ;;
 esac
 
+# Set arch and cpu from ${target} and ${target_noncanonical}.  Set cpu
+# to generic if there is no processor scheduler model for the target.
+arch=
+cpu=
+arch_without_sse2=no
+arch_without_64bit=no
+case ${target} in
+  i386-*-*)
+    arch=i386
+    cpu=i386
+    arch_without_sse2=yes
+    arch_without_64bit=yes
+    ;;
+  i486-*-*)
+    arch=i486
+    cpu=i486
+    arch_without_sse2=yes
+    arch_without_64bit=yes
+    ;;
+  i586-*-*)
+    arch_without_sse2=yes
+    arch_without_64bit=yes
+    case ${target_noncanonical} in
+      k6_2-*)
+       arch=k6-2
+       cpu=k6-2
+       ;;
+      k6_3-*)
+       arch=k6-3
+       cpu=k6-3
+       ;;
+      k6-*)
+       arch=k6
+       cpu=k6
+       ;;
+      pentium_mmx-*|winchip_c6-*|winchip2-*|c3-*)
+       arch=pentium-mmx
+       cpu=pentium-mmx
+       ;;
+      *)
+       arch=pentium
+       cpu=pentium
+       ;;
+    esac
+    ;;
+  i686-*-* | i786-*-*)
+    case ${target_noncanonical} in
+      bdver1-*)
+       arch=bdver1
+       cpu=bdver1
+       ;;
+      amdfam10-*|barcelona-*)
+       arch=amdfam10
+       cpu=amdfam10
+       ;;
+      k8_sse3-*|opteron_sse3-*|athlon64_sse3-*)
+       arch=k8-sse3
+       cpu=k8-sse3
+       ;;
+      k8-*|opteron-*|athlon64-*|athlon_fx-*)
+       arch=k8
+       cpu=k8
+       ;;
+      athlon_xp-*|athlon_mp-*|athlon_4-*)
+       arch=athlon-4
+       cpu=athlon-4
+       arch_without_sse2=yes
+       arch_without_64bit=yes
+       ;;
+      athlon_tbird-*|athlon-*)
+       arch=athlon
+       cpu=athlon
+       arch_without_sse2=yes
+       ;;
+      geode-*)
+       arch=geode
+       cpu=geode
+       arch_without_sse2=yes
+       ;;
+      pentium2-*)
+       arch=pentium2
+       cpu=pentium2
+       arch_without_sse2=yes
+       ;;
+      pentium3-*|pentium3m-*)
+       arch=pentium3
+       cpu=pentium3
+       arch_without_sse2=yes
+       ;;
+      pentium4-*|pentium4m-*)
+       arch=pentium4
+       cpu=pentium4
+       ;;
+      prescott-*)
+       arch=prescott
+       cpu=prescott
+       ;;
+      nocona-*)
+       arch=nocona
+       cpu=nocona
+       ;;
+      atom-*)
+       arch=atom
+       cpu=atom
+       ;;
+      core2-*)
+       arch=core2
+       cpu=core2
+       ;;
+      pentium_m-*)
+       arch=pentium-m
+       cpu=pentium-m
+       ;;
+      pentiumpro-*)
+       arch=pentiumpro
+       cpu=pentiumpro
+       arch_without_sse2=yes
+       ;;
+      *)
+       arch=pentiumpro
+       cpu=generic
+       arch_without_sse2=yes
+       arch_without_64bit=yes
+       ;;
+    esac
+    ;;
+  x86_64-*-*)
+    case ${target_noncanonical} in
+      bdver1-*)
+       arch=bdver1
+       cpu=bdver1
+       ;;
+      amdfam10-*|barcelona-*)
+       arch=amdfam10
+       cpu=amdfam10
+       ;;
+      k8_sse3-*|opteron_sse3-*|athlon64_sse3-*)
+       arch=k8-sse3
+       cpu=k8-sse3
+       ;;
+      k8-*|opteron-*|athlon_64-*)
+       arch=k8
+       cpu=k8
+       ;;
+      nocona-*)
+       arch=nocona
+       cpu=nocona
+       ;;
+      atom-*)
+       arch=atom
+       cpu=atom
+       ;;
+      core2-*)
+       arch=core2
+       cpu=core2
+       ;;
+      *)
+       arch=x86-64
+       cpu=generic
+       ;;
+    esac
+    ;;
+esac
+
 # If there is no $with_cpu option, try to infer one from ${target}.
 # This block sets nothing except for with_cpu.
 if test x$with_cpu = x ; then
   case ${target} in
-    i386-*-*)
-      with_cpu=i386
-      ;;
-    i486-*-*)
-      with_cpu=i486
-      ;;
-    i586-*-*)
-      case ${target_noncanonical} in
-        k6_2-*)
-          with_cpu=k6-2
-          ;;
-        k6_3-*)
-          with_cpu=k6-3
-          ;;
-        k6-*)
-          with_cpu=k6
-          ;;
-        pentium_mmx-*|winchip_c6-*|winchip2-*|c3-*)
-          with_cpu=pentium-mmx
-          ;;
-        *)
-          with_cpu=pentium
-          ;;
-      esac
-      ;;
-    i686-*-* | i786-*-*)
-      case ${target_noncanonical} in
-        amdfam10-*|barcelona-*)
-          with_cpu=amdfam10
-          ;;
-        k8-*|opteron-*|athlon_64-*)
-          with_cpu=k8
-          ;;
-        athlon_xp-*|athlon_mp-*|athlon_4-*)
-          with_cpu=athlon-4
-          ;;
-        athlon_tbird-*|athlon-*)
-          with_cpu=athlon
-          ;;
-       geode-*)
-         with_cpu=geode
-         ;;
-        pentium2-*)
-          with_cpu=pentium2
-          ;;
-        pentium3-*|pentium3m-*)
-          with_cpu=pentium3
-          ;;
-        pentium4-*|pentium4m-*)
-          with_cpu=pentium4
-          ;;
-        prescott-*)
-          with_cpu=prescott
-          ;;
-        nocona-*)
-          with_cpu=nocona
-          ;;
-       core2-*)
-         with_cpu=core2
-         ;;
-        pentium_m-*)
-          with_cpu=pentium-m
-          ;;
-        pentiumpro-*)
-          with_cpu=pentiumpro
-          ;;
-        *)
-          with_cpu=generic
-          ;;
-      esac
-      ;;
-    x86_64-*-*)
-      case ${target_noncanonical} in
-        amdfam10-*|barcelona-*)
-          with_cpu=amdfam10
-          ;;
-        k8-*|opteron-*|athlon_64-*)
-          with_cpu=k8
-          ;;
-        nocona-*)
-          with_cpu=nocona
-          ;;
-       core2-*)
-         with_cpu=core2
-         ;;
-        *)
-          with_cpu=generic
-          ;;
-      esac
+    i[34567]86-*-*|x86_64-*-*)
+      with_cpu=$cpu
       ;;
     alphaev6[78]*-*-*)
       with_cpu=ev67
@@ -2716,21 +2877,103 @@ if test x$with_cpu = x ; then
   # 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
+      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
       ;;
   esac
 fi
 
+# Support for --with-arch and related options (and a few unrelated options,
+# too).
+case ${with_arch} in
+  yes | no)
+    echo "--with-arch must be passed a value" 1>&2
+    exit 1
+    ;;
+esac
+
+# If there is no $with_arch option, try to infer one from ${target}.
+# This block sets nothing except for with_arch.
+if test x$with_arch = x ; then
+  case ${target} in
+    i[34567]86-*-darwin*|x86_64-*-darwin*)
+      # Default arch is set via TARGET_SUBTARGET32_ISA_DEFAULT
+      # and TARGET_SUBTARGET64_ISA_DEFAULT in config/i386/darwin.h.
+      ;;
+    i[34567]86-*-*)
+      # --with-fpmath sets the default ISA to SSE2, which is the same
+      # ISA supported by Pentium 4.
+      if test x$with_fpmath = x || test $arch_without_sse2 = no; then
+       with_arch=$arch
+      else
+       with_arch=pentium4
+      fi
+      ;;
+    x86_64-*-*)
+      with_arch=$arch
+      ;;
+  esac
+
+  # Avoid overriding --with-arch-32 and --with-arch-64 values.
+  case ${target} in
+    i[34567]86-*-darwin*|x86_64-*-darwin*)
+      # Default arch is set via TARGET_SUBTARGET32_ISA_DEFAULT
+      # and TARGET_SUBTARGET64_ISA_DEFAULT in config/i386/darwin.h.
+      ;;
+    i[34567]86-*-*|x86_64-*-*)
+      if test x$with_arch_32 != x || test x$with_arch_64 != x; then
+       if test x$with_arch_32 = x; then
+         with_arch_32=$with_arch
+       fi
+       if test x$with_arch_64 = x; then
+         if test $arch_without_64bit = yes; then
+           # Set the default 64bit arch to x86-64 if the default arch
+           # doesn't support 64bit.
+           with_arch_64=x86-64
+         else
+           with_arch_64=$with_arch
+         fi
+       fi
+       with_arch=
+      elif test $arch_without_64bit$need_64bit_isa = yesyes; then
+       # Set the default 64bit arch to x86-64 if the default arch
+       # doesn't support 64bit and we need 64bit ISA.
+       with_arch_32=$with_arch
+       with_arch_64=x86-64
+       with_arch=
+      fi
+      ;;
+  esac
+fi
+
+# Support --with-fpmath.
+if test x$with_fpmath != x; then
+  case ${target} in
+    i[34567]86-*-* | x86_64-*-*)
+      case ${with_fpmath} in
+      sse)
+       tm_file="${tm_file} i386/ssemath.h"
+       ;;
+      *)
+       echo "Invalid --with-fpmath=$with_fpmath" 1>&2
+       exit 1
+       ;;
+      esac
+      ;;
+    *)
+      echo "--with-fpmath isn't supported for $target." 1>&2
+      exit 1
+      ;;
+  esac
+fi
+
 # Similarly for --with-schedule.
 if test x$with_schedule = x; then
        case ${target} in
@@ -2817,7 +3060,10 @@ case "${target}" in
 
                case "$with_fpu" in
                "" \
-               | fpa | fpe2 | fpe3 | maverick | vfp | vfp3 | neon )
+               | fpa | fpe2 | fpe3 | maverick | vfp | vfp3 | vfpv3 \
+               | vfpv3-fp16 | vfpv3-d16 | vfpv3-d16-fp16 | vfpv3xd \
+               | vfpv3xd-fp16 | neon | neon-fp16 | vfpv4 | vfpv4-d16 \
+               | fpv4-sp-d16 | neon-vfpv4)
                        # OK
                        ;;
                *)
@@ -2954,7 +3200,10 @@ case "${target}" in
                                esac
                                # OK
                                ;;
-                       "" | amdfam10 | barcelona | k8 | opteron | athlon64 | athlon-fx | nocona | core2 | atom | generic)
+                       "" | x86-64 | generic | native \
+                       | k8 | k8-sse3 | athlon64 | athlon64-sse3 | opteron \
+                       | opteron-sse3 | athlon-fx | bdver1 | amdfam10 \
+                       | barcelona | nocona | core2 | atom)
                                # OK
                                ;;
                        *)
@@ -3072,7 +3321,7 @@ case "${target}" in
                        | 401 | 403 | 405 | 405fp | 440 | 440fp | 464 | 464fp \
                        | 476 | 476fp | 505 | 601 | 602 | 603 | 603e | ec603e \
                        | 604 | 604e | 620 | 630 | 740 | 750 | 7400 | 7450 \
-                       | a2 | e300c[23] | 854[08] | e500mc \
+                       | a2 | e300c[23] | 854[08] | e500mc | e500mc64 | titan\
                        | 801 | 821 | 823 | 860 | 970 | G3 | G4 | G5 | cell)
                                # OK
                                ;;
@@ -3228,12 +3477,20 @@ case ${target} in
        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)
+       i[34567]86-*-linux* | x86_64-*-linux* | \
+         i[34567]86-*-kfreebsd*-gnu | x86_64-*-kfreebsd*-gnu | \
+         i[34567]86-*-gnu*)
                tmake_file="${tmake_file} i386/t-fprules-softfp soft-fp/t-softfp i386/t-linux"
                ;;
+       i[34567]86-*-solaris2*)
+               tmake_file="${tmake_file} i386/t-fprules-softfp soft-fp/t-softfp"
+               ;;
        i[34567]86-*-cygwin* | i[34567]86-*-mingw* | x86_64-*-mingw*)
                tmake_file="${tmake_file} i386/t-fprules-softfp soft-fp/t-softfp"
                ;;
+       i[34567]86-*-freebsd* | x86_64-*-freebsd*)
+               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"
                ;;