OSDN Git Service

* config.gcc (*-*-freebsd*): Remove configuration block.
[pf3gnuchains/gcc-fork.git] / gcc / config.gcc
index 2902973..96609c9 100644 (file)
@@ -283,7 +283,6 @@ 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
@@ -348,15 +347,6 @@ 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
        ;;
 esac
 
@@ -426,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
@@ -541,52 +530,50 @@ arc-*-elf*)
        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
@@ -597,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"
        ;;
@@ -665,7 +652,6 @@ c4x-*)
 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
        ;;
@@ -740,47 +726,51 @@ hppa*-*-linux* | parisc*-*-linux*)
        ;;
 hppa*-*-openbsd*)
        target_cpu_default="MASK_PA_11"
-       tmake_file=pa/t-openbsd
+       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}"
@@ -792,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}"
@@ -804,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
        ;;
@@ -820,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
@@ -837,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
@@ -852,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
@@ -874,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
@@ -890,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
@@ -905,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
        ;;
@@ -920,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*)
@@ -947,8 +934,7 @@ hppa*-*-mpeix*)
 i370-*-opened*)                         # IBM 360/370/390 Architecture
        xm_defines='POSIX FATAL_EXIT_CODE=12'
        tm_file=i370/oe.h
-       tmake_file="i370/t-i370"
-       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"
        ;;
@@ -960,7 +946,6 @@ i370-*-mvs*)
        cxx_target_objs="i370-c.o"
        ;;
 i370-*-linux*)
-       xmake_file=x-linux
        tm_file="elfos.h svr4.h linux.h i370/linux.h ${tm_file}"
        tmake_file="t-slibgcc-elf-ver t-linux"
        # broken_install=yes
@@ -976,8 +961,7 @@ i370-*-linux*)
 i[34567]86-*-chorusos*)
        xm_defines=POSIX
        tm_file="${tm_file} i386/att.h elfos.h i386/i386elf.h chorus.h"
-       tmake_file=i386/t-i386elf
-       xmake_file=x-svr4
+       tmake_file="i386/t-i386elf t-svr4"
        case x${enable_threads} in
          xyes | xpthreads | xposix)
                thread_file='posix'
@@ -987,8 +971,7 @@ i[34567]86-*-chorusos*)
 i[34567]86-*-elf*)
        xm_defines=POSIX
        tm_file="${tm_file} i386/att.h elfos.h i386/i386elf.h"
-       tmake_file=i386/t-i386elf
-       xmake_file=x-svr4
+       tmake_file="i386/t-i386elf t-svr4"
        ;;
 i[34567]86-ibm-aix*)           # IBM PS/2 running AIX
         if test x$gas = xyes
@@ -1055,7 +1038,6 @@ 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="${tm_file} i386/att.h elfos.h ptx4.h i386/ptx4-i.h"
        tmake_file=t-svr4
        extra_parts="crtbegin.o crtend.o"
@@ -1150,7 +1132,6 @@ 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="${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"
@@ -1163,7 +1144,6 @@ 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="${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"
@@ -1174,7 +1154,6 @@ i[34567]86-*-linux*)      # Intel 80386's running GNU/Linux
        fi
        ;;
 x86_64-*-linux*)
-       xmake_file=x-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"
@@ -1260,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
@@ -1279,14 +1257,13 @@ i[34567]86-*-solaris2*)
                # 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
@@ -1308,8 +1285,7 @@ i[34567]86-*-sysv5*)           # Intel x86 on System V Release 5
        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'
@@ -1322,15 +1298,13 @@ i[34567]86-*-sysv4*)            # Intel 80386's running system V.4
        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="${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"
-       xmake_file=x-svr4
+       tmake_file="i386/t-crtpic i386/t-udk t-svr4"
        extra_parts="crtbegin.o crtend.o"
        install_headers_dir=install-headers-cpio
        ;;
@@ -1377,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'
@@ -1390,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'
@@ -1404,7 +1376,6 @@ 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
@@ -1421,7 +1392,6 @@ 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
@@ -1431,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
@@ -1445,7 +1414,6 @@ i[34567]86-dg-dgux*)
        xm_defines=POSIX
        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
@@ -1602,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
@@ -1949,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
@@ -1959,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"
@@ -1970,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"
@@ -2011,7 +1975,7 @@ m88k-dg-dgux*)
        case $machine in
          m88k-dg-dguxbcs*)
            tm_file="elfos.h svr4.h m88k/dgux.h m88k/dguxbcs.h"
-           tmake_file=m88k/t-dguxbcs
+           tmake_file="m88k/t-dgux m88k/t-dguxbcs"
            ;;
          *)
            tm_file="elfos.h svr4.h m88k/dgux.h"
@@ -2019,7 +1983,6 @@ m88k-dg-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
@@ -2098,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
@@ -2117,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
@@ -2154,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
@@ -2169,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
@@ -2189,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
@@ -2260,7 +2221,6 @@ mipsel-*-netbsd* | mips-dec-netbsd*)    # Decstation running NetBSD
        tmake_file=t-netbsd
        ;;
 mips*-*-linux*)                                # Linux MIPS, either endian.
-       xmake_file=x-linux
         tm_file="elfos.h svr4.h linux.h mips/linux.h"
        case $machine in
         mipsisa32*-*)
@@ -2643,7 +2603,6 @@ powerpc64-*-linux*)
        tm_file="${tm_file} elfos.h svr4.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*)
@@ -2727,7 +2686,6 @@ powerpc-*-linux*libc1)
        tm_file="${tm_file} elfos.h svr4.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'
@@ -2737,7 +2695,6 @@ powerpc-*-linux*)
        tm_file="${tm_file} elfos.h svr4.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'
@@ -2846,7 +2803,6 @@ rs6000-*-lynxos*)
        use_collect2=yes
        ;;
 s390-*-linux*)
-       xmake_file=x-linux
        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"
@@ -2855,7 +2811,6 @@ s390-*-linux*)
        fi
        ;;
 s390x-*-linux*)
-       xmake_file=x-linux
        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
@@ -2890,7 +2845,6 @@ sh-*-rtems*)
 sh-*-linux*)
        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'
@@ -2905,7 +2859,7 @@ sparc-tti-*)
        xm_defines=POSIX
        ;;
 sparc64-wrs-vxworks*)
-        tm_file="sparc/sol2.h sparc/elf.h sparc/sparc_bi.h gofast.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
         ;;
@@ -2920,11 +2874,12 @@ sparc-*-aout*)
        tm_file="sparc/sparc.h aoutos.h sparc/aout.h libgloss.h"
        ;;
 sparc-*-netbsd*)
-       tm_file="${tm_file} netbsd.h 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...
@@ -2934,7 +2889,7 @@ sparc-*-bsd*)
        tm_file="${tm_file} sparc/bsd.h"
        ;;
 sparc-*-chorusos*)
-       tm_file="${tm_file} sparc/sysv4.h 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
@@ -2945,28 +2900,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="aoutos.h sparc/sparc.h 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="${tm_file} sparc/sysv4.h 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="${tm_file} sparc/sysv4.h 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
@@ -2978,9 +2930,9 @@ sparc-*-linux*)           # Sparc's running GNU/Linux, libc6
 sparc-*-lynxos*)
        if test x$gas = xyes
        then
-               tm_file="${tm_file} sparc/lynx.h"
+               tm_file="${tm_file} lynx.h sparc/aout.h sparc/lynx.h"
        else
-               tm_file="${tm_file} lynx-ng.h sparc/lynx-ng.h"
+               tm_file="${tm_file} lynx-ng.h sparc/aout.h sparc/lynx-ng.h"
        fi
        tmake_file=sparc/t-sunos41
        ;;
@@ -2992,7 +2944,7 @@ sparc-*-rtemsaout*)
        fi
        ;;
 sparc-*-rtems*|sparc-*-rtemself*)
-       tm_file="sparc/sol2.h sparc/elf.h sparc/rtemself.h rtems.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
@@ -3033,7 +2985,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"
@@ -3054,9 +3006,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.h 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
@@ -3101,11 +3053,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
@@ -3113,18 +3065,18 @@ sparc-*-sunos4*)
        fi
        ;;
 sparc-*-sunos3*)
-       tm_file="${tm_file} sparc/sun4o3.h"
+       tm_file="${tm_file} sparc/aout.h sparc/sun4o3.h"
        use_collect2=yes
        ;;
 sparc-*-sysv4*)
-       tm_file="${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="${tm_file} sparc/sysv4.h sparc/vxsim.h"
+       tm_file="${tm_file} elfos.h svr4.h sparc/sysv4.h sparc/vxsim.h"
        tmake_file=sparc/t-vxsparc
        ;;
 sparclet-*-aout*)
@@ -3136,34 +3088,33 @@ sparclite-*-coff*)
        tmake_file=sparc/t-sparclite
        ;;
 sparclite-*-aout*)
-       tm_file="${tm_file} gofast.h 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 gofast.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="${tm_file} gofast.h 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 gofast.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/sparc.h aoutos.h sparc/sp64-aout.h"
+       tm_file="sparc/sparc.h aoutos.h sparc/aout.h sparc/sp64-aout.h"
        ;;
 sparc64-*-elf*)
-       tm_file="sparc/sol2.h 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/sparc_bi.h ${tm_file} sparc/sysv4.h 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
@@ -3172,19 +3123,19 @@ sparc64-*-linux*)               # 64-bit Sparc's running GNU/Linux
        float_format=sparc
        ;;
 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
@@ -3256,13 +3207,13 @@ 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