OSDN Git Service

* config/freebsd-stdint.h: New file.
[pf3gnuchains/gcc-fork.git] / gcc / config.gcc
index 5617065..98d4b1e 100644 (file)
@@ -371,16 +371,24 @@ then
 fi
 
 case ${target} in
+i[34567]86-w64-*)
+       tm_file="i386/biarch32.h ${tm_file}"
+       ;;
+esac
+
+case ${target} in
 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
 
@@ -411,6 +419,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 +475,8 @@ 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"
+  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"
@@ -975,6 +985,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 +1025,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
@@ -1074,7 +1104,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 +1113,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
@@ -1189,7 +1219,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 +1228,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
@@ -1230,7 +1260,7 @@ i[4567]86-wrs-vxworks|i[4567]86-wrs-vxworksae)
        esac
        ;;
 i[34567]86-*-pe | i[34567]86-*-cygwin*)
-       tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/cygming.h i386/cygwin.h"
+       tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/cygming.h i386/cygwin.h i386/cygwin-stdint.h"
        xm_file=i386/xm-cygwin.h
        # This has to match the logic for DWARF2_UNWIND_INFO in gcc/config/i386/cygming.h
        if test x$sjlj = x0; then
@@ -1248,26 +1278,45 @@ i[34567]86-*-pe | i[34567]86-*-cygwin*)
        if test x$enable_threads = xyes; then
                thread_file='posix'
        fi
+       use_gcc_stdint=wrap
        ;;
 i[34567]86-*-mingw* | x86_64-*-mingw*)
        tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/cygming.h i386/mingw32.h"
        xm_file=i386/xm-mingw32.h
+       # 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"
+                       ;;
+               *)
+                       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
@@ -1340,6 +1389,8 @@ 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"
        ;;
 iq2000*-*-elf*)
         tm_file="svr4.h elfos.h newlib-stdint.h iq2000/iq2000.h"
@@ -1711,22 +1762,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="${cpu_type}/${cpu_type}.h elfos.h svr4.h freebsd-spec.h gnu.h rs6000/sysv4.h rs6000/linux64.h rs6000/gnu.h glibc-stdint.h"
-       extra_options="${extra_options} rs6000/sysv4.opt rs6000/linux64.opt"
-       tmake_file="rs6000/t-fprules t-slibgcc-elf-ver t-gnu rs6000/t-linux64 rs6000/t-fprules-softfp soft-fp/t-softfp"
-       ;;
 powerpc-*-darwin*)
        extra_options="${extra_options} rs6000/darwin.opt"
        extra_parts="crt2.o"
@@ -1789,9 +1824,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*)
@@ -1805,27 +1840,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*altivec*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/linux.h rs6000/linuxaltivec.h glibc-stdint.h"
-       extra_options="${extra_options} rs6000/sysv4.opt"
-       tmake_file="rs6000/t-fprules rs6000/t-fprules-softfp soft-fp/t-softfp rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
-       ;;
-powerpc-*-linux*spe*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/linux.h rs6000/linuxspe.h rs6000/e500.h glibc-stdint.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"
-       ;;
-powerpc-*-linux*paired*)
-        tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/linux.h rs6000/750cl.h glibc-stdint.h"
-        extra_options="${extra_options} rs6000/sysv4.opt"
-        tmake_file="rs6000/t-fprules rs6000/t-fprules-softfp soft-fp/t-softfp rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
-        ;;
-powerpc-*-linux*)
+powerpc-*-linux* | powerpc64-*-linux*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"
        extra_options="${extra_options} rs6000/sysv4.opt"
-       tmake_file="t-dfprules rs6000/t-fprules rs6000/t-fprules-softfp soft-fp/t-softfp rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
-       case ${enable_targets}:${cpu_is_64bit} in
-           *powerpc64* | all:* | *:yes)
+       tmake_file="t-dfprules rs6000/t-fprules rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
+       maybe_biarch=yes
+       case ${target} in
+           powerpc64-*-linux*spe* | powerpc64-*-linux*paired*)
+               echo "*** Configuration ${target} not supported" 1>&2
+               exit 1
+               ;;
+           powerpc-*-linux*spe* | powerpc-*-linux*paired*)
+               maybe_biarch=
+               ;;
+           powerpc64-*-linux*)
+               test x$with_cpu != x || cpu_is_64bit=yes
+               maybe_biarch=always
+               ;;
+       esac
+       case ${maybe_biarch}:${enable_targets}:${cpu_is_64bit} in
+           always:* | yes:*powerpc64* | yes:all:* | yes:*:yes)
                if test x$cpu_is_64bit = xyes; then
                    tm_file="${tm_file} rs6000/default64.h"
                fi
@@ -1837,10 +1871,24 @@ powerpc-*-linux*)
                tm_file="${tm_file} rs6000/linux.h glibc-stdint.h"
                ;;
        esac
+       tmake_file="${tmake_file} rs6000/t-fprules-softfp soft-fp/t-softfp"
+       case ${target} in
+           powerpc*-*-linux*altivec*)
+               tm_file="${tm_file} rs6000/linuxaltivec.h" ;;
+           powerpc*-*-linux*spe*)
+               tm_file="${tm_file} rs6000/linuxspe.h rs6000/e500.h" ;;
+           powerpc*-*-linux*paired*)
+               tm_file="${tm_file} rs6000/750cl.h" ;;
+       esac
        if test x${enable_secureplt} = xyes; then
                tm_file="rs6000/secureplt.h ${tm_file}"
        fi
        ;;
+powerpc64-*-gnu*)
+       tm_file="${tm_file} elfos.h svr4.h freebsd-spec.h gnu.h rs6000/sysv4.h rs6000/default64.h rs6000/linux64.h rs6000/gnu.h glibc-stdint.h"
+       extra_options="${extra_options} rs6000/sysv4.opt rs6000/linux64.opt"
+       tmake_file="t-slibgcc-elf-ver t-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"
@@ -1900,50 +1948,49 @@ 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
        ;;
 s390-*-linux*)
@@ -1991,9 +2038,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
@@ -2103,7 +2155,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} ;;
@@ -2119,28 +2171,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"
@@ -2351,6 +2412,9 @@ v850-*-*)
        cxx_target_objs="v850-c.o"
        use_gcc_stdint=wrap
        ;;
+vax-*-linux*)
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h vax/elf.h vax/linux.h"
+       ;;
 vax-*-netbsdelf*)
        tm_file="${tm_file} elfos.h netbsd.h netbsd-elf.h vax/elf.h vax/netbsd-elf.h"
        ;;
@@ -2413,6 +2477,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,
@@ -2798,7 +2864,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
                                ;;
                        *)
@@ -2810,7 +2876,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"
 
                case ${with_float} in
                "" | soft | hard)
@@ -2875,12 +2941,20 @@ case "${target}" in
                ;;
 
        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=
                                ;;
@@ -3050,9 +3124,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*)
+               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"
                ;;