OSDN Git Service

* config.gcc: Delete powerpcle-*-solaris2* stanza.
[pf3gnuchains/gcc-fork.git] / gcc / config.gcc
index d501991..68417af 100644 (file)
 #  cpu_type            The name of the cpu, if different from machine.
 #
 #  tm_file             A list of target macro files, if different from
-#                      "$cpu_type/$cpu_type.h".
+#                      "$cpu_type/$cpu_type.h". Usually it's constructed
+#                      per target in a way like this:
+#                      tm_file="${tm_file} elfos.h svr4.h ${cpu_type.h}/elf.h"
+#                      Note that the preferred order is:
+#                      - specific target header "${cpu_type}/${cpu_type.h}"
+#                      - generic headers like elfos.h, netware.h, etc.
+#                      - specializing target headers like ${cpu_type.h}/elf.h
+#                      This helps to keep OS specific stuff out of the CPU
+#                      defining header ${cpu_type}/${cpu_type.h}.
 #
 #  tm_p_file           Location of file with declarations for functions
 #                      in $out_file.
 #
 #  extra_programs      Like extra_passes, but these are used when linking.
 #
-#  host_extra_objs     List of extra host-dependant objects that should
+#  host_extra_objs     List of extra host-dependent objects that should
 #                      be linked into the compiler proper.
 #
-#  host_extra_gcc_objs List of extra host-dependant objects that should
+#  host_extra_gcc_objs List of extra host-dependent objects that should
 #                      be linked into the gcc driver.
 #
-#  c_target_objs       List of extra target-dependant objects that be
+#  c_target_objs       List of extra target-dependent objects that be
 #                      linked into the C compiler only.
 #
-#  cxx_target_objs     List of extra target-dependant objects that be
+#  cxx_target_objs     List of extra target-dependent objects that be
 #                      linked into the C++ compiler only.
 #
 #  build_xm_defines    List of macros to define when compiling for the
@@ -222,10 +230,13 @@ c*-convex-*)
 i[34567]86-*-*)
        cpu_type=i386
        ;;
+x86_64-*-*)
+       cpu_type=i386
+       ;;
 hppa*-*-* | parisc*-*-*)
        cpu_type=pa
        ;;
-m68000-*-*)
+m680[02]0-*-*)
        cpu_type=m68k
        ;;
 mips*-*-*)
@@ -272,15 +283,11 @@ case $machine in
        gnu_ld=yes
        gas=yes
        # These details are the same as for Linux.
-       xmake_file=x-linux
        # But here we need a little extra magic.
        tmake_file="t-slibgcc-elf-ver t-linux t-gnu"
        case $machine in
        i[34567]86-*-*)
-               tm_file="${cpu_type}/${cpu_type}.h i386/att.h linux.h i386/linux.h gnu.h ${tm_file}"
-               ;;
-       mips*-*-*)
-               tm_file="svr4.h ${cpu_type}/${cpu_type}.h ${tm_file}"
+               tm_file="${cpu_type}/${cpu_type}.h i386/att.h elfos.h svr4.h linux.h i386/linux.h gnu.h ${tm_file}"
                ;;
        esac
        ;;
@@ -313,7 +320,7 @@ case $machine in
        # entries of tm_file with the minor exception that components
        # of the tm_file set here will always be of the form:
        #
-       # freebsd<version_number>.h [freebsd-<conf_option>.h ...] freebsd.h
+       # freebsd<version_number>.h [freebsd-<conf_option>.h ...] freebsd-spec.h freebsd.h
        #
        # The machine-specific section should not tamper with this
        # ordering but may order all other entries of tm_file as it
@@ -329,6 +336,7 @@ case $machine in
        *) echo 'Please update *-*-freebsd* in gcc/config.gcc'; exit 1;;
        esac
        tmake_file=t-freebsd
+       xmake_file=none
        xm_defines=POSIX
        case x${enable_threads} in
        xno) fbsd_tm_file="${fbsd_tm_file} freebsd-nthr.h";;
@@ -338,16 +346,7 @@ case $machine in
                ;;
        *) echo 'Unknown thread configuration for FreeBSD'; exit 1;;
        esac
-       fbsd_tm_file="${fbsd_tm_file} freebsd.h"
-       if test x${thread_file} = xposix; then
-         if test x${enable_libgcj} = xyes; then
-           echo 'FreeBSD does not currently handle --enable-threads (now'
-           echo 'the default to match system compiler) and --enable-libgcj.'
-           echo 'Please explicitly configure with --disable-threads or'
-           echo '--disable-libgcj'
-           exit 1
-         fi
-       fi
+       fbsd_tm_file="${fbsd_tm_file} freebsd-spec.h freebsd.h"
        ;;
 esac
 
@@ -417,8 +416,7 @@ alpha-*-interix)
 
        xm_defines=POSIX
        xm_file="alpha/xm-alpha-interix.h xm-interix.h"
-       xmake_file=x-interix
-       tmake_file="alpha/t-alpha alpha/t-interix alpha/t-ieee"
+       tmake_file="alpha/t-alpha t-interix alpha/t-interix alpha/t-ieee"
        if test x$enable_threads = xyes ; then
                thread_file='posix'
        fi
@@ -528,55 +526,54 @@ alpha*-dec-vms*)
        tmake_file="alpha/t-alpha alpha/t-vms alpha/t-ieee"
        ;;
 arc-*-elf*)
+       tm_file="elfos.h svr4.h ${tm_file}"
        extra_parts="crtinit.o crtfini.o"
        ;;
 arm*-*-rtems*)
-       tm_file="elfos.h arm/unknown-elf.h arm/elf.h arm/rtems-elf.h rtems.h"
+       tm_file="elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h arm/rtems-elf.h rtems.h"
        tmake_file="arm/t-arm-elf t-rtems"
        if test x$enable_threads = xyes; then
          thread_file='rtems'
        fi
        ;;
 arm-*-coff* | armel-*-coff*)
-       tm_file=arm/coff.h
+       tm_file="arm/semi.h arm/aout.h arm/arm.h arm/coff.h"
        tmake_file=arm/t-arm-coff
        ;;
 arm-*-vxworks*)
-       tm_file=arm/vxarm.h
+       tm_file="arm/semi.h arm/aout.h arm/coff.h arm/vxarm.h arm/arm.h"
        tmake_file=arm/t-arm-coff
        thread_file='vxworks'
        ;;
 arm-*-riscix1.[01]*)           # Acorn RISC machine (early versions)
-       tm_file=arm/riscix1-1.h
+       tm_file="arm/riscix1-1.h arm/arm.h"
        use_collect2=yes
        ;;
 arm-*-riscix*)                 # Acorn RISC machine
        if test x$gas = xyes
        then
-           tm_file=arm/rix-gas.h
+           tm_file="arm/riscix.h arm/rix-gas.h arm/arm.h"
        else
-           tm_file=arm/riscix.h
+           tm_file="arm/riscix.h arm/arm.h"
        fi
-       xmake_file=arm/x-riscix
        tmake_file=arm/t-riscix
        use_collect2=yes
        ;;
 arm-semi-aout | armel-semi-aout)
-       tm_file=arm/semi.h
+       tm_file="arm/semi.h arm/aout.h arm/arm.h"
        tmake_file=arm/t-semi
        ;;
 arm-semi-aof | armel-semi-aof)
-       tm_file=arm/semiaof.h
+       tm_file="arm/semiaof.h arm/aof.h arm/arm.h"
        tmake_file=arm/t-semi
        ;;
 arm*-*-netbsd*)
-       tm_file=arm/netbsd.h
+       tm_file="arm/aout.h arm/arm.h netbsd.h arm/netbsd.h"
        tmake_file="t-netbsd arm/t-netbsd"
        use_collect2=yes
        ;;
 arm*-*-linux*)                 # ARM GNU/Linux with ELF
-       xmake_file=x-linux
-       tm_file="elfos.h arm/unknown-elf.h arm/elf.h arm/linux-gas.h arm/linux-elf.h"
+       tm_file="elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h arm/linux-gas.h arm/linux-elf.h"
        tmake_file="t-slibgcc-elf-ver t-linux arm/t-linux"
        extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
        gnu_ld=yes
@@ -587,31 +584,31 @@ arm*-*-linux*)                    # ARM GNU/Linux with ELF
        esac
        ;;
 arm*-*-uclinux*)               # ARM ucLinux
-       tm_file="elfos.h arm/unknown-elf.h arm/elf.h arm/linux-gas.h arm/linux-elf.h arm/uclinux-elf.h"
+       tm_file="elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h arm/linux-gas.h arm/linux-elf.h arm/uclinux-elf.h"
        tmake_file=arm/t-arm-elf
        ;;
 arm*-*-aout)
-       tm_file=arm/aout.h
+       tm_file="arm/aout.h arm/arm.h"
        tmake_file=arm/t-arm-aout
        ;;
 arm*-*-ecos-elf)
-       tm_file="elfos.h arm/unknown-elf.h arm/elf.h arm/ecos-elf.h"
+       tm_file="elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h arm/ecos-elf.h"
        tmake_file=arm/t-arm-elf
        ;;
 arm*-*-elf)
-       tm_file="elfos.h arm/unknown-elf.h arm/elf.h"
+       tm_file="elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h"
        tmake_file=arm/t-arm-elf
        ;;
 arm*-*-conix*)
-       tm_file="elfos.h arm/unknown-elf.h arm/elf.h arm/conix-elf.h"
+       tm_file="elfos.h arm/unknown-elf.h arm/elf.h arm/conix-elf.h arm/aout.h arm/arm.h"
        tmake_file=arm/t-arm-elf
        ;;
 arm*-*-oabi)
-       tm_file="arm/unknown-elf-oabi.h elfos.h arm/unknown-elf.h arm/elf.h"
+       tm_file="arm/unknown-elf-oabi.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h"
        tmake_file=arm/t-arm-elf
        ;;
 arm-*-pe*)
-       tm_file=arm/pe.h
+       tm_file="arm/semi.h arm/aout.h arm/arm.h arm/coff.h arm/pe.h"
        tmake_file=arm/t-pe
        extra_objs="pe.o"
        ;;
@@ -638,26 +635,49 @@ c38-convex-*)
        use_collect2=yes
        ;;
 c4x-*-rtems*)
-       cpu_type=c4x
        tmake_file="c4x/t-c4x t-rtems"
        tm_file=c4x/rtems.h
        if test x$enable_threads = xyes; then
          thread_file='rtems'
        fi
+       c_target_objs="c4x-c.o"
+       cxx_target_objs="c4x-c.o"
        ;;
 c4x-*)
-       cpu_type=c4x
        float_format=c4x
        tmake_file=c4x/t-c4x
+       c_target_objs="c4x-c.o"
+       cxx_target_objs="c4x-c.o"
        ;;
 clipper-intergraph-clix*)
        tm_file="${tm_file} svr3.h clipper/clix.h"
        xm_defines=POSIX
-       extra_headers=va-clipper.h
        extra_parts="crtbegin.o crtend.o"
        install_headers_dir=install-headers-cpio
        ;;
+cris-*-aout)
+       tm_file="dbxelf.h ${tm_file} cris/aout.h"
+       gas=yes
+       tmake_file="cris/t-cris cris/t-aout"
+       ;;
+cris-*-elf | cris-*-none)
+       tm_file="elfos.h ${tm_file}"
+       tmake_file="cris/t-cris cris/t-elfmulti"
+       gas=yes
+       ;;
+cris-*-linux*)
+       tm_file="elfos.h svr4.h ${tm_file} linux.h cris/linux.h"
+       tmake_file="cris/t-cris t-slibgcc-elf-ver cris/t-linux"
+       extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
+       case x${enable_threads} in
+       x | xyes | xpthreads | xposix)
+               thread_file=posix
+               ;;
+       esac
+       gas=yes
+       ;;
 d30v-*)
+       tm_file="elfos.h svr4.h ${tm_file}"
        float_format=i64
        ;;
 dsp16xx-*)
@@ -666,7 +686,7 @@ elxsi-elxsi-*)
        use_collect2=yes
        ;;
 fr30-*-elf)
-       tm_file="fr30/fr30.h"
+       tm_file="elfos.h svr4.h ${tm_file}"
        tmake_file=fr30/t-fr30
        extra_parts="crti.o crtn.o crtbegin.o crtend.o"
        ;;
@@ -688,14 +708,14 @@ h8300-*-*)
        ;;
 hppa*64*-*-linux* | parisc*64*-*-linux*)
        target_cpu_default="(MASK_PA_11 | MASK_PA_20)"
-       tm_file="pa/pa64-start.h ${tm_file} linux.h pa/pa-linux.h \
+       tm_file="pa/pa64-start.h ${tm_file} elfos.h svr4.h linux.h pa/pa-linux.h \
                 pa/pa64-regs.h pa/pa-64.h pa/pa64-linux.h"
        tmake_file=pa/t-linux64
        gas=yes gnu_ld=yes
        ;;
 hppa*-*-linux* | parisc*-*-linux*)
        target_cpu_default="MASK_PA_11"
-       tm_file="${tm_file} linux.h pa/pa-linux.h \
+       tm_file="${tm_file} elfos.h svr4.h linux.h pa/pa-linux.h \
                 pa/pa32-regs.h pa/pa32-linux.h"
        tmake_file="t-slibgcc-elf-ver t-linux pa/t-linux"
        extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
@@ -706,54 +726,51 @@ hppa*-*-linux* | parisc*-*-linux*)
        ;;
 hppa*-*-openbsd*)
        target_cpu_default="MASK_PA_11"
-       tmake_file=pa/t-openbsd
-       ;;
-hppa1.1-*-rtems*)
-       tm_file="pa/pa-pro.h ${tm_file} pa/pa-pro-end.h libgloss.h pa/rtems.h"
-       tmake_file="pa/t-pro t-rtems"
-       if test x$enable_threads = xyes; then
-         thread_file='rtems'
-       fi
+       tmake_file=pa/t-bsd
        ;;
 hppa1.1-*-pro*)
        target_cpu_default="(MASK_JUMP_IN_DELAY | MASK_PORTABLE_RUNTIME | MASK_GAS | MASK_NO_SPACE_REGS | MASK_SOFT_FLOAT)"
        tm_file="${tm_file} pa/pa32-regs.h elfos.h pa/elf.h pa/pa-pro-end.h libgloss.h"
-       tmake_file=pa/t-pro
+       tmake_file="pa/t-bsd pa/t-pro"
        ;;
 hppa1.1-*-osf*)
        target_cpu_default="MASK_PA_11"
        tm_file="${tm_file} pa/pa32-regs.h pa/som.h pa/pa-osf.h"
+       tmake_file="pa/t-bsd pa/t-pa"
        use_collect2=yes
        ;;
 hppa1.1-*-rtems*)
        target_cpu_default="(MASK_JUMP_IN_DELAY | MASK_PORTABLE_RUNTIME | MASK_GAS | MASK_NO_SPACE_REGS | MASK_SOFT_FLOAT)"
        tm_file="${tm_file} pa/pa32-regs.h elfos.h pa/elf.h pa/pa-pro-end.h libgloss.h pa/rtems.h"
-       tmake_file=pa/t-pro
+       tmake_file="pa/t-bsd pa/t-pro"
        ;;
 hppa1.0-*-osf*)
        tm_file="${tm_file} pa/pa32-regs.h pa/som.h pa/pa-osf.h"
+       tmake_file="pa/t-bsd pa/t-pa"
        use_collect2=yes
        ;;
 hppa1.1-*-bsd*)
        tm_file="${tm_file} pa/pa32-regs.h pa/som.h"
        target_cpu_default="MASK_PA_11"
+       tmake_file="pa/t-bsd pa/t-pa"
        use_collect2=yes
        ;;
 hppa1.0-*-bsd*)
        tm_file="${tm_file} pa/pa32-regs.h pa/som.h"
+       tmake_file="pa/t-bsd pa/t-pa"
        use_collect2=yes
        ;;
 hppa1.0-*-hpux7*)
        tm_file="pa/pa-oldas.h ${tm_file} pa/pa32-regs.h pa/som.h pa/pa-hpux7.h"
        xm_defines=POSIX
-       xmake_file=pa/x-pa-hpux
+       tmake_file=pa/t-pa-hpux
        install_headers_dir=install-headers-cpio
        use_collect2=yes
        ;;
 hppa1.0-*-hpux8.0[0-2]*)
        tm_file="${tm_file} pa/pa32-regs.h pa/som.h pa/pa-hpux.h"
        xm_defines=POSIX
-       xmake_file=pa/x-pa-hpux
+       tmake_file=pa/t-pa-hpux
        if test x$gas != xyes
        then
                tm_file="pa/pa-oldas.h ${tm_file}"
@@ -765,7 +782,7 @@ hppa1.1-*-hpux8.0[0-2]*)
        target_cpu_default="MASK_PA_11"
        tm_file="${tm_file} pa/pa32-regs.h pa/som.h pa/pa-hpux.h"
        xm_defines=POSIX
-       xmake_file=pa/x-pa-hpux
+       tmake_file=pa/t-pa-hpux
        if test x$gas != xyes
        then
                tm_file="pa/pa-oldas.h ${tm_file}"
@@ -777,14 +794,14 @@ hppa1.1-*-hpux8*)
        target_cpu_default="MASK_PA_11"
        tm_file="${tm_file} pa/pa32-regs.h pa/som.h pa/pa-hpux.h"
        xm_defines=POSIX
-       xmake_file=pa/x-pa-hpux
+       tmake_file=pa/t-pa-hpux
        install_headers_dir=install-headers-cpio
        use_collect2=yes
        ;;
 hppa1.0-*-hpux8*)
        tm_file="${tm_file} pa/pa32-regs.h pa/som.h pa/pa-hpux.h"
        xm_defines=POSIX
-       xmake_file=pa/x-pa-hpux
+       tmake_file=pa/t-pa-hpux
        install_headers_dir=install-headers-cpio
        use_collect2=yes
        ;;
@@ -793,8 +810,7 @@ hppa1.1-*-hpux10* | hppa2*-*-hpux10*)
        tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h pa/som.h pa/pa-hpux.h pa/pa-hpux10.h"
        float_format=i128
        xm_defines=POSIX
-       xmake_file=pa/x-pa-hpux
-       tmake_file=pa/t-pa
+       tmake_file="pa/t-pa pa/t-pa-hpux"
        if test x$enable_threads = x; then
            enable_threads=$have_pthread_h
        fi
@@ -810,8 +826,7 @@ hppa1.0-*-hpux10*)
        tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h pa/som.h pa/pa-hpux.h pa/pa-hpux10.h"
        float_format=i128
        xm_defines=POSIX
-       xmake_file=pa/x-pa-hpux
-       tmake_file=pa/t-pa
+       tmake_file="pa/t-pa pa/t-pa-hpux"
        if test x$enable_threads = x; then
            enable_threads=$have_pthread_h
        fi
@@ -825,8 +840,7 @@ hppa1.0-*-hpux10*)
        ;;
 hppa*64*-*-hpux11*)
        xm_defines=POSIX
-       xmake_file=pa/x-pa-hpux
-       tmake_file=pa/t-pa
+       tmake_file="pa/t-pa pa/t-pa-hpux"
        tm_file="pa/pa64-start.h ${tm_file} pa/pa64-regs.h pa/long_double.h pa/elf.h pa/pa-hpux.h pa/pa-hpux11.h pa/pa-64.h pa/pa64-hpux.h"
        float_format=i128
        tmake_file=pa/t-pa64
@@ -847,8 +861,7 @@ hppa1.1-*-hpux11* | hppa2*-*-hpux11*)
        tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h pa/som.h pa/pa-hpux.h pa/pa-hpux11.h"
        float_format=i128
        xm_defines=POSIX
-       xmake_file=pa/x-pa-hpux
-       tmake_file=pa/t-pa
+       tmake_file="pa/t-pa pa/t-pa-hpux"
 #      if test x$enable_threads = x; then
 #          enable_threads=$have_pthread_h
 #      fi
@@ -863,7 +876,7 @@ hppa1.0-*-hpux11*)
        tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h pa/som.h pa/pa-hpux.h pa/pa-hpux11.h"
        float_format=i128
        xm_defines=POSIX
-       xmake_file=pa/x-pa-hpux
+       tmake_file=pa/t-pa-hpux
 #      if test x$enable_threads = x; then
 #          enable_threads=$have_pthread_h
 #      fi
@@ -878,14 +891,14 @@ hppa1.1-*-hpux* | hppa2*-*-hpux*)
        target_cpu_default="MASK_PA_11"
        tm_file="${tm_file} pa/pa32-regs.h pa/som.h pa/pa-hpux.h pa/pa-hpux9.h"
        xm_defines=POSIX
-       xmake_file=pa/x-pa-hpux
+       tmake_file=pa/t-pa-hpux
        install_headers_dir=install-headers-cpio
        use_collect2=yes
        ;;
 hppa1.0-*-hpux*)
        tm_file="${tm_file} pa/pa32-regs.h pa/som.h pa/pa-hpux.h pa/pa-hpux9.h"
        xm_defines=POSIX
-       xmake_file=pa/x-pa-hpux
+       tmake_file=pa/t-pa-hpux
        install_headers_dir=install-headers-cpio
        use_collect2=yes
        ;;
@@ -893,20 +906,21 @@ hppa1.1-*-hiux* | hppa2*-*-hiux*)
        target_cpu_default="MASK_PA_11"
        tm_file="${tm_file} pa/pa32-regs.h pa/som.h pa/pa-hpux.h pa/pa-hiux.h"
        xm_defines=POSIX
-       xmake_file=pa/x-pa-hpux
+       tmake_file=pa/t-pa-hpux
        install_headers_dir=install-headers-cpio
        use_collect2=yes
        ;;
 hppa1.0-*-hiux*)
        tm_file="${tm_file} pa/pa32-regs.h pa/som.h pa/pa-hpux.h pa/pa-hiux.h"
        xm_defines=POSIX
-       xmake_file=pa/x-pa-hpux
+       tmake_file=pa/t-pa-hpux
        install_headers_dir=install-headers-cpio
        use_collect2=yes
        ;;
 hppa*-*-lites*)
        tm_file="${tm_file} pa/pa32-regs.h elfos.h pa/elf.h"
        target_cpu_default="MASK_PA_11"
+       tmake_file="pa/t-bsd pa/t-pa"
        use_collect2=yes
        ;;
 hppa*-*-mpeix*)
@@ -920,15 +934,19 @@ hppa*-*-mpeix*)
 i370-*-opened*)                         # IBM 360/370/390 Architecture
        xm_defines='POSIX FATAL_EXIT_CODE=12'
        tm_file=i370/oe.h
-       xmake_file=i370/x-oe
+       tmake_file="i370/t-oe i370/t-i370"
+       c_target_objs="i370-c.o"
+       cxx_target_objs="i370-c.o"
        ;;
 i370-*-mvs*)
        xm_defines='POSIX FATAL_EXIT_CODE=12'
        tm_file=i370/mvs.h
+       tmake_file="i370/t-i370"
+       c_target_objs="i370-c.o"
+       cxx_target_objs="i370-c.o"
        ;;
 i370-*-linux*)
-       xmake_file=x-linux
-       tm_file="i370/linux.h ${tm_file}"
+       tm_file="elfos.h svr4.h linux.h i370/linux.h ${tm_file}"
        tmake_file="t-slibgcc-elf-ver t-linux"
        # broken_install=yes
        extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
@@ -942,9 +960,8 @@ i370-*-linux*)
        ;;
 i[34567]86-*-chorusos*)
        xm_defines=POSIX
-       tm_file="i386/i386.h i386/att.h elfos.h i386/i386elf.h chorus.h"
-       tmake_file=i386/t-i386elf
-       xmake_file=x-svr4
+       tm_file="${tm_file} i386/att.h elfos.h i386/i386elf.h chorus.h"
+       tmake_file="i386/t-i386elf t-svr4"
        case x${enable_threads} in
          xyes | xpthreads | xposix)
                thread_file='posix'
@@ -953,9 +970,8 @@ i[34567]86-*-chorusos*)
        ;;
 i[34567]86-*-elf*)
        xm_defines=POSIX
-       tm_file="i386/i386.h i386/att.h elfos.h i386/i386elf.h"
-       tmake_file=i386/t-i386elf
-       xmake_file=x-svr4
+       tm_file="${tm_file} i386/att.h elfos.h i386/i386elf.h"
+       tmake_file="i386/t-i386elf t-svr4"
        ;;
 i[34567]86-ibm-aix*)           # IBM PS/2 running AIX
         if test x$gas = xyes
@@ -975,7 +991,7 @@ i[34567]86-ncr-sysv4*)              # NCR 3000 - ix86 running system V.4
        then
                tm_file=i386/sysv4gdb.h
        else
-               tm_file=i386/sysv4.h
+               tm_file="${tm_file} i386/att.h elfos.h svr4.h i386/sysv4.h"
        fi
        extra_parts="crtbegin.o crtend.o"
        tmake_file=i386/t-crtpic
@@ -990,7 +1006,7 @@ i[34567]86-next-*)
        fi
        ;;
 i[34567]86-*-netware)          # Intel 80386's running netware
-       tm_file=i386/netware.h
+       tm_file="${tm_file} i386/att.h elfos.h svr4.h i386/sysv4.h netware.h i386/netware.h"
        tmake_file=i386/t-netware
        ;;
 i[34567]86-sequent-bsd*)               # 80386 from Sequent
@@ -1022,8 +1038,7 @@ i[34567]86-sequent-ptx4* | i[34567]86-sequent-sysv4*)
                tm_file="${tm_file} usegas.h"
        fi
        xm_defines="POSIX SMALL_ARG_MAX"
-       xmake_file=x-svr4
-       tm_file=i386/ptx4-i.h
+       tm_file="${tm_file} i386/att.h elfos.h ptx4.h i386/ptx4-i.h"
        tmake_file=t-svr4
        extra_parts="crtbegin.o crtend.o"
        install_headers_dir=install-headers-cpio
@@ -1043,7 +1058,7 @@ i[34567]86-*-aout*)
 i[34567]86-*-beoself* | i[34567]86-*-beos*)
        xm_defines=POSIX
        tmake_file='i386/t-beos i386/t-crtpic'
-       tm_file=i386/beos-elf.h
+       tm_file="${tm_file} i386/att.h elfos.h svr4.h i386/beos-elf.h"
        xmake_file=i386/x-beos
        extra_parts='crtbegin.o crtend.o'
        ;;
@@ -1062,11 +1077,11 @@ i[34567]86-*-freebsd[12] | i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd*aou
        tmake_file=t-freebsd
        ;;
 i[34567]86-*-freebsd*)
-       tm_file="${tm_file} i386/att.h svr4.h ${fbsd_tm_file} i386/freebsd.h"
+       tm_file="${tm_file} i386/att.h elfos.h svr4.h ${fbsd_tm_file} i386/freebsd.h"
        ;;
 i[34567]86-*-netbsdelf*)
        xm_defines=POSIX
-       tm_file="${tm_file} i386/att.h svr4.h i386/netbsd-elf.h"
+       tm_file="${tm_file} i386/att.h elfos.h svr4.h i386/netbsd-elf.h"
        tmake_file=t-netbsd
        gnu_ld=yes
        float_format=i386
@@ -1117,8 +1132,7 @@ i[34567]86-*-linux*aout*) # Intel 80386's running GNU/Linux
 i[34567]86-*-linux*libc1)      # Intel 80386's running GNU/Linux
                                # with ELF format using the
                                # GNU/Linux C library 5
-       xmake_file=x-linux
-       tm_file="i386/i386.h i386/att.h linux.h i386/linux.h"
+       tm_file="${tm_file} i386/att.h elfos.h svr4.h linux.h i386/linux.h"
        tmake_file="t-slibgcc-elf-ver t-linux t-linux-gnulibc1 i386/t-crtstuff"
        extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
        gnu_ld=yes
@@ -1130,8 +1144,18 @@ i[34567]86-*-linux*libc1)        # Intel 80386's running GNU/Linux
 i[34567]86-*-linux*)   # Intel 80386's running GNU/Linux
                        # with ELF format using glibc 2
                        # aka GNU/Linux C library 6
-       xmake_file=x-linux
-       tm_file="i386/i386.h i386/att.h linux.h i386/linux.h"
+       tm_file="${tm_file} i386/att.h elfos.h svr4.h linux.h i386/linux.h"
+       tmake_file="t-slibgcc-elf-ver t-linux i386/t-crtstuff"
+       extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
+       gnu_ld=yes
+       float_format=i386
+       if test x$enable_threads = xyes; then
+               thread_file='posix'
+       fi
+       ;;
+x86_64-*-linux*)
+       tm_file="i386/biarch64.h i386/i386.h i386/att.h elfos.h svr4.h linux.h \
+                i386/x86-64.h i386/linux64.h"
        tmake_file="t-slibgcc-elf-ver t-linux i386/t-crtstuff"
        extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
        gnu_ld=yes
@@ -1161,7 +1185,7 @@ i[34567]86-pc-msdosdjgpp*)
        esac
        ;;
 i[34567]86-moss-msdos* | i[34567]86-*-moss*)
-       tm_file="i386/i386.h i386/att.h linux.h i386/linux.h i386/moss.h"
+       tm_file="${tm_file} i386/att.h elfos.h svr4.h linux.h i386/linux.h i386/moss.h"
        tmake_file=t-libc-ok
        gnu_ld=yes
        gas=yes
@@ -1192,15 +1216,13 @@ i[34567]86-*-osfrose*)          # 386 using OSF/rose
        extra_objs=halfpic.o
        ;;
 i[34567]86-go32-rtems*)
-       cpu_type=i386
-       tm_file=i386/go32-rtems.h
+       tm_file=i386/djgpp-rtems.h
        tmake_file=t-rtems
        if test x$enable_threads = xyes; then
          thread_file='rtems'
        fi
        ;;
 i[34567]86-*-rtemscoff*)
-       cpu_type=i386
        tm_file=i386/rtems.h
        tmake_file=t-rtems
        if test x$enable_threads = xyes; then
@@ -1208,8 +1230,7 @@ i[34567]86-*-rtemscoff*)
        fi
        ;;
 i[34567]86-*-rtems*|i[34567]86-*-rtemself*)
-       cpu_type=i386
-       tm_file=i386/rtemself.h
+       tm_file="${tm_file} i386/att.h elfos.h svr4.h linux.h i386/rtemself.h rtems.h"
        extra_parts="crtbegin.o crtend.o crti.o crtn.o"
        tmake_file="i386/t-rtems-i386 i386/t-crtstuff t-rtems"
        if test x$enable_threads = xyes; then
@@ -1218,7 +1239,6 @@ i[34567]86-*-rtems*|i[34567]86-*-rtemself*)
        ;;
 i[34567]86-*-sco3.2v5*)        # 80386 running SCO Open Server 5
        xm_defines=POSIX
-       xmake_file=i386/x-sco5
        install_headers_dir=install-headers-cpio
        tm_file=i386/sco5.h
        if test x$gas = xyes
@@ -1232,19 +1252,18 @@ i[34567]86-*-sco3.2v5*) # 80386 running SCO Open Server 5
        ;;
 i[34567]86-*-solaris2*)
        xm_defines="POSIX SMALL_ARG_MAX"
-       tm_file=i386/sol2.h
+       tm_file="${tm_file} i386/att.h elfos.h svr4.h i386/sysv4.h i386/sol2.h"
        if test x$gas = xyes; then
                # Only needed if gas does not support -s
                tm_file="i386/sol2gas.h ${tm_file}"
        fi
-       tmake_file=i386/t-sol2
+       tmake_file="i386/t-sol2 t-svr4"
        if test x$gnu_ld = xyes; then
                tmake_file="$tmake_file t-slibgcc-elf-ver"
        else
                tmake_file="$tmake_file t-slibgcc-sld"
        fi
        extra_parts="crt1.o crti.o crtn.o gcrt1.o gmon.o crtbegin.o crtend.o"
-       xmake_file=x-svr4
        if test x${enable_threads} = x; then
            enable_threads=$have_pthread_h
            if test x${enable_threads} = x; then
@@ -1261,13 +1280,12 @@ i[34567]86-*-solaris2*)
        ;;
 i[34567]86-*-sysv5*)           # Intel x86 on System V Release 5
        xm_defines=POSIX
-       tm_file=i386/sysv5.h
+       tm_file="${tm_file} i386/att.h elfos.h svr4.h i386/sysv4.h i386/sysv5.h"
        if test x$stabs = xyes
        then
                tm_file="${tm_file} dbx.h"
        fi
-       tmake_file=i386/t-crtpic
-       xmake_file=x-svr4
+       tmake_file="i386/t-crtpic t-svr4"
        extra_parts="crtbegin.o crtend.o"
        if test x$enable_threads = xyes; then
               thread_file='posix'
@@ -1275,32 +1293,29 @@ i[34567]86-*-sysv5*)           # Intel x86 on System V Release 5
        ;;
 i[34567]86-*-sysv4*)           # Intel 80386's running system V.4
        xm_defines="POSIX SMALL_ARG_MAX"
-       tm_file=i386/sysv4.h
+       tm_file="${tm_file} i386/att.h elfos.h svr4.h i386/sysv4.h"
        if test x$stabs = xyes
        then
                tm_file="${tm_file} dbx.h"
        fi
-       tmake_file=i386/t-crtpic
-       xmake_file=x-svr4
+       tmake_file="i386/t-crtpic t-svr4"
        extra_parts="crtbegin.o crtend.o"
        ;;
 i[34567]86-*-udk*)      # Intel x86 on SCO UW/OSR5 Dev Kit
        xm_defines=POSIX
-       tm_file=i386/udk.h
-       tmake_file="i386/t-crtpic i386/t-udk"
-       xmake_file=x-svr4
+       tm_file="${tm_file} i386/att.h elfos.h svr4.h i386/sysv4.h i386/sysv5.h i386/udk.h"
+       tmake_file="i386/t-crtpic i386/t-udk t-svr4"
        extra_parts="crtbegin.o crtend.o"
        install_headers_dir=install-headers-cpio
        ;;
 i[34567]86-*-osf1*)            # Intel 80386's running OSF/1 1.3+
-       cpu_type=i386
        xm_file=i386/xm-osf1elf.h
        xm_defines='POSIX USE_C_ALLOCA SMALL_ARG_MAX'
        if test x$stabs = xyes
        then
-               tm_file=i386/osf1elfgdb.h
+               tm_file="${tm_file} i386/att.h elfos.h svr4.h i386/sysv4.h i386/osf1elf.h i386/osf1elfgdb.h"
        else
-               tm_file=i386/osf1elf.h
+               tm_file="${tm_file} i386/att.h elfos.h svr4.h i386/sysv4.h i386/osf1elf.h"
        fi
        tmake_file=i386/t-osf1elf
        extra_parts="crti.o crtn.o crtbegin.o crtend.o"
@@ -1336,7 +1351,6 @@ i[34567]86-*-win32)
        float_format=i386
        tmake_file=i386/t-cygwin
        tm_file=i386/win32.h
-       xmake_file=i386/x-cygwin
        extra_objs=winnt.o
        if test x$enable_threads = xyes; then
                thread_file='win32'
@@ -1349,7 +1363,6 @@ i[34567]86-*-pe | i[34567]86-*-cygwin*)
        float_format=i386
        tmake_file=i386/t-cygwin
        tm_file=i386/cygwin.h
-       xmake_file=i386/x-cygwin
        extra_objs=winnt.o
        if test x$enable_threads = xyes; then
                thread_file='win32'
@@ -1363,24 +1376,22 @@ i[34567]86-*-mingw32*)
        xm_file=i386/xm-mingw32.h
        tmake_file="i386/t-cygwin i386/t-mingw32"
        extra_objs=winnt.o
-       xmake_file=i386/x-cygwin
        if test x$enable_threads = xyes; then
                thread_file='win32'
        fi
        exeext=.exe
        case $machine in
-               *mingw32msv*)
-                       ;;
-               *minwg32crt* | *mingw32*)
+               *mingw32crt*)
                        tm_file="${tm_file} i386/crtdll.h"
                        ;;
+               *minwg32msv* | *mingw32*)
+                       ;;
        esac
        ;;
 i[34567]86-*-uwin*)
        tm_file=i386/uwin.h
        tmake_file="i386/t-cygwin i386/t-uwin"
        extra_objs=winnt.o
-       xmake_file=i386/x-cygwin
        if test x$enable_threads = xyes; then
                thread_file='win32'
        fi
@@ -1390,9 +1401,8 @@ i[34567]86-*-interix*)
        tm_file="i386/i386-interix.h interix.h"
        xm_file="i386/xm-i386-interix.h xm-interix.h"
        xm_defines=POSIX
-       tmake_file="i386/t-interix"
+       tmake_file="t-interix i386/t-interix"
        extra_objs=interix.o
-       xmake_file=x-interix
        if test x$enable_threads = xyes ; then
                thread_file='posix'
        fi
@@ -1402,14 +1412,12 @@ i[34567]86-*-interix*)
        ;;
 i[34567]86-dg-dgux*)
        xm_defines=POSIX
-       out_file=i386/dgux.c
-       tm_file=i386/dgux.h
+       tm_file="${tm_file} i386/att.h elfos.h svr4.h i386/sysv4.h i386/dgux.h"
        tmake_file=i386/t-dgux
-       xmake_file=i386/x-dgux
        install_headers_dir=install-headers-cpio
       ;;
 i860-alliant-*)                # Alliant FX/2800
-       tm_file="${tm_file} svr4.h i860/sysv4.h i860/fx2800.h"
+       tm_file="${tm_file} elfos.h svr4.h i860/sysv4.h i860/fx2800.h"
        tmake_file=i860/t-fx2800
        extra_parts="crtbegin.o crtend.o"
        ;;
@@ -1435,7 +1443,7 @@ i860-*-sysv3*)
        extra_parts="crtbegin.o crtend.o"
        ;;
 i860-*-sysv4*)
-       tm_file="${tm_file} svr4.h i860/sysv4.h"
+       tm_file="${tm_file} elfos.h svr4.h i860/sysv4.h"
        xm_defines=POSIX
        tmake_file=t-svr4
        extra_parts="crtbegin.o crtend.o"
@@ -1481,16 +1489,17 @@ i960-*-rtems)
        ;;
 i960-*-*)                      # Default i960 environment.
        use_collect2=yes
+       tmake_file=i960/t-960bare
        c_target_objs="i960-c.o"
        cxx_target_objs="i960-c.o"
        ;;
 ia64*-*-aix*)
-       tm_file="${tm_file} svr4.h ia64/sysv4.h ia64/aix.h"
+       tm_file="${tm_file} elfos.h svr4.h ia64/sysv4.h ia64/aix.h"
        tmake_file="ia64/t-ia64 ia64/t-aix"
        target_cpu_default="MASK_GNU_AS|MASK_GNU_LD"
        ;;
 ia64*-*-elf*)
-       tm_file=ia64/elf.h
+       tm_file="${tm_file} elfos.h ia64/sysv4.h ia64/elf.h"
        tmake_file="ia64/t-ia64"
        target_cpu_default="0"
        if test x$gas = xyes
@@ -1503,8 +1512,14 @@ ia64*-*-elf*)
        fi
        float_format=i386
        ;;
+ia64*-*-freebsd*)
+       tm_file="${tm_file} ${fbsd_tm_file} elfos.h ia64/sysv4.h ia64/freebsd.h"
+       target_cpu_default="MASK_GNU_AS|MASK_GNU_LD"
+       tmake_file="${tmake_file} ia64/t-ia64"
+       float_format=i386
+       ;;
 ia64*-*-linux*)
-       tm_file=ia64/linux.h
+       tm_file="${tm_file} elfos.h svr4.h linux.h ia64/sysv4.h ia64/linux.h"
        tmake_file="t-slibgcc-elf-ver t-linux ia64/t-ia64 ia64/t-glibc"
        target_cpu_default="MASK_GNU_AS|MASK_GNU_LD"
        if test x$enable_threads = xyes; then
@@ -1513,7 +1528,7 @@ ia64*-*-linux*)
        float_format=i386
        ;;
 ia64*-*-hpux*)
-       tm_file="ia64/ia64.h svr4.h ia64/sysv4.h ia64/hpux.h ia64/hpux_longdouble.h"
+       tm_file="${tm_file} elfos.h svr4.h ia64/sysv4.h ia64/hpux.h ia64/hpux_longdouble.h"
        tmake_file="ia64/t-ia64 ia64/t-hpux"
        target_cpu_default="MASK_GNU_AS"
        if test x$enable_threads = xyes; then
@@ -1522,6 +1537,7 @@ ia64*-*-hpux*)
        float_format=i386
        ;;
 m32r-*-elf*)
+       tm_file="elfos.h svr4.h ${tm_file}"
        extra_parts="crtinit.o crtfini.o"
        ;;
 # m68hc11 and m68hc12 share the same machine description.
@@ -1554,12 +1570,11 @@ m68000-hp-hpux*)                # HP 9000 series 300
        xm_defines=POSIX
        if test x$gas = xyes
        then
-               xmake_file=m68k/x-hp320g
                tm_file=m68k/hp310g.h
        else
-               xmake_file=m68k/x-hp320
                tm_file=m68k/hp310.h
        fi
+       tmake_file=m68k/t-hp320
        install_headers_dir=install-headers-cpio
        use_collect2=yes
        extra_headers=math-68881.h
@@ -1901,7 +1916,6 @@ m68k-*-sysv4*)                    # Motorola m68k's running system V.4
        ;;
 m68k-*-linux*aout*)            # Motorola m68k's running GNU/Linux
                                # with a.out format
-       xmake_file=x-linux
        tm_file=m68k/linux-aout.h
        tmake_file="t-linux-aout m68k/t-linux-aout"
        extra_headers=math-68881.h
@@ -1911,7 +1925,6 @@ m68k-*-linux*aout*)               # Motorola m68k's running GNU/Linux
 m68k-*-linux*libc1)            # Motorola m68k's running GNU/Linux
                                # with ELF format using the
                                # GNU/Linux C library 5
-       xmake_file=x-linux
        tm_file=m68k/linux.h
        tmake_file="t-slibgcc-elf-ver t-linux t-linux-gnulibc1 m68k/t-linux"
        extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
@@ -1922,7 +1935,6 @@ m68k-*-linux*libc1)               # Motorola m68k's running GNU/Linux
 m68k-*-linux*)         # Motorola m68k's running GNU/Linux
                                # with ELF format using glibc 2
                                # aka the GNU/Linux C library 6.
-       xmake_file=x-linux
        tm_file=m68k/linux.h
        tmake_file="t-slibgcc-elf-ver t-linux m68k/t-linux"
        extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
@@ -1962,16 +1974,15 @@ m88k-dg-dgux*)
        xm_defines=POSIX
        case $machine in
          m88k-dg-dguxbcs*)
-           tm_file=m88k/dguxbcs.h
-           tmake_file=m88k/t-dguxbcs
+           tm_file="elfos.h svr4.h m88k/dgux.h m88k/dguxbcs.h"
+           tmake_file="m88k/t-dgux m88k/t-dguxbcs"
            ;;
          *)
-           tm_file=m88k/dgux.h
+           tm_file="elfos.h svr4.h m88k/dgux.h"
            tmake_file=m88k/t-dgux
            ;;
        esac
        extra_parts="crtbegin.o bcscrtbegin.o crtend.o m88kdgux.ld"
-       xmake_file=m88k/x-dgux
        if test x$gas = xyes
        then
                tmake_file=m88k/t-dgux-gas
@@ -2031,12 +2042,12 @@ m88k-*-sysv3*)
        ;;
 m88k-*-sysv4*)
        xm_defines=POSIX
-       tm_file=m88k/sysv4.h
+       tm_file="elfos.h svr4.h m88k/sysv4.h"
        extra_parts="crtbegin.o crtend.o"
        tmake_file=m88k/t-sysv4
        ;;
 mcore-*-elf)
-       tm_file=mcore/mcore-elf.h
+       tm_file="elfos.h svr4.h ${tm_file} mcore/mcore-elf.h"
        tmake_file=mcore/t-mcore
        ;;
 mcore-*-pe*)
@@ -2050,9 +2061,8 @@ mips-sgi-irix6*)          # SGI System V.4., IRIX 6
        else
                tm_file=mips/iris6.h
        fi
-       tmake_file=mips/t-iris6
+       tmake_file="mips/t-iris mips/t-iris6"
        xm_defines=POSIX
-       xmake_file=mips/x-iris6
 #      if test x$enable_threads = xyes; then
 #              thread_file='irix'
 #      fi
@@ -2069,8 +2079,7 @@ mips-sgi-irix5cross64)            # Irix5 host, Irix 6 target, cross64
        tm_file="mips/iris6.h mips/cross64.h"
        xm_defines=POSIX
        xm_file=mips/xm-iris5.h
-       xmake_file=mips/x-iris
-       tmake_file=mips/t-cross64
+       tmake_file="mips/t-iris mips/t-cross64"
        # See comment in mips/iris[56].h files.
        use_collect2=yes
 #      if test x$enable_threads = xyes; then
@@ -2106,9 +2115,9 @@ mips-sgi-irix5*)          # SGI System V.4., IRIX 5
        else
                tm_file=mips/iris5.h
        fi
+       tmake_file=mips/t-iris
        xm_defines=POSIX
        xm_file=mips/xm-iris5.h
-       xmake_file=mips/x-iris
        # mips-tfile doesn't work yet
        # See comment in mips/iris5.h file.
        use_collect2=yes
@@ -2121,8 +2130,8 @@ mips-sgi-irix4loser*)             # Mostly like a MIPS.
        if test x$stabs = xyes; then
                tm_file="${tm_file} dbx.h"
        fi
+       tmake_file=mips/t-iris
        xm_defines=POSIX
-       xmake_file=mips/x-iris
        if test x$gas = xyes
        then    :
        else
@@ -2141,8 +2150,8 @@ mips-sgi-irix4*)          # Mostly like a MIPS.
        if test x$stabs = xyes; then
                tm_file="${tm_file} dbx.h"
        fi
+       tmake_file=mips/t-iris
        xm_defines=POSIX
-       xmake_file=mips/x-iris
        if test x$gas = xyes
        then    :
        else
@@ -2212,14 +2221,17 @@ mipsel-*-netbsd* | mips-dec-netbsd*)    # Decstation running NetBSD
        tmake_file=t-netbsd
        ;;
 mips*-*-linux*)                                # Linux MIPS, either endian.
-       xmake_file=x-linux
-       tm_file="linux.h mips/linux.h"
+        tm_file="elfos.h svr4.h linux.h mips/linux.h"
        case $machine in
-               mipsisa32el-*)
-                       tm_file="mips/little.h $tm_file mips/isa32-linux.h";;
-                mipsisa32-*)
-                       tm_file="$tm_file mips/isa32-linux.h";;
-               mips*el-*)  tm_file="mips/little.h $tm_file" ;;
+        mipsisa32*-*)
+                tm_file="$tm_file mips/isa32-linux.h"
+                target_cpu_default="MASK_SOFT_FLOAT"
+                ;;
+        esac
+        case $machine in
+        mips*el-*)
+                tm_file="mips/little.h $tm_file"
+                ;;
        esac
        tmake_file="t-slibgcc-elf-ver t-linux"
        extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
@@ -2422,8 +2434,6 @@ mips-*-riscos[56789]*)            # Default MIPS RISC-OS 5.0.
                use_collect2=yes
        fi
        ;;
-mips-*-gnu*)
-       ;;
 mipsel-*-ecoff*)
        tm_file=mips/ecoffl.h
        if test x$stabs = xyes; then
@@ -2441,6 +2451,7 @@ mips-*-ecoff*)
 mipsisa32-*-elf*)
        tm_file="mips/isa3264.h mips/abi64.h"
        tmake_file=mips/t-isa3264
+       target_cpu_default="MASK_SOFT_FLOAT"
        ;;
 mipsel-*-elf*)
        tm_file="mips/elfl.h"
@@ -2483,6 +2494,7 @@ mips*-*-rtems*)
 mipstx39el-*-elf*)
        tm_file="mips/r3900.h mips/elfl.h mips/abi64.h"
        tmake_file=mips/t-r3900
+       target_cpu_default="MASK_SOFT_FLOAT"
        ;;
 mipstx39-*-elf*)
        tm_file="mips/r3900.h mips/elf.h mips/abi64.h"
@@ -2502,10 +2514,11 @@ mips-*-*)                               # Default MIPS RISC-OS 4.0.
                use_collect2=yes
        fi
        ;;
+mmix-knuth-mmixware)
+       ;;
 mn10200-*-*)
        float_format=i32
-       cpu_type=mn10200
-       tm_file="mn10200/mn10200.h"
+       tm_file="elfos.h svr4.h ${tm_file}"
        if test x$stabs = xyes
        then
                tm_file="${tm_file} dbx.h"
@@ -2513,8 +2526,7 @@ mn10200-*-*)
        use_collect2=no
        ;;
 mn10300-*-*)
-       cpu_type=mn10300
-       tm_file="mn10300/mn10300.h"
+       tm_file="elfos.h svr4.h ${tm_file}"
        if test x$stabs = xyes
        then
                tm_file="${tm_file} dbx.h"
@@ -2567,12 +2579,12 @@ ns32k-*-openbsd*)
        # Nothing special
        ;;
 pj*-linux*)
-       tm_file="svr4.h pj/linux.h ${tm_file}"
+       tm_file="elfos.h svr4.h pj/linux.h ${tm_file}"
        ;;
 pj-*)
        ;;
 pjl-*)
-       tm_file="svr4.h pj/pjl.h ${tm_file}"
+       tm_file="elfos.h svr4.h pj/pjl.h ${tm_file}"
        ;;
 
 romp-*-aos*)
@@ -2588,21 +2600,18 @@ powerpc-*-openbsd*)
        tmake_file="${tmake_file} rs6000/t-rs6000 rs6000/t-openbsd"
        ;;
 powerpc64-*-linux*)
-       tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/linux64.h"
+       tm_file="${tm_file} elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/linux64.h"
        out_file=rs6000/rs6000.c
        tmake_file="rs6000/t-ppcos t-slibgcc-elf-ver t-linux rs6000/t-ppccomm"
-       xmake_file=x-linux
        extra_headers=ppc-asm.h
        ;;
 powerpc-*-beos*)
-       cpu_type=rs6000
        tm_file="${tm_file} rs6000/aix.h rs6000/beos.h rs6000/xcoff.h"
        xm_defines=POSIX
        xm_file=rs6000/xm-beos.h
        tmake_file=rs6000/t-beos
        ;;
 powerpc-*-darwin*)
-       cpu_type=rs6000
        tm_file="${tm_file} darwin.h rs6000/darwin.h"
        tm_p_file="${tm_p_file} darwin-protos.h"
        tmake_file=rs6000/t-darwin
@@ -2617,21 +2626,28 @@ powerpc-*-darwin*)
        # Darwin linker does collect2 functionality
        use_collect2=no
        ;;
+powerpc*-*-freebsd*)
+       tm_file="${tm_file} elfos.h ${fbsd_tm_file} rs6000/sysv4.h rs6000/freebsd.h"
+       xm_file=rs6000/xm-sysv4.h
+       out_file=rs6000/rs6000.c
+       tmake_file="rs6000/t-ppcos t-freebsd rs6000/t-ppccomm"
+       extra_headers=ppc-asm.h
+       ;;
 powerpc-*-sysv*)
-       tm_file="${tm_file} svr4.h rs6000/sysv4.h"
+       tm_file="${tm_file} elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"
        xm_defines=POSIX
        extra_headers=ppc-asm.h
        tmake_file="rs6000/t-ppcos rs6000/t-ppccomm"
        ;;
 powerpc-*-netbsd*)
        xm_defines=POSIX
-       tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/netbsd.h"
+       tm_file="${tm_file} elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/netbsd.h"
        tmake_file="rs6000/t-ppcos rs6000/t-ppccomm"
        extra_headers=ppc-asm.h
        ;;
 powerpc-*-chorusos*)
        xm_defines=POSIX
-       tm_file="${tm_file} svr4.h rs6000/sysv4.h chorus.h"
+       tm_file="${tm_file} elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h chorus.h"
        tmake_file="rs6000/t-ppcos rs6000/t-ppccomm"
        extra_headers=ppc-asm.h
        case x${enable_threads} in
@@ -2642,31 +2658,31 @@ powerpc-*-chorusos*)
        ;;
 powerpc-*-eabiaix*)
        xm_defines=POSIX
-       tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/eabi.h rs6000/eabiaix.h"
+       tm_file="${tm_file} elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/eabiaix.h"
        tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
        extra_headers=ppc-asm.h
        ;;
 powerpc-*-eabisim*)
        xm_defines=POSIX
-       tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/eabi.h rs6000/eabisim.h"
+       tm_file="${tm_file} elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/eabisim.h"
        tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
        extra_headers=ppc-asm.h
        ;;
 powerpc-*-elf*)
        xm_defines=POSIX
-       tm_file="${tm_file} svr4.h rs6000/sysv4.h"
+       tm_file="${tm_file} elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"
        tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
        extra_headers=ppc-asm.h
        ;;
 powerpc-*-eabi*)
        xm_defines=POSIX
-       tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/eabi.h"
+       tm_file="${tm_file} elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h"
        tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
        extra_headers=ppc-asm.h
        ;;
 powerpc-*-rtems*)
        xm_defines=POSIX
-       tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/eabi.h rtems.h rs6000/rtems.h"
+       tm_file="${tm_file} elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rtems.h rs6000/rtems.h"
        tmake_file="rs6000/t-ppcgas t-rtems rs6000/t-ppccomm"
        extra_headers=ppc-asm.h
        if test x$enable_threads = xyes; then
@@ -2674,71 +2690,61 @@ powerpc-*-rtems*)
        fi
        ;;
 powerpc-*-linux*libc1)
-       tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/linux.h"
+       tm_file="${tm_file} elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/linux.h"
        out_file=rs6000/rs6000.c
        tmake_file="rs6000/t-ppcos t-slibgcc-elf-ver t-linux t-linux-gnulibc1 rs6000/t-ppccomm"
-       xmake_file=x-linux
        extra_headers=ppc-asm.h
        if test x$enable_threads = xyes; then
                thread_file='posix'
        fi
        ;;
 powerpc-*-linux*)
-       tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/linux.h"
+       tm_file="${tm_file} elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/linux.h"
        out_file=rs6000/rs6000.c
        tmake_file="rs6000/t-ppcos t-slibgcc-elf-ver t-linux rs6000/t-ppccomm"
-       xmake_file=x-linux
        extra_headers=ppc-asm.h
        if test x$enable_threads = xyes; then
                thread_file='posix'
        fi
        ;;
 powerpc-wrs-vxworks*)
-        cpu_type=rs6000
        xm_defines=POSIX
-        tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/vxppc.h"
+        tm_file="${tm_file} elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/vxppc.h"
         tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
        extra_headers=ppc-asm.h
        thread_file='vxworks'
         ;;
 powerpcle-wrs-vxworks*)
-        cpu_type=rs6000
        xm_defines=POSIX
-        tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/vxppc.h"
+        tm_file="${tm_file} elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/vxppc.h"
         tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
        extra_headers=ppc-asm.h
        thread_file='vxworks'
         ;;
 powerpcle-*-sysv*)
-       tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/sysv4le.h"
+       tm_file="${tm_file} elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/sysv4le.h"
        xm_defines=POSIX
        tmake_file="rs6000/t-ppcos rs6000/t-ppccomm"
        extra_headers=ppc-asm.h
        ;;
 powerpcle-*-elf*)
        xm_defines=POSIX
-       tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/sysv4le.h"
+       tm_file="${tm_file} elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/sysv4le.h"
        tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
        extra_headers=ppc-asm.h
        ;;
 powerpcle-*-eabisim*)
        xm_defines=POSIX
-       tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/eabi.h rs6000/eabisim.h"
+       tm_file="${tm_file} elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/eabi.h rs6000/eabisim.h"
        tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
        extra_headers=ppc-asm.h
        ;;
 powerpcle-*-eabi*)
        xm_defines=POSIX
-       tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/eabi.h"
+       tm_file="${tm_file} elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/eabi.h"
        tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
        extra_headers=ppc-asm.h
        ;;
-powerpcle-*-solaris2*)
-       tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/sol2.h"
-       xm_defines=POSIX
-       tmake_file="rs6000/t-ppcos rs6000/t-ppccomm"
-       extra_headers=ppc-asm.h
-       ;;
 rs6000-ibm-aix3.[01]*)
        xm_defines=POSIX
        tm_file="${tm_file} rs6000/aix.h rs6000/aix31.h rs6000/xcoff.h"
@@ -2788,18 +2794,17 @@ rs6000-bull-bosx)
        use_collect2=yes
        ;;
 rs6000-*-mach*)
-       tm_file="rs6000/rs6000.h rs6000/mach.h"
+       tm_file="${tm_file} rs6000/mach.h"
        xm_defines=POSIX
        use_collect2=yes
        ;;
 rs6000-*-lynxos*)
-       tm_file=rs6000/lynx.h
+       tm_file="lynx.h rs6000/lynx.h"
        tmake_file=rs6000/t-rs6000
        use_collect2=yes
        ;;
 s390-*-linux*)
-       xmake_file=x-linux
-       tm_file="s390/s390.h linux.h s390/linux.h"
+       tm_file="s390/s390.h elfos.h svr4.h linux.h s390/linux.h"
        tmake_file="t-slibgcc-elf-ver t-linux s390/t-linux"
        extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
        if test x$enable_threads = xyes; then
@@ -2807,8 +2812,7 @@ s390-*-linux*)
        fi
        ;;
 s390x-*-linux*)
-       xmake_file=x-linux
-       tm_file="s390/s390.h linux.h s390/linux.h s390/linux64.h"
+       tm_file="s390/s390.h elfos.h svr4.h linux.h s390/linux.h s390/linux64.h"
        tm_p_file=s390/s390-protos.h
        md_file=s390/s390.md
        out_file=s390/s390.c
@@ -2820,12 +2824,12 @@ s390x-*-linux*)
        ;;
 sh-*-elf*)
        tmake_file="sh/t-sh sh/t-elf"
-       tm_file="sh/sh.h sh/elf.h"
+       tm_file="${tm_file} sh/elf.h"
        float_format=sh
        ;;
 sh-*-rtemself*)
        tmake_file="sh/t-sh sh/t-elf t-rtems"
-       tm_file="sh/sh.h sh/elf.h sh/rtemself.h"
+       tm_file="${tm_file} sh/elf.h sh/rtemself.h"
        float_format=sh
        if test x$enable_threads = xyes; then
          thread_file='rtems'
@@ -2833,16 +2837,15 @@ sh-*-rtemself*)
        ;;
 sh-*-rtems*)
        tmake_file="sh/t-sh t-rtems"
-       tm_file="sh/sh.h sh/rtems.h"
+       tm_file="${tm_file} sh/rtems.h"
        float_format=sh
        if test x$enable_threads = xyes; then
          thread_file='rtems'
        fi
        ;;
 sh-*-linux*)
-       tm_file="sh/sh.h sh/elf.h sh/linux.h"
+       tm_file="${tm_file} sh/elf.h sh/linux.h"
        tmake_file="sh/t-sh sh/t-elf sh/t-linux"
-       xmake_file=x-linux
        gas=yes gnu_ld=yes
        if test x$enable_threads = xyes; then
                thread_file='posix'
@@ -2853,30 +2856,31 @@ sh-*-*)
        float_format=sh
        ;;
 sparc-tti-*)
-       tm_file=sparc/pbd.h
+       tm_file="${tm_file} sparc/pbd.h"
        xm_defines=POSIX
        ;;
 sparc64-wrs-vxworks*)
-        tm_file="sparc/sol2.h sparc/elf.h sparc/vxsparc64.h"
+        tm_file="${tm_file} elfos.h svr4.h sparc/sysv4.h sparc/sol2.h sparc/elf.h sparc/sparc_bi.h gofast.h sparc/vxsparc64.h"
         tmake_file=sparc/t-vxsparc64
         use_collect2=yes
         ;;
 sparc-wrs-vxworks* | sparclite-wrs-vxworks*)
-       tm_file=sparc/vxsparc.h
+       tm_file="${tm_file} aoutos.h sparc/aout.h gofast.h sparc/vxsparc.h"
        tmake_file=sparc/t-vxsparc
        use_collect2=yes
        thread_file='vxworks'
        ;;
 sparc-*-aout*)
        tmake_file=sparc/t-sparcbare
-       tm_file="sparc/aout.h libgloss.h"
+       tm_file="sparc/sparc.h aoutos.h sparc/aout.h libgloss.h"
        ;;
 sparc-*-netbsd*)
-       tm_file=sparc/netbsd.h
+       tm_file="${tm_file} sparc/aout.h netbsd.h sparc/netbsd.h"
        tmake_file=t-netbsd
        use_collect2=yes
        ;;
 sparc-*-openbsd*)
+       tm_file="sparc/sparc.h ${tm_file}"
        # needed to unconfuse gdb
        tmake_file="t-libc-ok t-openbsd sparc/t-openbsd"
        # we need collect2 until our bug is fixed...
@@ -2886,7 +2890,7 @@ sparc-*-bsd*)
        tm_file="${tm_file} sparc/bsd.h"
        ;;
 sparc-*-chorusos*)
-       tm_file="sparc/sol2.h sparc/elf.h chorus.h"
+       tm_file="${tm_file} elfos.h svr4.h sparc/sysv4.h sparc/sol2.h sparc/elf.h chorus.h"
        tmake_file=sparc/t-chorus-elf
        extra_parts="crti.o crtn.o crtbegin.o crtend.o"
        float_format=i64
@@ -2897,28 +2901,25 @@ sparc-*-chorusos*)
        esac
        ;;
 sparc-*-elf*)
-       tm_file="sparc/sol2.h sparc/elf.h"
+       tm_file="${tm_file} elfos.h svr4.h sparc/sysv4.h sparc/sol2.h sparc/elf.h"
        tmake_file=sparc/t-elf
        extra_parts="crti.o crtn.o crtbegin.o crtend.o"
        #float_format=i128
        float_format=i64
        ;;
 sparc-*-linux*aout*)           # Sparc's running GNU/Linux, a.out
-       tm_file=sparc/linux-aout.h
-       xmake_file=x-linux
+       tm_file="aoutos.h sparc/sparc.h sparc/aout.h sparc/linux-aout.h"
        gnu_ld=yes
        ;;
 sparc-*-linux*libc1*)  # Sparc's running GNU/Linux, libc5
-       xmake_file=x-linux
-       tm_file=sparc/linux.h
+       tm_file="${tm_file} elfos.h svr4.h sparc/sysv4.h sparc/linux.h"
        tmake_file="t-slibgcc-elf-ver t-linux t-linux-gnulibc1"
        extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
        gnu_ld=yes
        float_format=sparc
        ;;
 sparc-*-linux*)                # Sparc's running GNU/Linux, libc6
-       xmake_file=x-linux
-       tm_file=sparc/linux.h
+       tm_file="${tm_file} elfos.h svr4.h sparc/sysv4.h sparc/linux.h"
        tmake_file="t-slibgcc-elf-ver t-linux"
        extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
        gnu_ld=yes
@@ -2930,21 +2931,21 @@ sparc-*-linux*)         # Sparc's running GNU/Linux, libc6
 sparc-*-lynxos*)
        if test x$gas = xyes
        then
-               tm_file=sparc/lynx.h
+               tm_file="${tm_file} lynx.h sparc/aout.h sparc/lynx.h"
        else
-               tm_file=sparc/lynx-ng.h
+               tm_file="${tm_file} lynx-ng.h sparc/aout.h sparc/lynx-ng.h"
        fi
        tmake_file=sparc/t-sunos41
        ;;
 sparc-*-rtemsaout*)
        tmake_file="sparc/t-sparcbare t-rtems"
-       tm_file=sparc/rtems.h
+       tm_file="${tm_file} aoutos.h sparc/aout.h sparc/rtems.h rtems.h"
        if test x$enable_threads = xyes; then
          thread_file='rtems'
        fi
        ;;
 sparc-*-rtems*|sparc-*-rtemself*)
-       tm_file="sparc/sol2.h sparc/elf.h sparc/rtemself.h"
+       tm_file="${tm_file} elfos.h svr4.h sparc/sysv4.h sparc/sol2.h sparc/elf.h sparc/rtemself.h rtems.h"
        tmake_file="sparc/t-elf t-rtems"
        extra_parts="crti.o crtn.o crtbegin.o crtend.o"
        #float_format=i128
@@ -2956,7 +2957,7 @@ sparc-*-rtems*|sparc-*-rtemself*)
 sparcv9-*-solaris2* | sparc64-*-solaris2*)
        if test x$gnu_ld = xyes
        then
-               tm_file=sparc/sol2-64.h
+               tm_file="sparc/sol2-sld-64.h sparc/sol2-64.h"
        else
                tm_file=sparc/sol2-sld-64.h
        fi
@@ -2985,7 +2986,7 @@ sparcv9-*-solaris2* | sparc64-*-solaris2*)
        ;;
 sparc-hal-solaris2*)
         xm_defines=POSIX
-        tm_file="sparc/sol2.h sparc/hal.h"
+        tm_file="${tm_file} elfos.h svr4.h sparc/sysv4.h sparc/sol2.h sparc/hal.h"
         tmake_file="sparc/t-halos sparc/t-sol2"
        if test x$gnu_ld = xyes; then
                tmake_file="$tmake_file t-slibgcc-elf-ver"
@@ -3006,9 +3007,9 @@ sparc-hal-solaris2*)
 sparc-*-solaris2*)
        if test x$gnu_ld = xyes
        then
-               tm_file=sparc/sol2.h
+               tm_file="${tm_file} elfos.h svr4.h sparc/sysv4.h sparc/sol2.h"
        else
-               tm_file=sparc/sol2-sld.h
+               tm_file="${tm_file} elfos.h svr4.h sparc/sysv4.h sparc/sol2.h sparc/sol2-sld.h"
        fi
        xm_defines=POSIX
        tmake_file=sparc/t-sol2
@@ -3023,9 +3024,9 @@ sparc-*-solaris2*)
        *-*-solaris2*)
                if test x$gnu_ld = xyes
                then
-                       tm_file=sparc/sol2-64.h
+                       tm_file="sparc/sol2-sld-64.h sparc/sol2-64.h"
                else
-                       tm_file=sparc/sol2-sld-64.h
+                       tm_file="sparc/sol2-sld-64.h"
                fi
                tmake_file="$tmake_file sparc/t-sol2-64"
                ;;
@@ -3053,11 +3054,11 @@ sparc-*-solaris2*)
        fi
        ;;
 sparc-*-sunos4.0*)
-       tm_file=sparc/sunos4.h
+       tm_file="${tm_file} sparc/aout.h sparc/sunos4.h"
        use_collect2=yes
        ;;
 sparc-*-sunos4*)
-       tm_file=sparc/sunos4.h
+       tm_file="${tm_file} sparc/aout.h sparc/sunos4.h"
        tmake_file=sparc/t-sunos41
        use_collect2=yes
        if test x$gas = xyes; then
@@ -3065,57 +3066,56 @@ sparc-*-sunos4*)
        fi
        ;;
 sparc-*-sunos3*)
-       tm_file=sparc/sun4o3.h
+       tm_file="${tm_file} sparc/aout.h sparc/sun4o3.h"
        use_collect2=yes
        ;;
 sparc-*-sysv4*)
-       tm_file=sparc/sysv4.h
+       tm_file="${tm_file} elfos.h svr4.h sparc/sysv4.h"
        xm_defines=POSIX
        tmake_file=t-svr4
        extra_parts="crtbegin.o crtend.o"
        ;;
 sparc-*-vxsim*)
        xm_defines=POSIX
-       tm_file=sparc/vxsim.h
+       tm_file="${tm_file} elfos.h svr4.h sparc/sysv4.h sparc/vxsim.h"
        tmake_file=sparc/t-vxsparc
        ;;
 sparclet-*-aout*)
-       tm_file="sparc/splet.h libgloss.h"
+       tm_file="${tm_file} aoutos.h sparc/aout.h sparc/splet.h libgloss.h"
        tmake_file=sparc/t-splet
        ;;
 sparclite-*-coff*)
-       tm_file="sparc/litecoff.h libgloss.h"
+       tm_file="${tm_file} gofast.h sparc/lite.h svr3.h sparc/litecoff.h dbxcoff.h libgloss.h"
        tmake_file=sparc/t-sparclite
        ;;
 sparclite-*-aout*)
-       tm_file="sparc/lite.h aoutos.h libgloss.h"
+       tm_file="${tm_file} gofast.h sparc/aout.h sparc/lite.h aoutos.h libgloss.h"
        tmake_file=sparc/t-sparclite
        ;;
 sparclite-*-elf*)
-       tm_file="sparc/sol2.h sparc/elf.h sparc/liteelf.h"
+       tm_file="${tm_file} elfos.h svr4.h sparc/sysv4.h sparc/sol2.h sparc/elf.h gofast.h sparc/liteelf.h"
        tmake_file=sparc/t-sparclite
         extra_parts="crtbegin.o crtend.o"
        ;;
 sparc86x-*-aout*)
-       tm_file="sparc/sp86x-aout.h aoutos.h libgloss.h"
+       tm_file="${tm_file} gofast.h sparc/aout.h sparc/sp86x-aout.h aoutos.h libgloss.h"
        tmake_file=sparc/t-sp86x
        ;;
 sparc86x-*-elf*)
-       tm_file="sparc/sol2.h sparc./elf.h sparc/sp86x-elf.h"
+       tm_file="${tm_file} elfos.h svr4.h sparc/sysv4.h sparc/sol2.h sparc/elf.h gofast.h sparc/sp86x-elf.h"
        tmake_file=sparc/t-sp86x
         extra_parts="crtbegin.o crtend.o"
        ;;
 sparc64-*-aout*)
-       tm_file=sparc/sp64-aout.h
+       tm_file="sparc/sparc.h aoutos.h sparc/aout.h sparc/sp64-aout.h"
        ;;
 sparc64-*-elf*)
-       tm_file=sparc/sp64-elf.h
+       tm_file="${tm_file} elfos.h svr4.h sparc/sysv4.h sparc/sol2.h sparc/sp64-elf.h"
        extra_parts="crtbegin.o crtend.o"
        ;;
 sparc64-*-linux*)              # 64-bit Sparc's running GNU/Linux
        tmake_file="t-slibgcc-elf-ver t-linux sparc/t-linux64"
-       tm_file=sparc/linux64.h
-       xmake_file=x-linux
+       tm_file="sparc/sparc_bi.h ${tm_file} elfos.h svr4.h sparc/sysv4.h sparc/linux64.h"
        extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
        gnu_ld=yes
        if test x$enable_threads = xyes; then
@@ -3123,24 +3123,20 @@ sparc64-*-linux*)               # 64-bit Sparc's running GNU/Linux
        fi
        float_format=sparc
        ;;
-stormy16-*-elf)
-       tmake_file="stormy16/t-stormy16"
-       extra_parts="crtbegin.o crtend.o"
-       ;;
 strongarm-*-elf*)
-       tm_file="arm/strongarm-elf.h elfos.h arm/unknown-elf.h arm/elf.h"
+       tm_file="arm/strongarm-elf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h"
        tmake_file=arm/t-strongarm-elf
        out_file=arm/arm.c
        md_file=arm/arm.md
        ;;
 strongarm-*-coff*)
-       tm_file=arm/strongarm-coff.h
+       tm_file="arm/semi.h arm/aout.h arm/coff.h arm/strongarm-coff.h arm/arm.h"
        tmake_file=arm/t-strongarm-coff
        out_file=arm/arm.c
        md_file=arm/arm.md
        ;;
 strongarm-*-pe)
-       tm_file=arm/strongarm-pe.h
+       tm_file="arm/semi.h arm/aout.h arm/coff.h arm/strongarm-coff.h arm/arm.h arm/pe.h arm/strongarm-pe.h"
        tmake_file=arm/t-strongarm-pe
        out_file=arm/arm.c
        md_file=arm/arm.md
@@ -3153,8 +3149,7 @@ thumb*-*-*)
 *** when the -mthumb switch is given to the compiler." 1>&2; exit 1; }
        ;;
 v850-*-rtems*)
-       cpu_type=v850
-       tm_file="v850/rtems.h"
+       tm_file="elfos.h svr4.h ${tm_file} v850/rtems.h"
        tmake_file="v850/t-v850 t-rtems"
        if test x$stabs = xyes
        then
@@ -3166,8 +3161,7 @@ v850-*-rtems*)
        ;;
 v850-*-*)
        target_cpu_default="TARGET_CPU_generic"
-       cpu_type=v850
-       tm_file="v850/v850.h"
+       tm_file="elfos.h svr4.h ${tm_file}"
        tmake_file=v850/t-v850
        if test x$stabs = xyes
        then
@@ -3214,17 +3208,26 @@ we32k-att-sysv*)
        use_collect2=yes
        ;;
 xscale-*-elf)
-       tm_file="arm/xscale-elf.h elfos.h arm/unknown-elf.h arm/elf.h"
+       tm_file="arm/xscale-elf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h"
        tmake_file=arm/t-xscale-elf
        out_file=arm/arm.c
        md_file=arm/arm.md
        ;;
 xscale-*-coff)
-       tm_file=arm/xscale-coff.h
+       tm_file="coff.h arm/xscale-coff.h"
        tmake_file=arm/t-xscale-coff
        out_file=arm/arm.c
        md_file=arm/arm.md
        ;;
+xstormy16-*-elf)
+       # For historical reasons, the target files omit the 'x'.
+       tm_file="elfos.h svr4.h stormy16/stormy16.h"
+       tm_p_file=stormy16/stormy16-protos.h
+       md_file=stormy16/stormy16.md
+       out_file=stormy16/stormy16.c
+       tmake_file="stormy16/t-stormy16"
+       extra_parts="crtbegin.o crtend.o"
+       ;;
 *)
        echo "Configuration $machine not supported" 1>&2
        exit 1
@@ -3358,9 +3361,13 @@ powerpc*-*-* | rs6000-*-*)
                xcommon | xpower | xpower2 | xpowerpc | xrios \
                  | xrios1 | xrios2 | xrsc | xrsc1 \
                  | x601 | x602 | x603 | x603e | x604 | x604e | x620 \
-                 | xec603e | x740 | x750 | x401 \
-                 | x403 | x505 | x801 | x821 | x823 | x860)
+                 | x740 | x750 | x505)
+                       target_cpu_default2="\\\"$with_cpu\\\""
+                       ;;
+
+               x401 | x403 | xec603e | x801 | x821 | x823 | x860)
                        target_cpu_default2="\\\"$with_cpu\\\""
+                       tm_file="$tm_file rs6000/softfloat.h"
                        ;;
 
                xyes | xno)