OSDN Git Service

* config/interix.opt: New.
[pf3gnuchains/gcc-fork.git] / gcc / config.gcc
index 0202a22..7d74010 100644 (file)
@@ -393,6 +393,7 @@ spu*-*-*)
 s390*-*-*)
        cpu_type=s390
        need_64bit_hwint=yes
 s390*-*-*)
        cpu_type=s390
        need_64bit_hwint=yes
+       extra_options="${extra_options} fused-madd.opt"
        ;;
 # Note the 'l'; we need to be able to match e.g. "shle" or "shl".
 sh[123456789lbe]*-*-* | sh-*-*)
        ;;
 # Note the 'l'; we need to be able to match e.g. "shle" or "shl".
 sh[123456789lbe]*-*-* | sh-*-*)
@@ -760,7 +761,7 @@ alpha*-dec-*vms*)
        extra_options="${extra_options} vms/vms.opt"
        ;;
 arc-*-elf*)
        extra_options="${extra_options} vms/vms.opt"
        ;;
 arc-*-elf*)
-       tm_file="dbxelf.h elfos.h svr4.h newlib-stdint.h ${tm_file}"
+       tm_file="dbxelf.h elfos.h newlib-stdint.h ${tm_file}"
        extra_parts="crtinit.o crtfini.o"
        ;;
 arm-wrs-vxworks)
        extra_parts="crtinit.o crtfini.o"
        ;;
 arm-wrs-vxworks)
@@ -792,7 +793,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"
        case ${target} in
        arm*-*-linux-*eabi)
            tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h"
-           tm_file="$tm_file ../../libgcc/config/arm/bpabi.h"
+           tm_file="$tm_file ../../libgcc/config/arm/bpabi-lib.h"
            tmake_file="$tmake_file arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi t-slibgcc-libgcc"
            # Define multilib configuration for arm-linux-androideabi.
            case ${target} in
            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
@@ -820,7 +821,7 @@ arm*-*-uclinux*)            # ARM ucLinux
        case ${target} in
        arm*-*-uclinux*eabi)
            tm_file="$tm_file arm/bpabi.h arm/uclinux-eabi.h"
        case ${target} in
        arm*-*-uclinux*eabi)
            tm_file="$tm_file arm/bpabi.h arm/uclinux-eabi.h"
-           tm_file="$tm_file ../../libgcc/config/arm/bpabi.h"
+           tm_file="$tm_file ../../libgcc/config/arm/bpabi-lib.h"
            tmake_file="$tmake_file arm/t-bpabi"
            # The BPABI long long divmod functions return a 128-bit value in
            # registers r0-r3.  Correctly modeling that requires the use of
            tmake_file="$tmake_file arm/t-bpabi"
            # The BPABI long long divmod functions return a 128-bit value in
            # registers r0-r3.  Correctly modeling that requires the use of
@@ -844,7 +845,7 @@ arm*-*-eabi* | arm*-*-symbianelf* )
        need_64bit_hwint=yes
        default_use_cxa_atexit=yes
        tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/bpabi.h"
        need_64bit_hwint=yes
        default_use_cxa_atexit=yes
        tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/bpabi.h"
-       tm_file="$tm_file ../../libgcc/config/arm/bpabi.h"
+       tm_file="$tm_file ../../libgcc/config/arm/bpabi-lib.h"
        tmake_file="arm/t-arm arm/t-arm-elf"
        case ${target} in
        arm*-*-eabi*)
        tmake_file="arm/t-arm arm/t-arm-elf"
        case ${target} in
        arm*-*-eabi*)
@@ -941,7 +942,7 @@ cris-*-elf | cris-*-none)
        use_gcc_stdint=wrap
        ;;
 crisv32-*-linux* | cris-*-linux*)
        use_gcc_stdint=wrap
        ;;
 crisv32-*-linux* | cris-*-linux*)
-       tm_file="dbxelf.h elfos.h svr4.h ${tm_file} linux.h glibc-stdint.h cris/linux.h"
+       tm_file="dbxelf.h elfos.h ${tm_file} linux.h glibc-stdint.h cris/linux.h"
        # We need to avoid using t-linux, so override default tmake_file
        tmake_file="cris/t-cris t-slibgcc-elf-ver cris/t-linux"
        extra_options="${extra_options} cris/linux.opt"
        # We need to avoid using t-linux, so override default tmake_file
        tmake_file="cris/t-cris t-slibgcc-elf-ver cris/t-linux"
        extra_options="${extra_options} cris/linux.opt"
@@ -960,17 +961,17 @@ crx-*-elf)
        use_collect2=no
        ;;
 fr30-*-elf)
        use_collect2=no
        ;;
 fr30-*-elf)
-       tm_file="dbxelf.h elfos.h svr4.h newlib-stdint.h ${tm_file}"
+       tm_file="dbxelf.h elfos.h newlib-stdint.h ${tm_file}"
        tmake_file=fr30/t-fr30
        extra_parts="crti.o crtn.o crtbegin.o crtend.o"
        ;;
 frv-*-elf)
        tmake_file=fr30/t-fr30
        extra_parts="crti.o crtn.o crtbegin.o crtend.o"
        ;;
 frv-*-elf)
-       tm_file="dbxelf.h elfos.h svr4.h newlib-stdint.h ${tm_file}"
+       tm_file="dbxelf.h elfos.h newlib-stdint.h ${tm_file}"
        tm_file="${tm_file} ../../libgcc/config/frv/frv-abi.h"
        tmake_file=frv/t-frv
        ;;
 frv-*-*linux*)
        tm_file="${tm_file} ../../libgcc/config/frv/frv-abi.h"
        tmake_file=frv/t-frv
        ;;
 frv-*-*linux*)
-       tm_file="dbxelf.h elfos.h svr4.h ${tm_file} \
+       tm_file="dbxelf.h elfos.h ${tm_file} \
                 linux.h glibc-stdint.h frv/linux.h"
        tm_file="${tm_file} ../../libgcc/config/frv/frv-abi.h"
        tmake_file="${tmake_file} frv/t-frv frv/t-linux"
                 linux.h glibc-stdint.h frv/linux.h"
        tm_file="${tm_file} ../../libgcc/config/frv/frv-abi.h"
        tmake_file="${tmake_file} frv/t-frv frv/t-linux"
@@ -978,14 +979,14 @@ frv-*-*linux*)
 moxie-*-elf)
        gas=yes
        gnu_ld=yes
 moxie-*-elf)
        gas=yes
        gnu_ld=yes
-       tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
+       tm_file="dbxelf.h elfos.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
        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"
+       tm_file="dbxelf.h elfos.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} DEFAULT_LIBC=LIBC_UCLIBC"
        extra_parts="crti.o crtn.o crtbegin.o crtend.o"
        tmake_file="${tmake_file} moxie/t-moxie moxie/t-moxie-softfp soft-fp/t-softfp"
        tm_defines="${tm_defines} DEFAULT_LIBC=LIBC_UCLIBC"
@@ -1005,7 +1006,7 @@ h8300-*-elf*)
        ;;
 hppa*64*-*-linux*)
        target_cpu_default="MASK_PA_11|MASK_PA_20"
        ;;
 hppa*64*-*-linux*)
        target_cpu_default="MASK_PA_11|MASK_PA_20"
-       tm_file="pa/pa64-start.h ${tm_file} dbxelf.h elfos.h svr4.h linux.h \
+       tm_file="pa/pa64-start.h ${tm_file} dbxelf.h elfos.h linux.h \
                 glibc-stdint.h pa/pa-linux.h pa/pa64-regs.h pa/pa-64.h \
                 pa/pa64-linux.h"
        tmake_file="${tmake_file} pa/t-linux64"
                 glibc-stdint.h pa/pa-linux.h pa/pa64-regs.h pa/pa-64.h \
                 pa/pa64-linux.h"
        tmake_file="${tmake_file} pa/t-linux64"
@@ -1014,7 +1015,7 @@ hppa*64*-*-linux*)
        ;;
 hppa*-*-linux*)
        target_cpu_default="MASK_PA_11|MASK_NO_SPACE_REGS"
        ;;
 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 \
+       tm_file="${tm_file} dbxelf.h elfos.h linux.h glibc-stdint.h pa/pa-linux.h \
                 pa/pa32-regs.h pa/pa32-linux.h"
        tmake_file="${tmake_file} pa/t-linux t-slibgcc-libgcc"
        # Set the libgcc version number
                 pa/pa32-regs.h pa/pa32-linux.h"
        tmake_file="${tmake_file} pa/t-linux t-slibgcc-libgcc"
        # Set the libgcc version number
@@ -1064,6 +1065,10 @@ hppa[12]*-*-hpux10*)
        fi
        use_collect2=yes
        gas=yes
        fi
        use_collect2=yes
        gas=yes
+       if test "x$with_dwarf2" != x; then
+               echo "Warning: dwarf2 debug format is not supported for this target, --with-dwarf2 ignored" 1>&2
+               dwarf2=no
+       fi
        ;;
 hppa*64*-*-hpux11*)
        target_cpu_default="MASK_PA_11|MASK_PA_20"
        ;;
 hppa*64*-*-hpux11*)
        target_cpu_default="MASK_PA_11|MASK_PA_20"
@@ -1152,20 +1157,20 @@ hppa[12]*-*-hpux11*)
                tm_file="${tm_file} hpux-stdint.h"
                ;;
        esac
                tm_file="${tm_file} hpux-stdint.h"
                ;;
        esac
+       if test "x$with_dwarf2" != x; then
+               echo "Warning: dwarf2 debug format is not supported for this target, --with-dwarf2 ignored" 1>&2
+               dwarf2=no
+       fi
        ;;
 i[34567]86-*-darwin*)
        need_64bit_hwint=yes
        need_64bit_isa=yes
        ;;
 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}
+       # Baseline choice for a machine that allows m64 support.
+       with_cpu=${with_cpu:-core2}
        tmake_file="${tmake_file} t-slibgcc-darwin i386/t-crtpc i386/t-crtfm"
        ;;
 x86_64-*-darwin*)
        tmake_file="${tmake_file} t-slibgcc-darwin i386/t-crtpc i386/t-crtfm"
        ;;
 x86_64-*-darwin*)
-       with_cpu=${with_cpu:-generic}
+       with_cpu=${with_cpu:-core2}
        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"
        ;;
        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"
        ;;
@@ -1225,7 +1230,7 @@ i[34567]86-*-linux* | i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-knetbsd*-gnu | i
                        need_64bit_hwint=yes
                        need_64bit_isa=yes
                        case X"${with_cpu}" in
                        need_64bit_hwint=yes
                        need_64bit_isa=yes
                        case X"${with_cpu}" in
-                       Xgeneric|Xatom|Xcore2|Xnocona|Xx86-64|Xbdver1|Xamdfam10|Xbarcelona|Xk8|Xopteron|Xathlon64|Xathlon-fx|Xathlon64-sse3|Xk8-sse3|Xopteron-sse3)
+                       Xgeneric|Xatom|Xcore2|Xcorei7|Xcorei7-avx|Xnocona|Xx86-64|Xbdver1|Xamdfam10|Xbarcelona|Xk8|Xopteron|Xathlon64|Xathlon-fx|Xathlon64-sse3|Xk8-sse3|Xopteron-sse3)
                                ;;
                        X)
                                if test x$with_cpu_64 = x; then
                                ;;
                        X)
                                if test x$with_cpu_64 = x; then
@@ -1234,7 +1239,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 "Unsupported CPU used in --with-cpu=$with_cpu, supported values:" 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
+                               echo "generic atom core2 corei7 corei7-avx nocona x86-64 bdver1 amdfam10 barcelona k8 opteron athlon64 athlon-fx athlon64-sse3 k8-sse3 opteron-sse3" 1>&2
                                exit 1
                                ;;
                        esac
                                exit 1
                                ;;
                        esac
@@ -1363,7 +1368,7 @@ i[34567]86-*-solaris2*)
                need_64bit_isa=yes
                use_gcc_stdint=wrap
                case X"${with_cpu}" in
                need_64bit_isa=yes
                use_gcc_stdint=wrap
                case X"${with_cpu}" in
-               Xgeneric|Xatom|Xcore2|Xnocona|Xx86-64|Xbdver1|Xamdfam10|Xbarcelona|Xk8|Xopteron|Xathlon64|Xathlon-fx|Xathlon64-sse3|Xk8-sse3|Xopteron-sse3)
+               Xgeneric|Xatom|Xcore2|Xcorei7|Xcorei7-avx|Xnocona|Xx86-64|Xbdver1|Xamdfam10|Xbarcelona|Xk8|Xopteron|Xathlon64|Xathlon-fx|Xathlon64-sse3|Xk8-sse3|Xopteron-sse3)
                        ;;
                X)
                        if test x$with_cpu_64 = x; then
                        ;;
                X)
                        if test x$with_cpu_64 = x; then
@@ -1372,7 +1377,7 @@ i[34567]86-*-solaris2*)
                        ;;
                *)
                        echo "Unsupported CPU used in --with-cpu=$with_cpu, supported values:" 1>&2
                        ;;
                *)
                        echo "Unsupported CPU used in --with-cpu=$with_cpu, supported values:" 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
+                       echo "generic atom core2 corei7 corei7-avx nocona x86-64 bdver1 amdfam10 barcelona k8 opteron athlon64 athlon-fx athlon64-sse3 k8-sse3 opteron-sse3" 1>&2
                        exit 1
                        ;;
                esac
                        exit 1
                        ;;
                esac
@@ -1443,7 +1448,7 @@ i[34567]86-*-mingw* | x86_64-*-mingw*)
                        if test x$enable_targets = xall; then
                                tm_defines="${tm_defines} TARGET_BI_ARCH=1"
                                case X"${with_cpu}" in
                        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|Xbdver1|Xamdfam10|Xbarcelona|Xk8|Xopteron|Xathlon64|Xathlon-fx|Xathlon64-sse3|Xk8-sse3|Xopteron-sse3)
+                               Xgeneric|Xatom|Xcore2|Xcorei7|Xcorei7-avx|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
                                        ;;
                                X)
                                        if test x$with_cpu_64 = x; then
@@ -1452,7 +1457,7 @@ i[34567]86-*-mingw* | x86_64-*-mingw*)
                                        ;;
                                *)
                                        echo "Unsupported CPU used in --with-cpu=$with_cpu, supported values:" 1>&2
                                        ;;
                                *)
                                        echo "Unsupported CPU used in --with-cpu=$with_cpu, supported values:" 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
+                                       echo "generic atom core2 corei7 Xcorei7-avx nocona x86-64 bdver1 amdfam10 barcelona k8 opteron athlon64 athlon-fx athlon64-sse3 k8-sse3 opteron-sse3" 1>&2
                                        exit 1
                                        ;;
                                esac
                                        exit 1
                                        ;;
                                esac
@@ -1517,7 +1522,7 @@ i[34567]86-*-mingw* | x86_64-*-mingw*)
 i[34567]86-*-interix3*)
        tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/i386-interix.h i386/i386-interix3.h interix.h interix3.h"
        tmake_file="${tmake_file} i386/t-interix"
 i[34567]86-*-interix3*)
        tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/i386-interix.h i386/i386-interix3.h interix.h interix3.h"
        tmake_file="${tmake_file} i386/t-interix"
-       extra_options="${extra_options} rpath.opt"
+       extra_options="${extra_options} rpath.opt interix.opt"
        extra_objs=winnt.o
        target_gtfiles="\$(srcdir)/config/i386/winnt.c"
        if test x$enable_threads = xyes ; then
        extra_objs=winnt.o
        target_gtfiles="\$(srcdir)/config/i386/winnt.c"
        if test x$enable_threads = xyes ; then
@@ -1548,7 +1553,7 @@ ia64*-*-freebsd*)
        extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtfastmath.o"
        ;;
 ia64*-*-linux*)
        extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtfastmath.o"
        ;;
 ia64*-*-linux*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h glibc-stdint.h ia64/sysv4.h ia64/linux.h"
+       tm_file="${tm_file} dbxelf.h elfos.h linux.h glibc-stdint.h ia64/sysv4.h ia64/linux.h"
        tmake_file="${tmake_file} ia64/t-ia64 t-libunwind ia64/t-glibc"
        if test x$with_system_libunwind != xyes ; then
                tmake_file="${tmake_file} t-libunwind-elf ia64/t-glibc-libunwind"
        tmake_file="${tmake_file} ia64/t-ia64 t-libunwind ia64/t-glibc"
        if test x$with_system_libunwind != xyes ; then
                tmake_file="${tmake_file} t-libunwind-elf ia64/t-glibc-libunwind"
@@ -1557,7 +1562,7 @@ ia64*-*-linux*)
        extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtfastmath.o"
        ;;
 ia64*-*-hpux*)
        extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtfastmath.o"
        ;;
 ia64*-*-hpux*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h ia64/sysv4.h ia64/hpux.h"
+       tm_file="${tm_file} dbxelf.h elfos.h ia64/sysv4.h ia64/hpux.h"
        tmake_file="ia64/t-ia64 ia64/t-hpux"
        target_cpu_default="MASK_GNU_AS"
        case x$enable_threads in
        tmake_file="ia64/t-ia64 ia64/t-hpux"
        target_cpu_default="MASK_GNU_AS"
        case x$enable_threads in
@@ -1587,7 +1592,7 @@ ia64-hp-*vms*)
        extra_options="${extra_options} vms/vms.opt"
        ;;
 iq2000*-*-elf*)
        extra_options="${extra_options} vms/vms.opt"
        ;;
 iq2000*-*-elf*)
-        tm_file="svr4.h elfos.h newlib-stdint.h iq2000/iq2000.h"
+        tm_file="elfos.h newlib-stdint.h iq2000/iq2000.h"
         tmake_file=iq2000/t-iq2000
         out_file=iq2000/iq2000.c
         md_file=iq2000/iq2000.md
         tmake_file=iq2000/t-iq2000
         out_file=iq2000/iq2000.c
         md_file=iq2000/iq2000.md
@@ -1606,20 +1611,20 @@ lm32-*-uclinux*)
        tmake_file="${tmake_file} lm32/t-lm32 lm32/t-fprules-softfp soft-fp/t-softfp"
         ;;
 m32r-*-elf*)
        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}"
+       tm_file="dbxelf.h elfos.h newlib-stdint.h ${tm_file}"
        extra_parts="crtinit.o crtfini.o"
        ;;
 m32rle-*-elf*)
        extra_parts="crtinit.o crtfini.o"
        ;;
 m32rle-*-elf*)
-       tm_file="dbxelf.h elfos.h svr4.h newlib-stdint.h m32r/little.h ${tm_file}"
+       tm_file="dbxelf.h elfos.h newlib-stdint.h m32r/little.h ${tm_file}"
        extra_parts="crtinit.o crtfini.o m32rx/crtinit.o m32rx/crtfini.o"
        ;;
 m32r-*-rtems*)
        extra_parts="crtinit.o crtfini.o m32rx/crtinit.o m32rx/crtfini.o"
        ;;
 m32r-*-rtems*)
-       tm_file="dbxelf.h elfos.h svr4.h ${tm_file} m32r/rtems.h rtems.h newlib-stdint.h"
+       tm_file="dbxelf.h elfos.h ${tm_file} m32r/rtems.h rtems.h newlib-stdint.h"
        tmake_file="m32r/t-m32r t-rtems"
        extra_parts="crtinit.o crtfini.o"
        ;;
 m32r-*-linux*)
        tmake_file="m32r/t-m32r t-rtems"
        extra_parts="crtinit.o crtfini.o"
        ;;
 m32r-*-linux*)
-       tm_file="dbxelf.h elfos.h svr4.h linux.h glibc-stdint.h ${tm_file} m32r/linux.h"
+       tm_file="dbxelf.h elfos.h linux.h glibc-stdint.h ${tm_file} m32r/linux.h"
        # We override the tmake_file for linux -- why?
        tmake_file="t-slibgcc-elf-ver m32r/t-linux"
        gnu_ld=yes
        # We override the tmake_file for linux -- why?
        tmake_file="t-slibgcc-elf-ver m32r/t-linux"
        gnu_ld=yes
@@ -1628,7 +1633,7 @@ m32r-*-linux*)
        fi
        ;;
 m32rle-*-linux*)
        fi
        ;;
 m32rle-*-linux*)
-       tm_file="dbxelf.h elfos.h svr4.h linux.h glibc-stdint.h m32r/little.h ${tm_file} m32r/linux.h"
+       tm_file="dbxelf.h elfos.h linux.h glibc-stdint.h m32r/little.h ${tm_file} m32r/linux.h"
        # We override the tmake_file for linux -- why?
        tmake_file="t-slibgcc-elf-ver m32r/t-linux"
        gnu_ld=yes
        # We override the tmake_file for linux -- why?
        tmake_file="t-slibgcc-elf-ver m32r/t-linux"
        gnu_ld=yes
@@ -1716,7 +1721,7 @@ m68k-*-uclinux*)          # Motorola m68k/ColdFire running uClinux
                                # ABI.
        default_m68k_cpu=68020
        default_cf_cpu=5206
                                # ABI.
        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_file="${tm_file} dbxelf.h elfos.h linux.h glibc-stdint.h flat.h m68k/linux.h m68k/uclinux.h ./sysroot-suffix.h"
        tm_defines="${tm_defines} MOTOROLA=1 DEFAULT_LIBC=LIBC_UCLIBC"
        extra_options="${extra_options} linux.opt"
        tmake_file="m68k/t-floatlib m68k/t-uclinux m68k/t-mlibs"
        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"
@@ -1727,7 +1732,7 @@ m68k-*-linux*)            # Motorola m68k's running GNU/Linux
        default_m68k_cpu=68020
        default_cf_cpu=5475
        with_arch=${with_arch:-m68k}
        default_m68k_cpu=68020
        default_cf_cpu=5475
        with_arch=${with_arch:-m68k}
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h glibc-stdint.h m68k/linux.h ./sysroot-suffix.h"
+       tm_file="${tm_file} dbxelf.h elfos.h linux.h glibc-stdint.h m68k/linux.h ./sysroot-suffix.h"
        extra_options="${extra_options} m68k/ieee.opt"
        tm_defines="${tm_defines} MOTOROLA=1"
        tmake_file="${tmake_file} m68k/t-floatlib m68k/t-linux m68k/t-mlibs"
        extra_options="${extra_options} m68k/ieee.opt"
        tm_defines="${tm_defines} MOTOROLA=1"
        tmake_file="${tmake_file} m68k/t-floatlib m68k/t-linux m68k/t-mlibs"
@@ -1746,7 +1751,7 @@ m68k-*-rtems*)
        extra_parts="crtbegin.o crtend.o"
        ;;
 mcore-*-elf)
        extra_parts="crtbegin.o crtend.o"
        ;;
 mcore-*-elf)
-       tm_file="dbxelf.h elfos.h svr4.h newlib-stdint.h ${tm_file} mcore/mcore-elf.h"
+       tm_file="dbxelf.h elfos.h newlib-stdint.h ${tm_file} mcore/mcore-elf.h"
        tmake_file=mcore/t-mcore
        inhibit_libc=true
        ;;
        tmake_file=mcore/t-mcore
        inhibit_libc=true
        ;;
@@ -1757,7 +1762,7 @@ mcore-*-pe*)
        use_gcc_stdint=wrap
        ;;
 mep-*-*)
        use_gcc_stdint=wrap
        ;;
 mep-*-*)
-       tm_file="dbxelf.h elfos.h svr4.h ${tm_file}"
+       tm_file="dbxelf.h elfos.h ${tm_file}"
        tmake_file=mep/t-mep
        extra_parts="crtbegin.o crtend.o"
        c_target_objs="mep-pragma.o"
        tmake_file=mep/t-mep
        extra_parts="crtbegin.o crtend.o"
        c_target_objs="mep-pragma.o"
@@ -1806,7 +1811,7 @@ mips*-*-netbsd*)                  # NetBSD/mips, either endian.
        tm_file="elfos.h ${tm_file} mips/elf.h netbsd.h netbsd-elf.h mips/netbsd.h"
        ;;
 mips64*-*-linux* | mipsisa64*-*-linux*)
        tm_file="elfos.h ${tm_file} mips/elf.h netbsd.h netbsd-elf.h mips/netbsd.h"
        ;;
 mips64*-*-linux* | mipsisa64*-*-linux*)
-       tm_file="dbxelf.h elfos.h svr4.h linux.h glibc-stdint.h ${tm_file} mips/linux.h mips/linux64.h"
+       tm_file="dbxelf.h elfos.h linux.h glibc-stdint.h ${tm_file} mips/linux.h mips/linux64.h"
        tmake_file="${tmake_file} mips/t-linux64 mips/t-libgcc-mips16"
        tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_N32"
        case ${target} in
        tmake_file="${tmake_file} mips/t-linux64 mips/t-libgcc-mips16"
        tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_N32"
        case ${target} in
@@ -1828,7 +1833,7 @@ mips64*-*-linux* | mipsisa64*-*-linux*)
        test x$with_llsc != x || with_llsc=yes
        ;;
 mips*-*-linux*)                                # Linux MIPS, either endian.
        test x$with_llsc != x || with_llsc=yes
        ;;
 mips*-*-linux*)                                # Linux MIPS, either endian.
-        tm_file="dbxelf.h elfos.h svr4.h linux.h glibc-stdint.h ${tm_file} mips/linux.h"
+        tm_file="dbxelf.h elfos.h linux.h glibc-stdint.h ${tm_file} mips/linux.h"
        tmake_file="${tmake_file} mips/t-libgcc-mips16"
        case ${target} in
         mipsisa32r2*)
        tmake_file="${tmake_file} mips/t-libgcc-mips16"
        case ${target} in
         mipsisa32r2*)
@@ -1956,7 +1961,7 @@ mips*-*-rtems*)
        tmake_file="mips/t-elf mips/t-libgcc-mips16 t-rtems mips/t-rtems"
        ;;
 mips-wrs-vxworks)
        tmake_file="mips/t-elf mips/t-libgcc-mips16 t-rtems mips/t-rtems"
        ;;
 mips-wrs-vxworks)
-       tm_file="elfos.h ${tm_file} svr4.h mips/elf.h vx-common.h vxworks.h mips/vxworks.h"
+       tm_file="elfos.h ${tm_file} mips/elf.h vx-common.h vxworks.h mips/vxworks.h"
        tmake_file="${tmake_file} mips/t-vxworks"
        ;;
 mipstx39-*-elf* | mipstx39el-*-elf*)
        tmake_file="${tmake_file} mips/t-vxworks"
        ;;
 mipstx39-*-elf* | mipstx39el-*-elf*)
@@ -1969,7 +1974,7 @@ mmix-knuth-mmixware)
        use_gcc_stdint=wrap
        ;;
 mn10300-*-*)
        use_gcc_stdint=wrap
        ;;
 mn10300-*-*)
-       tm_file="dbxelf.h elfos.h svr4.h newlib-stdint.h ${tm_file}"
+       tm_file="dbxelf.h elfos.h newlib-stdint.h ${tm_file}"
        if test x$stabs = xyes
        then
                tm_file="${tm_file} dbx.h"
        if test x$stabs = xyes
        then
                tm_file="${tm_file} dbx.h"
@@ -2157,7 +2162,6 @@ powerpc-*-lynxos*)
        tmake_file="t-lynx rs6000/t-lynx"
        extra_options="${extra_options} rs6000/sysv4.opt lynx.opt"
        extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
        tmake_file="t-lynx rs6000/t-lynx"
        extra_options="${extra_options} rs6000/sysv4.opt lynx.opt"
        extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-       extra_options="${extra_options} lynx.opt"
        thread_file=lynx
        gnu_ld=yes
        gas=yes
        thread_file=lynx
        gnu_ld=yes
        gas=yes
@@ -2225,14 +2229,14 @@ rs6000-ibm-aix[6789].* | powerpc-ibm-aix[6789].*)
        extra_headers=altivec.h
        ;;
 rx-*-elf*)
        extra_headers=altivec.h
        ;;
 rx-*-elf*)
-       tm_file="dbxelf.h elfos.h svr4.h newlib-stdint.h ${tm_file} ../../libgcc/config/rx/rx-abi.h"
+       tm_file="dbxelf.h elfos.h newlib-stdint.h ${tm_file} ../../libgcc/config/rx/rx-abi.h"
        tmake_file="${tmake_file} rx/t-rx"
        ;;
 s390-*-linux*)
        tmake_file="${tmake_file} rx/t-rx"
        ;;
 s390-*-linux*)
-       tm_file="s390/s390.h dbxelf.h elfos.h svr4.h linux.h glibc-stdint.h s390/linux.h"
+       tm_file="s390/s390.h dbxelf.h elfos.h linux.h glibc-stdint.h s390/linux.h"
        ;;
 s390x-*-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"
+       tm_file="s390/s390x.h s390/s390.h dbxelf.h elfos.h linux.h glibc-stdint.h s390/linux.h"
        tm_p_file=s390/s390-protos.h
        md_file=s390/s390.md
        extra_modes=s390/s390-modes.def
        tm_p_file=s390/s390-protos.h
        md_file=s390/s390.md
        extra_modes=s390/s390-modes.def
@@ -2240,7 +2244,7 @@ s390x-*-linux*)
        tmake_file="${tmake_file} s390/t-linux64"
        ;;
 s390x-ibm-tpf*)
        tmake_file="${tmake_file} s390/t-linux64"
        ;;
 s390x-ibm-tpf*)
-        tm_file="s390/s390x.h s390/s390.h dbxelf.h elfos.h svr4.h s390/tpf.h"
+        tm_file="s390/s390x.h s390/s390.h dbxelf.h elfos.h s390/tpf.h"
         tm_p_file=s390/s390-protos.h
         md_file=s390/s390.md
         extra_modes=s390/s390-modes.def
         tm_p_file=s390/s390-protos.h
         md_file=s390/s390.md
         extra_modes=s390/s390-modes.def
@@ -2284,12 +2288,7 @@ sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
        case ${with_endian} in
        little*)        tm_file="sh/little.h ${tm_file}" ;;
        esac
        case ${with_endian} in
        little*)        tm_file="sh/little.h ${tm_file}" ;;
        esac
-       tm_file="${tm_file} dbxelf.h elfos.h"
-       case ${target} in
-       sh*-*-netbsd*)  ;;
-       *)              tm_file="${tm_file} svr4.h" ;;
-       esac
-       tm_file="${tm_file} sh/elf.h"
+       tm_file="${tm_file} dbxelf.h elfos.h sh/elf.h"
        case ${target} in
        sh*-*-linux*)   tmake_file="${tmake_file} sh/t-linux"
                        tm_file="${tm_file} linux.h glibc-stdint.h sh/linux.h" ;;
        case ${target} in
        sh*-*-linux*)   tmake_file="${tmake_file} sh/t-linux"
                        tm_file="${tm_file} linux.h glibc-stdint.h sh/linux.h" ;;
@@ -2443,32 +2442,47 @@ sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
        ;;
 sh-*-rtems*)
        tmake_file="sh/t-sh sh/t-elf t-rtems sh/t-rtems"
        ;;
 sh-*-rtems*)
        tmake_file="sh/t-sh sh/t-elf t-rtems sh/t-rtems"
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sh/elf.h sh/embed-elf.h sh/rtemself.h rtems.h newlib-stdint.h"
+       tm_file="${tm_file} dbxelf.h elfos.h sh/elf.h sh/embed-elf.h sh/rtemself.h rtems.h newlib-stdint.h"
        ;;
 sh-wrs-vxworks)
        tmake_file="$tmake_file sh/t-sh sh/t-elf sh/t-vxworks"
        ;;
 sh-wrs-vxworks)
        tmake_file="$tmake_file sh/t-sh sh/t-elf sh/t-vxworks"
-       tm_file="${tm_file} elfos.h svr4.h sh/elf.h sh/embed-elf.h vx-common.h vxworks.h sh/vxworks.h"
-       ;;
-sparc-*-netbsdelf*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h netbsd.h netbsd-elf.h sparc/netbsd-elf.h"
-       extra_options="${extra_options} sparc/long-double-switch.opt"
-       ;;
-sparc64-*-openbsd*)
-       tm_file="sparc/openbsd1-64.h ${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/sp64-elf.h"
-       tm_file="${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
+       tm_file="${tm_file} elfos.h sh/elf.h sh/embed-elf.h vx-common.h vxworks.h sh/vxworks.h"
        ;;
 sparc-*-elf*)
        ;;
 sparc-*-elf*)
-       tm_file="${tm_file} dbxelf.h elfos.h newlib-stdint.h svr4.h sparc/sysv4.h sparc/sp-elf.h"
-       tmake_file="sparc/t-elf sparc/t-crtfm"
-       extra_parts="crti.o crtn.o crtbegin.o crtend.o"
+       tm_file="${tm_file} dbxelf.h elfos.h newlib-stdint.h sparc/sysv4.h sparc/sp-elf.h"
+       case ${target} in
+           *-leon-*)
+               tmake_file="sparc/t-leon"
+               ;;
+           *-leon[3-9]*)
+               tmake_file="sparc/t-leon3"
+               ;;
+           *)
+               tmake_file="sparc/t-elf"
+               ;;
+       esac
+       tmake_file="${tmake_file} sparc/t-crtfm"
+       extra_parts="crtbegin.o crtend.o"
        ;;
        ;;
-sparc-*-linux*)                # SPARC's running GNU/Linux, libc6
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h linux.h glibc-stdint.h"
+sparc-*-rtems*)
+       tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h sparc/sp-elf.h sparc/rtemself.h rtems.h newlib-stdint.h"
+       tmake_file="sparc/t-elf sparc/t-crtfm t-rtems"
+       extra_parts="crtbegin.o crtend.o"
+       ;;
+sparc-*-linux*)
+       tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h linux.h glibc-stdint.h"
        extra_options="${extra_options} sparc/long-double-switch.opt"
        extra_options="${extra_options} sparc/long-double-switch.opt"
-       tmake_file="${tmake_file} sparc/t-linux"
+       case ${target} in
+           *-leon-*)
+               tmake_file="${tmake_file} sparc/t-leon"
+               ;;
+           *-leon[3-9]*)
+               tmake_file="${tmake_file} sparc/t-leon3"
+               ;;
+           *)
+               tmake_file="${tmake_file} sparc/t-linux"
+               ;;
+       esac
        if test x$enable_targets = xall; then
                tm_file="sparc/biarch64.h ${tm_file} sparc/linux64.h"
                tmake_file="${tmake_file} sparc/t-linux64"
        if test x$enable_targets = xall; then
                tm_file="sparc/biarch64.h ${tm_file} sparc/linux64.h"
                tmake_file="${tmake_file} sparc/t-linux64"
@@ -2477,19 +2491,12 @@ sparc-*-linux*)         # SPARC's running GNU/Linux, libc6
        fi
        tmake_file="${tmake_file} sparc/t-crtfm"
        ;;
        fi
        tmake_file="${tmake_file} sparc/t-crtfm"
        ;;
-sparc-*-rtems*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/sp-elf.h sparc/rtemself.h rtems.h newlib-stdint.h"
-       tmake_file="sparc/t-elf sparc/t-crtfm t-rtems"
-       extra_parts="crti.o crtn.o crtbegin.o crtend.o"
-       ;;
-sparc64-*-rtems*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h newlib-stdint.h sparc/sysv4.h sparc/sp64-elf.h sparc/rtemself.h rtems.h"
-       extra_options="${extra_options} sparc/little-endian.opt"
-       tmake_file="${tmake_file} sparc/t-crtfm t-rtems"
-       extra_parts="crtbegin.o crtend.o"
+sparc-*-netbsdelf*)
+       tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h netbsd.h netbsd-elf.h sparc/netbsd-elf.h"
+       extra_options="${extra_options} sparc/long-double-switch.opt"
        ;;
 sparc*-*-solaris2*)
        ;;
 sparc*-*-solaris2*)
-       tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h"
+       tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h sparc/sysv4.h sol2.h"
        case ${target} in
            *-*-solaris2.1[0-9]*)
                tm_file="${tm_file} sol2-10.h"
        case ${target} in
            *-*-solaris2.1[0-9]*)
                tm_file="${tm_file} sol2-10.h"
@@ -2540,15 +2547,26 @@ sparc*-*-solaris2*)
        esac
        ;;
 sparc-wrs-vxworks)
        esac
        ;;
 sparc-wrs-vxworks)
-       tm_file="${tm_file} elfos.h svr4.h sparc/sysv4.h vx-common.h vxworks.h sparc/vxworks.h"
+       tm_file="${tm_file} elfos.h sparc/sysv4.h vx-common.h vxworks.h sparc/vxworks.h"
        tmake_file="${tmake_file} sparc/t-vxworks"
        ;;
 sparc64-*-elf*)
        tmake_file="${tmake_file} sparc/t-vxworks"
        ;;
 sparc64-*-elf*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h newlib-stdint.h sparc/sysv4.h sparc/sp64-elf.h"
+       tm_file="${tm_file} dbxelf.h elfos.h newlib-stdint.h sparc/sysv4.h sparc/sp64-elf.h"
        extra_options="${extra_options} sparc/little-endian.opt"
        tmake_file="${tmake_file} sparc/t-crtfm"
        extra_parts="crtbegin.o crtend.o"
        ;;
        extra_options="${extra_options} sparc/little-endian.opt"
        tmake_file="${tmake_file} sparc/t-crtfm"
        extra_parts="crtbegin.o crtend.o"
        ;;
+sparc64-*-rtems*)
+       tm_file="${tm_file} dbxelf.h elfos.h 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"
+       ;;
+sparc64-*-linux*)
+       tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h sparc/sysv4.h linux.h glibc-stdint.h sparc/linux64.h"
+       extra_options="${extra_options} sparc/long-double-switch.opt"
+       tmake_file="${tmake_file} sparc/t-linux sparc/t-linux64 sparc/t-crtfm"
+       ;;
 sparc64-*-freebsd*|ultrasparc-*-freebsd*)
        tm_file="${tm_file} ${fbsd_tm_file} dbxelf.h elfos.h sparc/sysv4.h sparc/freebsd.h"
        extra_options="${extra_options} sparc/long-double-switch.opt"
 sparc64-*-freebsd*|ultrasparc-*-freebsd*)
        tm_file="${tm_file} ${fbsd_tm_file} dbxelf.h elfos.h sparc/sysv4.h sparc/freebsd.h"
        extra_options="${extra_options} sparc/long-double-switch.opt"
@@ -2559,17 +2577,19 @@ sparc64-*-freebsd*|ultrasparc-*-freebsd*)
                *) echo "$with_cpu not supported for freebsd target"; exit 1 ;;
        esac
        ;;
                *) echo "$with_cpu not supported for freebsd target"; exit 1 ;;
        esac
        ;;
-sparc64-*-linux*)              # 64-bit SPARC's running GNU/Linux
-       tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h linux.h glibc-stdint.h sparc/linux64.h"
-       extra_options="${extra_options} sparc/long-double-switch.opt"
-       tmake_file="${tmake_file} sparc/t-linux sparc/t-linux64 sparc/t-crtfm"
-       ;;
 sparc64-*-netbsd*)
        tm_file="sparc/biarch64.h ${tm_file}"
 sparc64-*-netbsd*)
        tm_file="sparc/biarch64.h ${tm_file}"
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h netbsd.h netbsd-elf.h sparc/netbsd-elf.h"
+       tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h netbsd.h netbsd-elf.h sparc/netbsd-elf.h"
        extra_options="${extra_options} sparc/long-double-switch.opt"
        tmake_file="${tmake_file} sparc/t-netbsd64"
        ;;
        extra_options="${extra_options} sparc/long-double-switch.opt"
        tmake_file="${tmake_file} sparc/t-netbsd64"
        ;;
+sparc64-*-openbsd*)
+       tm_file="sparc/openbsd1-64.h ${tm_file} dbxelf.h elfos.h 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
+       ;;
 spu-*-elf*)
        tm_file="dbxelf.h elfos.h spu/spu-elf.h spu/spu.h newlib-stdint.h"
        tmake_file="spu/t-spu-elf"
 spu-*-elf*)
        tm_file="dbxelf.h elfos.h spu/spu-elf.h spu/spu.h newlib-stdint.h"
        tmake_file="spu/t-spu-elf"
@@ -2580,7 +2600,7 @@ spu-*-elf*)
        ;;
 v850e1-*-*)
        target_cpu_default="TARGET_CPU_v850e1"
        ;;
 v850e1-*-*)
        target_cpu_default="TARGET_CPU_v850e1"
-       tm_file="dbxelf.h elfos.h svr4.h newlib-stdint.h v850/v850.h"
+       tm_file="dbxelf.h elfos.h newlib-stdint.h v850/v850.h"
        tm_p_file=v850/v850-protos.h
        tmake_file=v850/t-v850e
        md_file=v850/v850.md
        tm_p_file=v850/v850-protos.h
        tmake_file=v850/t-v850e
        md_file=v850/v850.md
@@ -2598,7 +2618,7 @@ v850e1-*-*)
        ;;
 v850e-*-*)
        target_cpu_default="TARGET_CPU_v850e"
        ;;
 v850e-*-*)
        target_cpu_default="TARGET_CPU_v850e"
-       tm_file="dbxelf.h elfos.h svr4.h newlib-stdint.h v850/v850.h"
+       tm_file="dbxelf.h elfos.h newlib-stdint.h v850/v850.h"
        tm_p_file=v850/v850-protos.h
        tmake_file=v850/t-v850e
        md_file=v850/v850.md
        tm_p_file=v850/v850-protos.h
        tmake_file=v850/t-v850e
        md_file=v850/v850.md
@@ -2616,7 +2636,7 @@ v850e-*-*)
        ;;
 v850-*-*)
        target_cpu_default="TARGET_CPU_generic"
        ;;
 v850-*-*)
        target_cpu_default="TARGET_CPU_generic"
-       tm_file="dbxelf.h elfos.h svr4.h newlib-stdint.h ${tm_file}"
+       tm_file="dbxelf.h elfos.h newlib-stdint.h ${tm_file}"
        tmake_file=v850/t-v850
        if test x$stabs = xyes
        then
        tmake_file=v850/t-v850
        if test x$stabs = xyes
        then
@@ -2628,7 +2648,7 @@ v850-*-*)
        use_gcc_stdint=wrap
        ;;
 vax-*-linux*)
        use_gcc_stdint=wrap
        ;;
 vax-*-linux*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h vax/elf.h vax/linux.h"
+       tm_file="${tm_file} dbxelf.h elfos.h linux.h vax/elf.h vax/linux.h"
        tmake_file="${tmake_file} vax/t-linux"
        ;;
 vax-*-netbsdelf*)
        tmake_file="${tmake_file} vax/t-linux"
        ;;
 vax-*-netbsdelf*)
@@ -2646,7 +2666,7 @@ vax-*-openbsd*)
        ;;
 xstormy16-*-elf)
        # For historical reasons, the target files omit the 'x'.
        ;;
 xstormy16-*-elf)
        # For historical reasons, the target files omit the 'x'.
-       tm_file="dbxelf.h elfos.h svr4.h newlib-stdint.h stormy16/stormy16.h"
+       tm_file="dbxelf.h elfos.h newlib-stdint.h stormy16/stormy16.h"
        tm_p_file=stormy16/stormy16-protos.h
        md_file=stormy16/stormy16.md
        out_file=stormy16/stormy16.c
        tm_p_file=stormy16/stormy16-protos.h
        md_file=stormy16/stormy16.md
        out_file=stormy16/stormy16.c
@@ -2655,11 +2675,11 @@ xstormy16-*-elf)
        extra_parts="crtbegin.o crtend.o"
        ;;
 xtensa*-*-elf*)
        extra_parts="crtbegin.o crtend.o"
        ;;
 xtensa*-*-elf*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h newlib-stdint.h xtensa/elf.h"
+       tm_file="${tm_file} dbxelf.h elfos.h newlib-stdint.h xtensa/elf.h"
        tmake_file="xtensa/t-xtensa xtensa/t-elf"
        ;;
 xtensa*-*-linux*)
        tmake_file="xtensa/t-xtensa xtensa/t-elf"
        ;;
 xtensa*-*-linux*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h glibc-stdint.h xtensa/linux.h"
+       tm_file="${tm_file} dbxelf.h elfos.h linux.h glibc-stdint.h xtensa/linux.h"
        tmake_file="${tmake_file} xtensa/t-xtensa xtensa/t-linux"
        ;;
 am33_2.0-*-linux*)
        tmake_file="${tmake_file} xtensa/t-xtensa xtensa/t-linux"
        ;;
 am33_2.0-*-linux*)
@@ -2670,13 +2690,13 @@ am33_2.0-*-linux*)
        use_collect2=no
        ;;
 m32c-*-rtems*)
        use_collect2=no
        ;;
 m32c-*-rtems*)
-       tm_file="dbxelf.h elfos.h svr4.h ${tm_file} m32c/rtems.h rtems.h newlib-stdint.h"
+       tm_file="dbxelf.h elfos.h ${tm_file} m32c/rtems.h rtems.h newlib-stdint.h"
        tmake_file="${tmake_file} t-rtems"
        c_target_objs="m32c-pragma.o"
        cxx_target_objs="m32c-pragma.o"
        ;;
 m32c-*-elf*)
        tmake_file="${tmake_file} t-rtems"
        c_target_objs="m32c-pragma.o"
        cxx_target_objs="m32c-pragma.o"
        ;;
 m32c-*-elf*)
-       tm_file="dbxelf.h elfos.h svr4.h newlib-stdint.h ${tm_file}"
+       tm_file="dbxelf.h elfos.h newlib-stdint.h ${tm_file}"
        c_target_objs="m32c-pragma.o"
        cxx_target_objs="m32c-pragma.o"
        ;;
        c_target_objs="m32c-pragma.o"
        cxx_target_objs="m32c-pragma.o"
        ;;
@@ -2815,6 +2835,14 @@ case ${target} in
        arch=core2
        cpu=core2
        ;;
        arch=core2
        cpu=core2
        ;;
+      corei7-*)
+       arch=corei7
+       cpu=corei7
+       ;;
+      corei7_avx-*)
+       arch=corei7-avx
+       cpu=corei7-avx
+       ;;
       pentium_m-*)
        arch=pentium-m
        cpu=pentium-m
       pentium_m-*)
        arch=pentium-m
        cpu=pentium-m
@@ -2862,6 +2890,10 @@ case ${target} in
        arch=core2
        cpu=core2
        ;;
        arch=core2
        cpu=core2
        ;;
+      corei7-*)
+       arch=corei7
+       cpu=corei7
+       ;;
       *)
        arch=x86-64
        cpu=generic
       *)
        arch=x86-64
        cpu=generic
@@ -2911,6 +2943,9 @@ if test x$with_cpu = x ; then
     mips*-*-vxworks)
       with_arch=mips2
       ;;
     mips*-*-vxworks)
       with_arch=mips2
       ;;
+    sparc-leon*-*)
+      with_cpu=v8;
+      ;;
     sparc*-*-*)
       with_cpu="`echo ${target} | sed 's/-.*$//'`"
       ;;
     sparc*-*-*)
       with_cpu="`echo ${target} | sed 's/-.*$//'`"
       ;;
@@ -3248,7 +3283,7 @@ case "${target}" in
                        "" | x86-64 | generic | native \
                        | k8 | k8-sse3 | athlon64 | athlon64-sse3 | opteron \
                        | opteron-sse3 | athlon-fx | bdver1 | amdfam10 \
                        "" | x86-64 | generic | native \
                        | k8 | k8-sse3 | athlon64 | athlon64-sse3 | opteron \
                        | opteron-sse3 | athlon-fx | bdver1 | amdfam10 \
-                       | barcelona | nocona | core2 | atom)
+                       | barcelona | nocona | core2 | corei7 | corei7-avx | atom)
                                # OK
                                ;;
                        *)
                                # OK
                                ;;
                        *)
@@ -3430,9 +3465,11 @@ case "${target}" in
                for which in cpu tune; do
                        eval "val=\$with_$which"
                        case ${val} in
                for which in cpu tune; do
                        eval "val=\$with_$which"
                        case ${val} in
-                       "" | sparc | sparcv9 | sparc64 | sparc86x \
-                       | v7 | cypress | v8 | supersparc | sparclite | f930 \
-                       | f934 | hypersparc | sparclite86x | sparclet | tsc701 \
+                       "" | sparc | sparcv9 | sparc64 \
+                       | v7 | cypress \
+                       | v8 | supersparc | hypersparc | leon \
+                       | sparclite | f930 | f934 | sparclite86x \
+                       | sparclet | tsc701 \
                        | v9 | ultrasparc | ultrasparc3 | niagara | niagara2)
                                # OK
                                ;;
                        | v9 | ultrasparc | ultrasparc3 | niagara | niagara2)
                                # OK
                                ;;
@@ -3550,13 +3587,7 @@ case ${target} in
                                tm_defines="TARGET_ENDIAN_DEFAULT=0 $tm_defines"
                                ;;
                esac
                                tm_defines="TARGET_ENDIAN_DEFAULT=0 $tm_defines"
                                ;;
                esac
-               if test "x$enable_gofast" = xyes
-               then
-                       tm_defines="US_SOFTWARE_GOFAST $tm_defines"
-                       tmake_file="mips/t-gofast $tmake_file"
-               else
-                       tmake_file="mips/t-mips $tmake_file"
-               fi
+               tmake_file="mips/t-mips $tmake_file"
                ;;
 
        powerpc*-*-* | rs6000-*-*)
                ;;
 
        powerpc*-*-* | rs6000-*-*)
@@ -3582,6 +3613,15 @@ case ${target} in
                cxx_target_objs="${cxx_target_objs} sh-c.o"
                ;;
 
                cxx_target_objs="${cxx_target_objs} sh-c.o"
                ;;
 
+       sparc-leon*-*)
+               if test x$with_tune = x ; then
+                 with_tune=leon;
+               fi
+
+               # The SPARC port checks this value at compile-time.
+               target_cpu_default2="TARGET_CPU_$with_cpu"
+               ;;
+
        sparc*-*-*)
                # Some standard aliases.
                case x$with_cpu in
        sparc*-*-*)
                # Some standard aliases.
                case x$with_cpu in
@@ -3596,6 +3636,7 @@ case ${target} in
                # The SPARC port checks this value at compile-time.
                target_cpu_default2="TARGET_CPU_$with_cpu"
                ;;
                # The SPARC port checks this value at compile-time.
                target_cpu_default2="TARGET_CPU_$with_cpu"
                ;;
+
        v850*-*-*)
                # FIXME: The v850 is "special" in that it does not support
                # runtime CPU selection, only --with-cpu.
        v850*-*-*)
                # FIXME: The v850 is "special" in that it does not support
                # runtime CPU selection, only --with-cpu.