OSDN Git Service

* zh_CN.po: Update.
[pf3gnuchains/gcc-fork.git] / gcc / config.gcc
index c13baad..59fa4d7 100644 (file)
@@ -266,6 +266,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
        ;;
@@ -274,6 +279,8 @@ crisv32-*)
        ;;
 frv*)  cpu_type=frv
        ;;
+moxie*)        cpu_type=moxie
+       ;;
 fido-*-*)
        cpu_type=m68k
        extra_headers=math-68881.h
@@ -284,9 +291,10 @@ i[34567]86-*-*)
        cxx_target_objs="i386-c.o"
        extra_headers="cpuid.h mmintrin.h mm3dnow.h xmmintrin.h emmintrin.h
                       pmmintrin.h tmmintrin.h ammintrin.h smmintrin.h
-                      nmmintrin.h bmmintrin.h mmintrin-common.h
-                      wmmintrin.h immintrin.h x86intrin.h avxintrin.h 
-                      cross-stdarg.h"
+                      nmmintrin.h bmmintrin.h fma4intrin.h wmmintrin.h
+                      immintrin.h x86intrin.h avxintrin.h xopintrin.h
+                      ia32intrin.h cross-stdarg.h lwpintrin.h popcntintrin.h
+                      abmintrin.h"
        ;;
 x86_64-*-*)
        cpu_type=i386
@@ -294,9 +302,10 @@ x86_64-*-*)
        cxx_target_objs="i386-c.o"
        extra_headers="cpuid.h mmintrin.h mm3dnow.h xmmintrin.h emmintrin.h
                       pmmintrin.h tmmintrin.h ammintrin.h smmintrin.h
-                      nmmintrin.h bmmintrin.h mmintrin-common.h
-                      wmmintrin.h immintrin.h x86intrin.h avxintrin.h 
-                      cross-stdarg.h"
+                      nmmintrin.h bmmintrin.h fma4intrin.h wmmintrin.h
+                      immintrin.h x86intrin.h avxintrin.h xopintrin.h
+                      ia32intrin.h cross-stdarg.h lwpintrin.h popcntintrin.h
+                      abmintrin.h"
        need_64bit_hwint=yes
        ;;
 ia64-*-*)
@@ -325,7 +334,7 @@ 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)
+           xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[34567]|xpower6x|xrs64a|xcell|xa2|xe500mc64)
                cpu_is_64bit=yes
                ;;
        esac
@@ -375,12 +384,14 @@ i[34567]86-*-*)
        if test "x$enable_cld" = xyes; then
                tm_defines="${tm_defines} USE_IX86_CLD=1"
        fi
+       tm_file="vxworks-dummy.h ${tm_file}"
        ;;
 x86_64-*-*)
        tm_file="i386/biarch64.h ${tm_file}"
        if test "x$enable_cld" = xyes; then
                tm_defines="${tm_defines} USE_IX86_CLD=1"
        fi
+       tm_file="vxworks-dummy.h ${tm_file}"
        ;;
 esac
 
@@ -396,9 +407,12 @@ case ${target} in
 *-*-darwin*)
   tm_file="${tm_file} darwin.h"
   case ${target} in
-  *-*-darwin[912]*)
+  *-*-darwin9*)
     tm_file="${tm_file} darwin9.h"
     ;;
+  *-*-darwin[12][0-9]*)
+    tm_file="${tm_file} darwin9.h darwin10.h"
+    ;;
   esac
   tm_file="${tm_file} ${cpu_type}/darwin.h"
   tm_p_file="${tm_p_file} darwin-protos.h"
@@ -411,6 +425,7 @@ case ${target} in
   extra_objs="darwin.o"
   extra_gcc_objs="darwin-driver.o"
   default_use_cxa_atexit=yes
+  use_gcc_stdint=wrap
   case ${enable_threads} in
     "" | yes | posix) thread_file='posix' ;;
   esac
@@ -466,7 +481,15 @@ case ${target} in
       exit 1
       ;;
   esac
-  fbsd_tm_file="${fbsd_tm_file} freebsd-spec.h freebsd.h"
+  fbsd_tm_file="${fbsd_tm_file} freebsd-spec.h freebsd.h freebsd-stdint.h"
+  case ${target} in
+    *-*-freebsd[345].*)
+      :;;
+    *)
+      default_use_cxa_atexit=yes;;
+  esac
+  # need_64bit_hwint=yes # system compiler has this for all arch!
+  use_gcc_stdint=wrap
   ;;
 *-*-linux* | frv-*-*linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu | *-*-gnu* | *-*-kopensolaris*-gnu)
   extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
@@ -616,11 +639,11 @@ alpha*-*-netbsd*)
        tmake_file="${tmake_file} alpha/t-alpha alpha/t-ieee"
        ;;
 alpha*-*-openbsd*)
-       tm_defines="${tm_defines} OBSD_NO_DYNAMIC_LIBRARIES OBSD_HAS_DECLARE_FUNCTION_NAME OBSD_HAS_DECLARE_FUNCTION_SIZE OBSD_HAS_DECLARE_OBJECT"
-       tm_file="alpha/alpha.h openbsd.h alpha/openbsd.h"
+       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"
        # default x-alpha is only appropriate for dec-osf.
        target_cpu_default="MASK_GAS"
-       tmake_file="alpha/t-alpha alpha/t-ieee"
+       tmake_file="${tmake_file} alpha/t-alpha alpha/t-ieee"
        ;;
 alpha*-dec-osf[45]*)
        if test x$stabs = xyes
@@ -635,6 +658,7 @@ alpha*-dec-osf[45]*)
        tmake_file="alpha/t-alpha alpha/t-ieee alpha/t-crtfm alpha/t-osf4"
        tm_file="${tm_file} alpha/osf.h"
        extra_headers=va_list.h
+       use_gcc_stdint=provide
        case ${target} in
          *-*-osf4*)
            # Define TARGET_SUPPORT_ARCH except on 4.0a.
@@ -657,17 +681,21 @@ alpha*-dec-osf[45]*)
        ;;
 alpha64-dec-*vms*)
        tm_file="${tm_file} alpha/vms.h alpha/vms64.h"
-       xm_file="alpha/xm-vms.h"
-       tmake_file="alpha/t-alpha alpha/t-vms alpha/t-vms64 alpha/t-ieee"
-       prefix=/gnu
-       local_prefix=/gnu
+       xm_file="alpha/xm-vms.h vms/xm-vms64.h"
+       tmake_file="alpha/t-alpha vms/t-vms vms/t-vms64 alpha/t-vms alpha/t-ieee"
+       xmake_file=vms/x-vms
+       exeext=.exe
+       install_headers_dir=install-headers-cp
+       extra_options="${extra_options} vms/vms.opt"
        ;;
 alpha*-dec-*vms*)
        tm_file="${tm_file} alpha/vms.h"
-       xm_file=alpha/xm-vms.h
-       tmake_file="alpha/t-alpha alpha/t-vms alpha/t-ieee"
-       prefix=/gnu
-       local_prefix=/gnu
+       xm_file="alpha/xm-vms.h"
+       tmake_file="alpha/t-alpha vms/t-vms alpha/t-vms alpha/t-ieee"
+       xmake_file=vms/x-vms
+       exeext=.exe
+       install_headers_dir=install-headers-cp
+       extra_options="${extra_options} vms/vms.opt"
        ;;
 arc-*-elf*)
        tm_file="dbxelf.h elfos.h svr4.h newlib-stdint.h ${tm_file}"
@@ -702,7 +730,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"
-           tmake_file="$tmake_file arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi"
+           tmake_file="$tmake_file arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi t-slibgcc-libgcc"
            # The BPABI long long divmod functions return a 128-bit value in
            # registers r0-r3.  Correctly modeling that requires the use of
            # TImode.
@@ -790,10 +818,14 @@ arm-*-pe*)
 avr-*-rtems*)
        tm_file="avr/avr.h dbxelf.h avr/rtems.h rtems.h newlib-stdint.h"
        tmake_file="avr/t-avr t-rtems avr/t-rtems"
+       extra_gcc_objs="driver-avr.o avr-devices.o"
+       extra_objs="avr-devices.o"
        ;;
 avr-*-*)
        tm_file="avr/avr.h dbxelf.h newlib-stdint.h"
        use_gcc_stdint=wrap
+       extra_gcc_objs="driver-avr.o avr-devices.o"
+       extra_objs="avr-devices.o"
        ;;
 bfin*-elf*)
        tm_file="${tm_file} dbxelf.h elfos.h newlib-stdint.h bfin/elf.h"
@@ -871,6 +903,22 @@ frv-*-*linux*)
                 linux.h glibc-stdint.h frv/linux.h frv/frv-abi.h"
        tmake_file="${tmake_file} frv/t-frv frv/t-linux"
        ;;
+moxie-*-elf)
+       gas=yes
+       gnu_ld=yes
+       tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
+       extra_parts="crti.o crtn.o crtbegin.o crtend.o"
+       tmake_file="${tmake_file} moxie/t-moxie moxie/t-moxie-softfp soft-fp/t-softfp"
+       ;;
+moxie-*-uclinux*)
+       gas=yes
+       gnu_ld=yes
+       tm_file="dbxelf.h elfos.h svr4.h ${tm_file} linux.h glibc-stdint.h moxie/uclinux.h"
+       extra_parts="crti.o crtn.o crtbegin.o crtend.o"
+       tmake_file="${tmake_file} moxie/t-moxie moxie/t-moxie-softfp soft-fp/t-softfp"
+       tm_defines="${tm_defines} UCLIBC_DEFAULT=1"
+       extra_options="${extra_options} linux.opt"
+       ;;
 h8300-*-rtems*)
        tmake_file="h8300/t-h8300 h8300/t-elf t-rtems h8300/t-rtems"
        tm_file="h8300/h8300.h dbxelf.h elfos.h h8300/elf.h h8300/rtems.h rtems.h newlib-stdint.h"
@@ -892,7 +940,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"
@@ -919,6 +967,8 @@ hppa[12]*-*-hpux10*)
                extra_options="${extra_options} pa/pa-hpux1010.opt"
                ;;
        esac
+       use_gcc_stdint=provide
+       tm_file="${tm_file} hpux-stdint.h"
        tmake_file="pa/t-pa-hpux10 pa/t-pa-hpux pa/t-hpux-shlib"
        case ${enable_threads} in
          "")
@@ -975,6 +1025,16 @@ hppa*64*-*-hpux11*)
                ;;
        esac
        gas=yes
+       case ${target} in
+         *-*-hpux11.[01]*)
+               use_gcc_stdint=provide
+               tm_file="${tm_file} hpux-stdint.h"
+               ;;
+         *-*-hpux11.[23]*)
+               use_gcc_stdint=wrap
+               tm_file="${tm_file} hpux-stdint.h"
+               ;;
+       esac
        ;;
 hppa[12]*-*-hpux11*)
        case ${target} in
@@ -1005,6 +1065,16 @@ hppa[12]*-*-hpux11*)
        esac
        use_collect2=yes
        gas=yes
+       case ${target} in
+         *-*-hpux11.[01]*)
+               use_gcc_stdint=provide
+               tm_file="${tm_file} hpux-stdint.h"
+               ;;
+         *-*-hpux11.[23]*)
+               use_gcc_stdint=wrap
+               tm_file="${tm_file} hpux-stdint.h"
+               ;;
+       esac
        ;;
 i[34567]86-*-darwin*)
        need_64bit_hwint=yes
@@ -1058,7 +1128,7 @@ 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 i386/openbsdelf.h"
+       tm_file="${tm_file} openbsd.h openbsd-stdint.h openbsd-libpthread.h i386/openbsdelf.h"
        gas=yes
        gnu_ld=yes
        ;;
@@ -1074,7 +1144,7 @@ i[34567]86-*-linux* | i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-knetbsd*-gnu | i
                        tmake_file="${tmake_file} i386/t-linux64"
                        need_64bit_hwint=yes
                        case X"${with_cpu}" in
-                       Xgeneric|Xcore2|Xnocona|Xx86-64|Xamdfam10|Xbarcelona|Xk8|Xopteron|Xathlon64|Xathlon-fx)
+                       Xgeneric|Xatom|Xcore2|Xnocona|Xx86-64|Xamdfam10|Xbarcelona|Xk8|Xopteron|Xathlon64|Xathlon-fx)
                                ;;
                        X)
                                if test x$with_cpu_64 = x; then
@@ -1083,7 +1153,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 core2 nocona x86-64 amdfam10 barcelona k8 opteron athlon64 athlon-fx" 1>&2
+                               echo "generic atom core2 nocona x86-64 amdfam10 barcelona k8 opteron athlon64 athlon-fx" 1>&2
                                exit 1
                                ;;
                        esac
@@ -1114,6 +1184,7 @@ i[34567]86-pc-msdosdjgpp*)
        extra_options="${extra_options} i386/djgpp.opt"
        gnu_ld=yes
        gas=yes
+       use_gcc_stdint=wrap
        ;;
 i[34567]86-*-lynxos*)
        xm_defines=POSIX
@@ -1189,7 +1260,7 @@ i[34567]86-*-solaris2*)
                need_64bit_hwint=yes
                use_gcc_stdint=wrap
                case X"${with_cpu}" in
-               Xgeneric|Xcore2|Xnocona|Xx86-64|Xamdfam10|Xbarcelona|Xk8|Xopteron|Xathlon64|Xathlon-fx)
+               Xgeneric|Xatom|Xcore2|Xnocona|Xx86-64|Xamdfam10|Xbarcelona|Xk8|Xopteron|Xathlon64|Xathlon-fx)
                        ;;
                X)
                        if test x$with_cpu_64 = x; then
@@ -1198,7 +1269,7 @@ i[34567]86-*-solaris2*)
                        ;;
                *)
                        echo "Unsupported CPU used in --with-cpu=$with_cpu, supported values:" 1>&2
-                       echo "generic core2 nocona x86-64 amdfam10 barcelona k8 opteron athlon64 athlon-fx" 1>&2
+                       echo "generic atom core2 nocona x86-64 amdfam10 barcelona k8 opteron athlon64 athlon-fx" 1>&2
                        exit 1
                        ;;
                esac
@@ -1253,22 +1324,64 @@ i[34567]86-*-pe | i[34567]86-*-cygwin*)
 i[34567]86-*-mingw* | x86_64-*-mingw*)
        tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/cygming.h i386/mingw32.h"
        xm_file=i386/xm-mingw32.h
+       case ${target} in
+               x86_64-*-* | *-w64-*)
+                       need_64bit_hwint=yes
+                       ;;
+               *)
+                       ;;
+       esac
+       # This makes the logic if mingw's or the w64 feature set has to be used
+       case ${target} in
+               *-w64-*)
+                       tm_file="${tm_file} i386/mingw-w64.h"
+                       tmake_file="${tmake_file} i386/t-mingw-w64"
+                       if test x$enable_targets = xall; then
+                               tm_defines="${tm_defines} TARGET_BI_ARCH=1"
+                               case X"${with_cpu}" in
+                               Xgeneric|Xatom|Xcore2|Xnocona|Xx86-64|Xamdfam10|Xbarcelona|Xk8|Xopteron|Xathlon64|Xathlon-fx)
+                                       ;;
+                               X)
+                                       if test x$with_cpu_64 = x; then
+                                               with_cpu_64=generic
+                                       fi
+                                       ;;
+                               *)
+                                       echo "Unsupported CPU used in --with-cpu=$with_cpu, supported values:" 1>&2
+                                       echo "generic atom core2 nocona x86-64 amdfam10 barcelona k8 opteron athlon64 athlon-fx" 1>&2
+                                       exit 1
+                                       ;;
+                               esac
+                       fi
+                       ;;
+               *)
+                       tmake_file="${tmake_file} i386/t-mingw32"
+                       ;;
+       esac
+       tm_file="${tm_file} i386/mingw-stdint.h"
        # This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h
        if test x$sjlj = x0; then
                tmake_eh_file="i386/t-dw2-eh"
        else
                tmake_eh_file="i386/t-sjlj-eh"
        fi
-       tmake_file="${tmake_file} ${tmake_eh_file} i386/t-cygming i386/t-mingw32"
+       tmake_file="${tmake_file} ${tmake_eh_file} i386/t-cygming"
        target_gtfiles="\$(srcdir)/config/i386/winnt.c"
        extra_options="${extra_options} i386/cygming.opt i386/mingw.opt"
+       case ${target} in
+               *-w64-*)
+                       extra_options="${extra_options} i386/mingw-w64.opt"
+                       ;;
+               *)
+                       ;;
+       esac
        extra_objs="winnt.o winnt-stubs.o"
        c_target_objs="${c_target_objs} msformat-c.o"
        cxx_target_objs="${cxx_target_objs} winnt-cxx.o msformat-c.o"
        default_use_cxa_atexit=yes
+       use_gcc_stdint=wrap
        case ${enable_threads} in
-         "" | yes | win32)
-         thread_file='win32'
+         "" | yes | win32)       thread_file='win32'
          tmake_file="${tmake_file} i386/t-gthr-win32"
          ;;
        esac
@@ -1341,6 +1454,22 @@ ia64*-*-hpux*)
        c_target_objs="ia64-c.o"
        cxx_target_objs="ia64-c.o"
        extra_options="${extra_options} ia64/ilp32.opt"
+       use_gcc_stdint=wrap
+       tm_file="${tm_file} hpux-stdint.h"
+       ;;
+ia64-hp-*vms*)
+       tm_file="${tm_file} elfos.h ia64/sysv4.h ia64/elf.h ia64/vms.h ia64/vms64.h"
+       xm_file="vms/xm-vms.h vms/xm-vms64.h"
+       tmake_file="vms/t-vms vms/t-vms64 ia64/t-ia64 ia64/t-vms"
+       xmake_file=vms/x-vms
+       target_cpu_default="0"
+       if test x$gas = xyes
+       then
+               target_cpu_default="${target_cpu_default}|MASK_GNU_AS"
+       fi
+       exeext=.exe
+       install_headers_dir=install-headers-cp
+       extra_options="${extra_options} vms/vms.opt"
        ;;
 iq2000*-*-elf*)
         tm_file="svr4.h elfos.h newlib-stdint.h iq2000/iq2000.h"
@@ -1348,6 +1477,14 @@ 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-fprules-softfp soft-fp/t-softfp"
+        ;;
+lm32-*-uclinux*)
+        tm_file="dbxelf.h elfos.h ${tm_file} linux.h lm32/uclinux-elf.h"
+       tmake_file="${tmake_file} 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"
@@ -1440,7 +1577,7 @@ m68k*-*-openbsd*)
        default_cf_cpu=5475
        # needed to unconfuse gdb
        tm_defines="${tm_defines} OBSD_OLD_GAS"
-       tm_file="${tm_file} openbsd.h m68k/openbsd.h"
+       tm_file="${tm_file} openbsd.h openbsd-stdint.h openbsd-libpthread.h m68k/openbsd.h"
        tmake_file="t-libc-ok t-openbsd m68k/t-openbsd"
        # we need collect2 until our bug is fixed...
        use_collect2=yes
@@ -1499,6 +1636,18 @@ mcore-*-pe*)
        inhibit_libc=true
        use_gcc_stdint=wrap
        ;;
+mep-*-*)
+       tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
+       tmake_file=mep/t-mep
+       extra_parts="crtbegin.o crtend.o"
+       c_target_objs="mep-pragma.o"
+       cxx_target_objs="mep-pragma.o"
+       if test -d "${srcdir}/../newlib/libc/include" &&
+          test "x$with_headers" = x; then
+               with_headers=yes
+       fi
+       use_gcc_stdint=wrap
+       ;;
 mips-sgi-irix[56]*)
        tm_file="elfos.h ${tm_file} mips/iris.h"
        tmake_file="mips/t-iris mips/t-slibgcc-irix"
@@ -1566,7 +1715,7 @@ mips*-*-linux*)                           # Linux MIPS, either endian.
 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 mips/openbsd.h mips/sdb.h"
+       tm_file="mips/mips.h openbsd.h openbsd-stdint.h openbsd-libpthread.h mips/openbsd.h mips/sdb.h"
        case ${target} in
        mips*el-*-openbsd*)
            tm_defines="${tm_defines} TARGET_ENDIAN_DEFAULT=0";;
@@ -1666,6 +1815,7 @@ mips64-*-elf* | mips64el-*-elf*)
 mips64vr-*-elf* | mips64vrel-*-elf*)
         tm_file="elfos.h newlib-stdint.h ${tm_file} mips/vr.h mips/elf.h"
         tmake_file=mips/t-vr
+       tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_EABI"
         ;;
 mips64orion-*-elf* | mips64orionel-*-elf*)
        tm_file="elfos.h newlib-stdint.h ${tm_file} mips/elforion.h mips/elf.h"
@@ -1712,22 +1862,6 @@ picochip-*)
 #      tmake_file="${tmake_file} rs6000/t-fprules rs6000/t-fprules-fpbit "
 #      extra_headers=
 #      ;;
-powerpc64-*-linux*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"
-       test x$with_cpu != x || cpu_is_64bit=yes
-       test x$cpu_is_64bit != xyes || tm_file="${tm_file} rs6000/default64.h"
-       tm_file="rs6000/biarch64.h ${tm_file} rs6000/linux64.h glibc-stdint.h"
-       if test x${enable_secureplt} = xyes; then
-               tm_file="rs6000/secureplt.h ${tm_file}"
-       fi
-       extra_options="${extra_options} rs6000/sysv4.opt rs6000/linux64.opt"
-       tmake_file="t-dfprules rs6000/t-fprules ${tmake_file} rs6000/t-ppccomm rs6000/t-linux64 rs6000/t-fprules-softfp soft-fp/t-softfp"
-       ;;
-powerpc64-*-gnu*)
-       tm_file="${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-gnu"
-       ;;
 powerpc-*-darwin*)
        extra_options="${extra_options} rs6000/darwin.opt"
        extra_parts="crt2.o"
@@ -1790,9 +1924,9 @@ powerpc-*-eabialtivec*)
        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"
+       tm_file="${tm_file} dbxelf.h elfos.h usegas.h svr4.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/eabi.h rs6000/singlefp.h rs6000/xfpu.h rs6000/xilinx.h"
        extra_options="${extra_options} rs6000/sysv4.opt"
-       tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
+       tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm rs6000/t-xilinx"
        use_gcc_stdint=wrap
        ;;
 powerpc-*-eabi*)
@@ -1806,17 +1940,26 @@ powerpc-*-rtems*)
        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*)
+powerpc-*-linux* | powerpc64-*-linux*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"
        extra_options="${extra_options} rs6000/sysv4.opt"
-       tmake_file="t-dfprules rs6000/t-fprules rs6000/t-fprules-softfp soft-fp/t-softfp rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
+       tmake_file="t-dfprules rs6000/t-fprules rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
        maybe_biarch=yes
        case ${target} in
+           powerpc64-*-linux*spe* | powerpc64-*-linux*paired*)
+               echo "*** Configuration ${target} not supported" 1>&2
+               exit 1
+               ;;
            powerpc-*-linux*spe* | powerpc-*-linux*paired*)
-               maybe_biarch= ;;
+               maybe_biarch=
+               ;;
+           powerpc64-*-linux*)
+               test x$with_cpu != x || cpu_is_64bit=yes
+               maybe_biarch=always
+               ;;
        esac
        case ${maybe_biarch}:${enable_targets}:${cpu_is_64bit} in
-           yes:*powerpc64* | yes:all:* | yes:*:yes)
+           always:* | yes:*powerpc64* | yes:all:* | yes:*:yes)
                if test x$cpu_is_64bit = xyes; then
                    tm_file="${tm_file} rs6000/default64.h"
                fi
@@ -1828,6 +1971,7 @@ powerpc-*-linux*)
                tm_file="${tm_file} rs6000/linux.h glibc-stdint.h"
                ;;
        esac
+       tmake_file="${tmake_file} t-slibgcc-libgcc rs6000/t-fprules-softfp soft-fp/t-softfp"
        case ${target} in
            powerpc*-*-linux*altivec*)
                tm_file="${tm_file} rs6000/linuxaltivec.h" ;;
@@ -1840,17 +1984,22 @@ powerpc-*-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-gnu rs6000/t-ppccomm"
+       tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcos t-slibgcc-elf-ver t-slibgcc-libgcc t-gnu rs6000/t-ppccomm"
        if test x$enable_threads = xyes; then
                thread_file='posix'
        fi
        ;;
 powerpc-*-gnu*)
        tm_file="${cpu_type}/${cpu_type}.h elfos.h svr4.h freebsd-spec.h gnu.h rs6000/sysv4.h rs6000/linux.h rs6000/gnu.h glibc-stdint.h"
-       tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcos t-slibgcc-elf-ver t-gnu rs6000/t-ppccomm"
+       tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcos t-slibgcc-elf-ver t-slibgcc-libgcc t-gnu rs6000/t-ppccomm"
        extra_options="${extra_options} rs6000/sysv4.opt"
        if test x$enable_threads = xyes; then
                thread_file='posix'
@@ -1899,55 +2048,57 @@ powerpcle-*-eabi*)
        extra_options="${extra_options} rs6000/sysv4.opt"
        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"
-       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
-       ;;
 rs6000-ibm-aix4.[3456789]* | powerpc-ibm-aix4.[3456789]*)
-       tm_file="rs6000/biarch64.h ${tm_file} rs6000/aix.h rs6000/aix43.h rs6000/xcoff.h"
+       tm_file="rs6000/biarch64.h ${tm_file} rs6000/aix.h rs6000/aix43.h rs6000/xcoff.h rs6000/aix-stdint.h"
        tmake_file=rs6000/t-aix43
        extra_options="${extra_options} rs6000/aix64.opt"
        use_collect2=yes
        thread_file='aix'
+       use_gcc_stdint=provide
        extra_headers=
        ;;
 rs6000-ibm-aix5.1.* | powerpc-ibm-aix5.1.*)
-       tm_file="rs6000/biarch64.h ${tm_file} rs6000/aix.h rs6000/aix51.h rs6000/xcoff.h"
+       tm_file="rs6000/biarch64.h ${tm_file} rs6000/aix.h rs6000/aix51.h rs6000/xcoff.h rs6000/aix-stdint.h"
        extra_options="${extra_options} rs6000/aix64.opt"
        tmake_file=rs6000/t-aix43
        use_collect2=yes
        thread_file='aix'
+       use_gcc_stdint=wrap
        extra_headers=
        ;;
 rs6000-ibm-aix5.2.* | powerpc-ibm-aix5.2.*)
-       tm_file="${tm_file} rs6000/aix.h rs6000/aix52.h rs6000/xcoff.h"
+       tm_file="${tm_file} rs6000/aix.h rs6000/aix52.h rs6000/xcoff.h rs6000/aix-stdint.h"
        tmake_file=rs6000/t-aix52
        extra_options="${extra_options} rs6000/aix64.opt"
        use_collect2=yes
        thread_file='aix'
+       use_gcc_stdint=wrap
        extra_headers=
        ;;
 rs6000-ibm-aix5.3.* | powerpc-ibm-aix5.3.*)
-       tm_file="${tm_file} rs6000/aix.h rs6000/aix53.h rs6000/xcoff.h"
+       tm_file="${tm_file} rs6000/aix.h rs6000/aix53.h rs6000/xcoff.h rs6000/aix-stdint.h"
        tmake_file=rs6000/t-aix52
        extra_options="${extra_options} rs6000/aix64.opt"
        use_collect2=yes
        thread_file='aix'
+       use_gcc_stdint=wrap
        extra_headers=altivec.h
        ;;
 rs6000-ibm-aix[6789].* | powerpc-ibm-aix[6789].*)
-       tm_file="${tm_file} rs6000/aix.h rs6000/aix61.h rs6000/xcoff.h"
+       tm_file="${tm_file} rs6000/aix.h rs6000/aix61.h rs6000/xcoff.h rs6000/aix-stdint.h"
        tmake_file=rs6000/t-aix52
        extra_options="${extra_options} rs6000/aix64.opt"
        use_collect2=yes
        thread_file='aix'
+       use_gcc_stdint=wrap
        extra_headers=altivec.h
        ;;
+rx-*-elf*)
+       tm_file="dbxelf.h elfos.h svr4.h newlib-stdint.h ${tm_file} ../../libgcc/config/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"
-       tmake_file="${tmake_file} t-dfprules s390/t-crtstuff s390/t-linux"
        ;;
 s390x-*-linux*)
        tm_file="s390/s390x.h s390/s390.h dbxelf.h elfos.h svr4.h linux.h glibc-stdint.h s390/linux.h"
@@ -1955,7 +2106,7 @@ s390x-*-linux*)
        md_file=s390/s390.md
        extra_modes=s390/s390-modes.def
        out_file=s390/s390.c
-       tmake_file="${tmake_file} t-dfprules s390/t-crtstuff s390/t-linux s390/t-linux64"
+       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"
@@ -1964,7 +2115,6 @@ s390x-ibm-tpf*)
         extra_modes=s390/s390-modes.def
         out_file=s390/s390.c
         extra_parts="crtbeginS.o crtendS.o"
-        tmake_file="s390/t-crtstuff s390/t-tpf"
         thread_file='tpf'
        extra_options="${extra_options} s390/tpf.opt"
        ;;
@@ -1990,9 +2140,14 @@ sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
                *)                                 with_endian=big,little ;;
                esac
        fi
+       # TM_ENDIAN_CONFIG is used by t-sh to determine multilibs.
+       #  First word : the default endian.
+       #  Second word: the secondary endian (optional).
        case ${with_endian} in
-       big|little)     tmake_file="${tmake_file} sh/t-1e" ;;
-       big,little|little,big) ;;
+       big)            TM_ENDIAN_CONFIG=mb ;;
+       little)         TM_ENDIAN_CONFIG=ml ;;
+       big,little)     TM_ENDIAN_CONFIG="mb ml" ;;
+       little,big)     TM_ENDIAN_CONFIG="ml mb" ;;
        *)      echo "with_endian=${with_endian} not supported."; exit 1 ;;
        esac
        case ${with_endian} in
@@ -2009,10 +2164,11 @@ sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
                        tm_file="${tm_file} linux.h glibc-stdint.h sh/linux.h" ;;
        sh*-*-netbsd*)  tm_file="${tm_file} netbsd.h netbsd-elf.h sh/netbsd-elf.h" ;;
        sh*-superh-elf) if test x$with_libgloss != xno; then
-                               with_libgloss=yes
-                               tm_file="${tm_file} sh/newlib.h"
-                       fi
-                       tm_file="${tm_file} sh/embed-elf.h sh/superh.h"
+                                with_libgloss=yes
+                                tm_file="${tm_file} sh/newlib.h"
+                        fi
+                       tm_file="${tm_file} sh/embed-elf.h"
+                       tm_file="${tm_file} sh/superh.h"
                        tmake_file="${tmake_file} sh/t-superh"
                        extra_options="${extra_options} sh/superh.opt" ;;
        *)              if test x$with_newlib = xyes \
@@ -2046,7 +2202,8 @@ sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
        *-*-symbianelf*)
                tmake_file="sh/t-symbian"
                tm_file="sh/symbian-pre.h sh/little.h ${tm_file} sh/symbian-post.h"
-               extra_objs="symbian.o"
+               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*)
@@ -2102,7 +2259,7 @@ sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
        *)      echo "with_cpu=$with_cpu not supported"; exit 1 ;;
        esac
        sh_multilibs=${with_multilib_list}
-       if test x${sh_multilibs} = x ; then
+       if test "$sh_multilibs" = "default" ; then
                case ${target} in
                sh64-superh-linux* | \
                sh[1234]*)      sh_multilibs=${sh_cpu_target} ;;
@@ -2118,28 +2275,37 @@ sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
        fi
        target_cpu_default=SELECT_`echo ${sh_cpu_default}|tr abcdefghijklmnopqrstuvwxyz- ABCDEFGHIJKLMNOPQRSTUVWXYZ_`
        tm_defines=${tm_defines}' SH_MULTILIB_CPU_DEFAULT=\"'`echo $sh_cpu_default|sed s/sh/m/`'\"'
-       sh_multilibs=`echo $sh_multilibs,$sh_cpu_default | sed -e 's/[  ,/][    ,]*/ /g' -e 's/ $//' -e 's/^m/sh/' -e 's/ m/ sh/g' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ_ abcdefghijklmnopqrstuvwxyz-`
+       tm_defines="$tm_defines SUPPORT_`echo $sh_cpu_default | sed 's/^m/sh/' | tr abcdefghijklmnopqrstuvwxyz- ABCDEFGHIJKLMNOPQRSTUVWXYZ_`=1"
+       sh_multilibs=`echo $sh_multilibs | sed -e 's/,/ /g' -e 's/^sh/m/i' -e 's/ sh/ m/gi' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ_ abcdefghijklmnopqrstuvwxyz-`
        for sh_multilib in ${sh_multilibs}; do
                case ${sh_multilib} in
-               sh1 | sh2 | sh2e | sh3 | sh3e | \
-               sh4 | sh4-single | sh4-single-only | sh4-nofpu | sh4-300 |\
-               sh4a | sh4a-single | sh4a-single-only | sh4a-nofpu | sh4al | \
-               sh2a | sh2a-single | sh2a-single-only | sh2a-nofpu | \
-               sh5-64media | sh5-64media-nofpu | \
-               sh5-32media | sh5-32media-nofpu | \
-               sh5-compact | sh5-compact-nofpu)
-                       tmake_file="${tmake_file} sh/t-mlib-${sh_multilib}"
-                       tm_defines="$tm_defines SUPPORT_`echo $sh_multilib|tr abcdefghijklmnopqrstuvwxyz- ABCDEFGHIJKLMNOPQRSTUVWXYZ_`=1"
+               m1 | m2 | m2e | m3 | m3e | \
+               m4 | m4-single | m4-single-only | m4-nofpu | m4-300 |\
+               m4a | m4a-single | m4a-single-only | m4a-nofpu | m4al | \
+               m2a | m2a-single | m2a-single-only | m2a-nofpu | \
+               m5-64media | m5-64media-nofpu | \
+               m5-32media | m5-32media-nofpu | \
+               m5-compact | m5-compact-nofpu)
+                       # TM_MULTILIB_CONFIG is used by t-sh for the non-endian multilib definition
+                       # It is passed to MULTIILIB_OPTIONS verbatim.
+                       TM_MULTILIB_CONFIG="${TM_MULTILIB_CONFIG}/${sh_multilib}"
+                       tm_defines="$tm_defines SUPPORT_`echo $sh_multilib | sed 's/^m/sh/' | tr abcdefghijklmnopqrstuvwxyz- ABCDEFGHIJKLMNOPQRSTUVWXYZ_`=1"
                        ;;
+               \!*)    # TM_MULTILIB_EXCEPTIONS_CONFIG is used by t-sh
+                       # It is passed the MULTILIB_EXCEPTIONS verbatim.
+                       TM_MULTILIB_EXCEPTIONS_CONFIG="${TM_MULTILIB_EXCEPTIONS_CONFIG} `echo $sh_multilib | sed 's/^!//'`" ;;
                *)
                        echo "with_multilib_list=${sh_multilib} not supported."
                        exit 1
                        ;;
                esac
        done
+       TM_MULTILIB_CONFIG=`echo $TM_MULTILIB_CONFIG | sed 's:^/::'`
        if test x${enable_incomplete_targets} = xyes ; then
                tm_defines="$tm_defines SUPPORT_SH1=1 SUPPORT_SH2E=1 SUPPORT_SH4=1 SUPPORT_SH4_SINGLE=1 SUPPORT_SH2A=1 SUPPORT_SH2A_SINGLE=1 SUPPORT_SH5_32MEDIA=1 SUPPORT_SH5_32MEDIA_NOFPU=1 SUPPORT_SH5_64MEDIA=1 SUPPORT_SH5_64MEDIA_NOFPU=1"
        fi
+       tm_file="$tm_file ./sysroot-suffix.h"
+       tmake_file="$tmake_file t-sysroot-suffix"
        ;;
 sh-*-rtems*)
        tmake_file="sh/t-sh sh/t-elf t-rtems sh/t-rtems"
@@ -2154,7 +2320,8 @@ sparc-*-netbsdelf*)
        extra_options="${extra_options} sparc/long-double-switch.opt"
        ;;
 sparc64-*-openbsd*)
-       tm_file="sparc/openbsd1-64.h ${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/sp64-elf.h openbsd.h sparc/openbsd64.h"
+       tm_file="sparc/openbsd1-64.h ${tm_file} dbxelf.h elfos.h svr4.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} sparc/little-endian.opt"
        gas=yes gnu_ld=yes
        with_cpu=ultrasparc
@@ -2298,7 +2465,7 @@ sparc64-*-netbsd*)
 spu-*-elf*)
        tm_file="dbxelf.h elfos.h spu/spu-elf.h spu/spu.h newlib-stdint.h"
        tmake_file="spu/t-spu-elf"
-       extra_headers="spu_intrinsics.h spu_internals.h vmx2spu.h spu_mfcio.h vec_types.h"
+       extra_headers="spu_intrinsics.h spu_internals.h vmx2spu.h spu_mfcio.h vec_types.h spu_cache.h"
        extra_modes=spu/spu-modes.def
        c_target_objs="${c_target_objs} spu-c.o"
        cxx_target_objs="${cxx_target_objs} spu-c.o"
@@ -2352,6 +2519,7 @@ v850-*-*)
        ;;
 vax-*-linux*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h vax/elf.h vax/linux.h"
+       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"
@@ -2363,7 +2531,7 @@ vax-*-netbsd*)
        use_collect2=yes
        ;;
 vax-*-openbsd*)
-       tm_file="vax/vax.h vax/openbsd1.h openbsd.h vax/openbsd.h"
+       tm_file="vax/vax.h vax/openbsd1.h openbsd.h openbsd-stdint.h openbsd-pthread.h vax/openbsd.h"
        use_collect2=yes
        ;;
 xstormy16-*-elf)
@@ -2415,6 +2583,8 @@ i[34567]86-*-linux* | x86_64-*-linux*)
 i[34567]86-*-* | x86_64-*-*)
        tmake_file="${tmake_file} i386/t-gmm_malloc i386/t-i386"
        ;;
+powerpc*-*-* | rs6000-*-*)
+       tm_file="${tm_file} rs6000/option-defaults.h"
 esac
 
 # Support for --with-cpu and related options (and a few unrelated options,
@@ -2663,7 +2833,7 @@ 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
                        ;;
                *)
@@ -2800,7 +2970,7 @@ case "${target}" in
                                esac
                                # OK
                                ;;
-                       "" | amdfam10 | barcelona | k8 | opteron | athlon64 | athlon-fx | nocona | core2 | generic)
+                       "" | amdfam10 | barcelona | k8 | opteron | athlon64 | athlon-fx | nocona | core2 | atom | generic)
                                # OK
                                ;;
                        *)
@@ -2812,7 +2982,7 @@ case "${target}" in
                ;;
 
        mips*-*-*)
-               supported_defaults="abi arch float tune divide llsc mips-plt"
+               supported_defaults="abi arch arch_32 arch_64 float tune tune_32 tune_64 divide llsc mips-plt synci"
 
                case ${with_float} in
                "" | soft | hard)
@@ -2874,15 +3044,37 @@ case "${target}" in
                        exit 1
                        ;;
                esac
+
+               case ${with_synci} in
+               yes)
+                       with_synci=synci
+                       ;;
+               "" | no)
+                       # No is the default.
+                       with_synci=no-synci
+                       ;;
+               *)
+                       echo "Unknown synci type used in --with-synci" 1>&2
+                       exit 1
+                       ;;
+               esac
                ;;
 
        powerpc*-*-* | rs6000-*-*)
-               supported_defaults="cpu float tune"
+               supported_defaults="cpu cpu_32 cpu_64 float tune tune_32 tune_64"
 
-               for which in cpu tune; do
+               for which in cpu cpu_32 cpu_64 tune tune_32 tune_64; do
                        eval "val=\$with_$which"
                        case ${val} in
                        default32 | default64)
+                               case $which in
+                               cpu | tune)
+                                       ;;
+                               *)
+                                       echo "$val only valid for --with-cpu and --with-tune." 1>&2
+                                       exit 1
+                                       ;;
+                               esac
                                with_which="with_$which"
                                eval $with_which=
                                ;;
@@ -2894,9 +3086,9 @@ case "${target}" in
                        | power | power[234567] | power6x | powerpc | powerpc64 \
                        | rios | rios1 | rios2 | rsc | rsc1 | rs64a \
                        | 401 | 403 | 405 | 405fp | 440 | 440fp | 464 | 464fp \
-                       | 505 | 601 | 602 | 603 | 603e | ec603e | 604 \
-                       | 604e | 620 | 630 | 740 | 750 | 7400 | 7450 \
-                       | e300c[23] | 854[08] | e500mc \
+                       | 476 | 476fp | 505 | 601 | 602 | 603 | 603e | ec603e \
+                       | 604 | 604e | 620 | 630 | 740 | 750 | 7400 | 7450 \
+                       | a2 | e300c[23] | 854[08] | e500mc | e500mc64 \
                        | 801 | 821 | 823 | 860 | 970 | G3 | G4 | G5 | cell)
                                # OK
                                ;;
@@ -3052,9 +3244,12 @@ 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-*-linux* | x86_64-*-linux* | i[34567]86-*-kfreebsd*-gnu | x86_64-*-kfreebsd*-gnu)
                tmake_file="${tmake_file} i386/t-fprules-softfp soft-fp/t-softfp i386/t-linux"
                ;;
+       i[34567]86-*-cygwin* | i[34567]86-*-mingw* | x86_64-*-mingw*)
+               tmake_file="${tmake_file} i386/t-fprules-softfp soft-fp/t-softfp"
+               ;;
        ia64*-*-linux*)
                tmake_file="${tmake_file} ia64/t-fprules-softfp soft-fp/t-softfp"
                ;;
@@ -3129,7 +3324,7 @@ case ${target} in
 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"
+all_defaults="abi cpu cpu_32 cpu_64 arch arch_32 arch_64 tune tune_32 tune_64 schedule float mode fpu divide llsc mips-plt synci"
 for option in $all_defaults
 do
        eval "val=\$with_"`echo $option | sed s/-/_/g`