* init.c (build_new): Allow enumeration types for the array-bounds

[pf3gnuchains/gcc-fork.git] / gcc / config.gcc

diff --git a/gcc/config.gcc b/gcc/config.gcc
index 71be47c..049d5d4 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1,5 +1,5 @@
 # GCC build-, host- and target-specific configuration file.
-# Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+# Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 
 #This file is part of GNU CC.
 
@@ -258,14 +258,14 @@ esac
 # Common parts for GNU/Linux, GNU/Hurd and OpenBSD systems.
 case $machine in
 *-*-linux*)
-       xm_defines="HAVE_ATEXIT POSIX BSTRING"
+       xm_defines="POSIX"
        ;;
 *-*-gnu*)
        # On the Hurd, the setup is just about the same on
        # each different CPU.  The specific machines that we
        # support are matched above and just set $cpu_type.
        xm_file="xm-gnu.h ${xm_file}"
-       tm_file=${cpu_type}/gnu.h
+       tm_file="${cpu_type}/gnu.h"
        extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
        # GNU always uses ELF.
        elf=yes
@@ -276,6 +276,14 @@ case $machine in
        xmake_file=x-linux
        # But here we need a little extra magic.
        tmake_file="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}"
+               ;;
+       esac
        ;;
 *-*-openbsd*)
        tm_file=${cpu_type}/openbsd.h
@@ -319,6 +327,13 @@ a29k-*-udi | a29k-*-coff)
        tm_file="${tm_file} dbxcoff.h a29k/udi.h"
        tmake_file=a29k/t-a29kbare
        ;;
+a29k*-*-rtems*)
+       tm_file=a29k/rtems.h
+       tmake_file="a29k/t-a29kbare t-rtems"
+       if test x$enable_threads = xyes; then
+         thread_file='rtems'
+       fi
+       ;;
 a29k-wrs-vxworks*)
        tm_file="${tm_file} dbxcoff.h a29k/udi.h a29k/vx29k.h"
        tmake_file=a29k/t-vx29k
@@ -438,6 +453,7 @@ alpha*-dec-osf*)
          *-*-osf5*)
            tm_file="${tm_file} alpha/osf.h alpha/osf5.h"
            tmake_file="$tmake_file alpha/t-osf4"
+           float_format=i128
            ;;
        esac
        case $machine in
@@ -476,6 +492,14 @@ alpha*-dec-vms*)
        xm_file="${xm_file} alpha/xm-vms.h"
        tmake_file="alpha/t-alpha alpha/t-vms alpha/t-ieee"
        ;;
+arm*-*-rtems*)
+       tm_file=arm/rtems-elf.h
+       tmake_file="arm/t-arm-elf t-rtems"
+       if test x$enable_threads = xyes; then
+         thread_file='rtems'
+       fi
+       extra_parts="crtinit.o crtfini.o"
+       ;;
 arc-*-elf*)
        extra_parts="crtinit.o crtfini.o"
        ;;
@@ -603,6 +627,14 @@ c38-convex-*)
        target_cpu_default=16           
        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
+       ;;
 c4x-*)
        cpu_type=c4x
        float_format=c4x
@@ -629,6 +661,14 @@ fr30-*-elf)
        tmake_file=fr30/t-fr30
        extra_parts="crti.o crtn.o crtbegin.o crtend.o"
        ;;
+h8300-*-rtems*)
+       tmake_file="h8300/t-h8300 t-rtems"
+       tm_file=h8300/rtems.h
+       if test x$enable_threads = xyes; then
+         thread_file='rtems'
+       fi
+       float_format=i32
+       ;;
 h8300-*-*)
        float_format=i32
        ;;
@@ -647,6 +687,14 @@ 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"
+       xm_file=pa/xm-papro.h
+       tmake_file="pa/t-pro t-rtems"
+       if test x$enable_threads = xyes; then
+         thread_file='rtems'
+       fi
+       ;;
 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"
@@ -930,9 +978,20 @@ i370-*-linux*)
                thread_file='posix'
        fi
        ;;
+i[34567]86-*-chorusos*)
+       xm_file="${xm_file} xm-svr4.h i386/xm-sysv4.h"
+       tm_file="i386/i386.h i386/att.h elfos.h i386/i386afe.h i386/i386elf.h i386/chorus.h"
+       tmake_file=i386/t-i386elf
+       xmake_file=x-svr4
+       case x${enable_threads} in
+         xyes | xpthreads | xposix)
+               thread_file='posix'
+               ;;
+       esac
+       ;;
 i[34567]86-*-elf*)
        xm_file="${xm_file} xm-svr4.h i386/xm-sysv4.h"
-       tm_file=i386/i386elf.h
+       tm_file="i386/i386.h i386/att.h elfos.h i386/i386afe.h i386/i386elf.h"
        tmake_file=i386/t-i386elf
        xmake_file=x-svr4
        ;;
@@ -1005,6 +1064,10 @@ i[34567]86-sequent-ptx2* | i[34567]86-sequent-sysv3*)
        ;;
 i[34567]86-sequent-ptx4* | i[34567]86-sequent-sysv4*)
        xm_file="xm-alloca.h ${xm_file}"
+       if test x$gas = xyes
+       then
+               tm_file="${tm_file} usegas.h"
+       fi
        xm_defines="USG POSIX SMALL_ARG_MAX"
        xmake_file=x-svr4
        tm_file=i386/ptx4-i.h
@@ -1048,7 +1111,7 @@ 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="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd.h i386/perform.h"
+       tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/i386afe.h i386/freebsd.h i386/perform.h"
        extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
        tmake_file=t-freebsd
        gas=yes
@@ -1119,7 +1182,7 @@ 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/linux.h    
+       tm_file="i386/i386.h i386/att.h linux.h i386/i386afe.h i386/linux.h"
        tmake_file="t-linux t-linux-gnulibc1 i386/t-crtstuff"
        extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
        gnu_ld=yes
@@ -1132,7 +1195,7 @@ 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/linux.h
+       tm_file="i386/i386.h i386/att.h linux.h i386/i386afe.h i386/linux.h"
        tmake_file="t-linux i386/t-crtstuff"
        extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
        gnu_ld=yes
@@ -1163,7 +1226,7 @@ i[34567]86-pc-msdosdjgpp*)
        esac
        ;;
 i[34567]86-moss-msdos* | i[34567]86-*-moss*)
-       tm_file=i386/moss.h
+       tm_file="i386/i386.h i386/att.h linux.h i386/i386afe.h i386/linux.h i386/moss.h"
        tmake_file=t-libc-ok
        gnu_ld=yes
        gas=yes
@@ -1203,17 +1266,26 @@ i[34567]86-go32-rtems*)
        xm_file=i386/xm-go32.h
        tm_file=i386/go32-rtems.h
        tmake_file="i386/t-go32 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="i386/t-i386bare t-rtems"
+       if test x$enable_threads = xyes; then
+         thread_file='rtems'
+       fi
        ;;
 i[34567]86-*-rtems*|i[34567]86-*-rtemself*)
        cpu_type=i386
        tm_file=i386/rtemself.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
+         thread_file='rtems'
+       fi
        ;;
 i[34567]86-*-sco3.2v5*)        # 80386 running SCO Open Server 5
        xm_file="xm-alloca.h ${xm_file} i386/xm-sco5.h"
@@ -1223,7 +1295,7 @@ i[34567]86-*-sco3.2v5*)   # 80386 running SCO Open Server 5
        tm_file=i386/sco5.h
        if test x$gas = xyes
        then
-               tm_file="i386/sco5gas.h ${tm_file}"
+               tm_file="usegas.h ${tm_file}"
                tmake_file=i386/t-sco5gas
        else
                tmake_file=i386/t-sco5
@@ -1374,6 +1446,7 @@ i386-*-vsta)                      # Intel 80386's running VSTa kernel
        ;;
 i[34567]86-*-win32)
        xm_file="${xm_file} i386/xm-cygwin.h"
+       float_format=i386
        tmake_file=i386/t-cygwin
        tm_file=i386/win32.h
        xmake_file=i386/x-cygwin
@@ -1385,6 +1458,7 @@ i[34567]86-*-win32)
        ;;
 i[34567]86-*-pe | i[34567]86-*-cygwin*)
        xm_file="${xm_file} i386/xm-cygwin.h"
+       float_format=i386
        tmake_file=i386/t-cygwin
        tm_file=i386/cygwin.h
        xmake_file=i386/x-cygwin
@@ -1396,6 +1470,7 @@ i[34567]86-*-pe | i[34567]86-*-cygwin*)
        ;;
 i[34567]86-*-mingw32*)
        tm_file=i386/mingw32.h
+       float_format=i386
        xm_file="${xm_file} i386/xm-mingw32.h"
        tmake_file="i386/t-cygwin i386/t-mingw32"
        extra_objs=winnt.o
@@ -1414,8 +1489,6 @@ i[34567]86-*-mingw32*)
        ;;
 i[34567]86-*-uwin*)
        tm_file=i386/uwin.h
-       xm_file="${xm_file} i386/xm-uwin.h"
-       xm_defines="USG NO_STAB_H"
        tmake_file="i386/t-cygwin i386/t-uwin"
        extra_objs=winnt.o
        xmake_file=i386/x-cygwin
@@ -1527,6 +1600,9 @@ i960-*-rtems)
        tmake_file="i960/t-960bare t-rtems"
        tm_file="${tm_file} dbxcoff.h i960/rtems.h"
        use_collect2=yes
+       if test x$enable_threads = xyes; then
+         thread_file='rtems'
+       fi
        ;;
 i960-*-*)                      # Default i960 environment.
        use_collect2=yes
@@ -2004,12 +2080,18 @@ m68k-*-rtemscoff*)
        tm_file=m68k/rtems.h
        extra_headers=math-68881.h
        float_format=m68k
+       if test x$enable_threads = xyes; then
+         thread_file='rtems'
+       fi
        ;;
 m68k-*-rtemself*|m68k-*-rtems*)
        tmake_file="m68k/t-m68kbare t-rtems m68k/t-crtstuff"
        tm_file=m68k/rtemself.h
        extra_headers=math-68881.h
        float_format=m68k
+       if test x$enable_threads = xyes; then
+         thread_file='rtems'
+       fi
        ;;
 m88k-dg-dgux*)
        case $machine in
@@ -2538,6 +2620,16 @@ mips64orion-*-elf*)
 mips64orion-*-rtems*)
        tm_file="mips/elforion.h mips/elf64.h mips/rtems64.h"
        tmake_file="mips/t-elf t-rtems"
+       if test x$enable_threads = xyes; then
+         thread_file='rtems'
+       fi
+       ;;
+mips*-*-rtems*)
+       tm_file="mips/elf.h mips/rtems.h"
+       tmake_file="mips/t-elf t-rtems"
+       if test x$enable_threads = xyes; then
+         thread_file='rtems'
+       fi
        ;;
 mipstx39el-*-elf*)
        tm_file="mips/r3900.h mips/elfl.h mips/abi64.h"
@@ -2652,7 +2744,7 @@ powerpc-*-openbsd*)
        ;;
 powerpc-*-beos*)
        cpu_type=rs6000
-       tm_file=rs6000/beos.h
+       tm_file="${tm_file} rs6000/aix.h rs6000/beos.h"
        xm_file=rs6000/xm-beos.h
        tmake_file=rs6000/t-beos
        xmake_file=rs6000/x-beos
@@ -2662,40 +2754,53 @@ powerpc-*-darwin*)
        xmake_file=rs6000/x-darwin
        ;;
 powerpc-*-sysv*)
-       tm_file=rs6000/sysv4.h
+       tm_file="${tm_file} svr4.h rs6000/sysv4.h"
        xm_file="rs6000/xm-sysv4.h"
        xm_defines="USG POSIX"
        extra_headers=ppc-asm.h
        tmake_file="rs6000/t-ppcos rs6000/t-ppccomm"
        xmake_file=rs6000/x-sysv4
        ;;
+powerpc-*-chorusos*)
+       tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/chorus.h"
+       tmake_file="rs6000/t-ppcos rs6000/t-ppccomm"
+       extra_headers=ppc-asm.h
+       case x${enable_threads} in
+         xyes | xpthreads | xposix)
+               thread_file='posix'
+               ;;
+       esac
+       ;;
 powerpc-*-eabiaix*)
-       tm_file="rs6000/sysv4.h rs6000/eabi.h rs6000/eabiaix.h"
+       tm_file="${tm_file} svr4.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*)
-       tm_file="rs6000/sysv4.h rs6000/eabi.h rs6000/eabisim.h"
+       tm_file="${tm_file} svr4.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*)
-       tm_file="rs6000/sysv4.h"
+       tm_file="${tm_file} svr4.h rs6000/sysv4.h"
        tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
        extra_headers=ppc-asm.h
        ;;
 powerpc-*-eabi*)
-       tm_file="rs6000/sysv4.h rs6000/eabi.h"
+       tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/eabi.h"
        tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
        extra_headers=ppc-asm.h
        ;;
 powerpc-*-rtems*)
-       tm_file="rs6000/sysv4.h rs6000/eabi.h rs6000/rtems.h"
+       tm_file="${tm_file} svr4.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
+         thread_file='rtems'
+       fi
        ;;
 powerpc-*-linux*libc1)
-       tm_file="rs6000/sysv4.h rs6000/linux.h"
+       tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/linux.h"
        xm_file=rs6000/xm-sysv4.h
        out_file=rs6000/rs6000.c
        tmake_file="rs6000/t-ppcos t-linux t-linux-gnulibc1 rs6000/t-ppccomm"
@@ -2706,7 +2811,7 @@ powerpc-*-linux*libc1)
        fi
        ;;
 powerpc-*-linux*)
-       tm_file="rs6000/sysv4.h rs6000/linux.h"
+       tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/linux.h"
        xm_file="rs6000/xm-sysv4.h"
        xm_defines="USG ${xm_defines}"
        out_file=rs6000/rs6000.c
@@ -2721,7 +2826,7 @@ powerpc-wrs-vxworks*)
         cpu_type=rs6000
        xm_file="rs6000/xm-sysv4.h"
        xm_defines="USG POSIX"
-        tm_file="rs6000/sysv4.h rs6000/vxppc.h"
+        tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/vxppc.h"
         tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
        extra_headers=ppc-asm.h
        thread_file='vxworks'
@@ -2730,13 +2835,13 @@ powerpcle-wrs-vxworks*)
         cpu_type=rs6000
        xm_file="rs6000/xm-sysv4.h"
        xm_defines="USG POSIX"
-        tm_file="rs6000/sysv4.h rs6000/sysv4le.h rs6000/vxppc.h"
+        tm_file="${tm_file} svr4.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="rs6000/sysv4.h rs6000/sysv4le.h"
+       tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/sysv4le.h"
        xm_file="rs6000/xm-sysv4.h"
        xm_defines="USG POSIX"
        tmake_file="rs6000/t-ppcos rs6000/t-ppccomm"
@@ -2744,22 +2849,22 @@ powerpcle-*-sysv*)
        extra_headers=ppc-asm.h
        ;;
 powerpcle-*-elf*)
-       tm_file="rs6000/sysv4.h rs6000/sysv4le.h"
+       tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/sysv4le.h"
        tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
        extra_headers=ppc-asm.h
        ;;
 powerpcle-*-eabisim*)
-       tm_file="rs6000/sysv4.h rs6000/sysv4le.h rs6000/eabi.h rs6000/eabisim.h"
+       tm_file="${tm_file} svr4.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*)
-       tm_file="rs6000/sysv4.h rs6000/sysv4le.h rs6000/eabi.h"
+       tm_file="${tm_file} svr4.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="rs6000/sysv4.h rs6000/sysv4le.h rs6000/sol2.h"
+       tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/sol2.h"
        xm_file="rs6000/xm-sysv4.h"
        xm_defines="USG POSIX"
        tmake_file="rs6000/t-ppcos rs6000/t-ppccomm"
@@ -2767,13 +2872,13 @@ powerpcle-*-solaris2*)
        extra_headers=ppc-asm.h
        ;;
 rs6000-ibm-aix3.[01]*)
-       tm_file=rs6000/aix31.h
+       tm_file="${tm_file} rs6000/aix.h rs6000/aix31.h"
        xmake_file=rs6000/x-aix31
        float_format=none
        use_collect2=yes
        ;;
 rs6000-ibm-aix3.2.[456789]* | powerpc-ibm-aix3.2.[456789]*)
-       tm_file=rs6000/aix3newas.h
+       tm_file="${tm_file} rs6000/aix.h rs6000/aix3newas.h"
        if test x$host != x$target
        then
                tmake_file=rs6000/t-xnewas
@@ -2784,7 +2889,7 @@ rs6000-ibm-aix3.2.[456789]* | powerpc-ibm-aix3.2.[456789]*)
        use_collect2=yes
        ;;
 rs6000-ibm-aix4.[12]* | powerpc-ibm-aix4.[12]*)
-       tm_file=rs6000/aix41.h
+       tm_file="${tm_file} rs6000/aix.h rs6000/aix41.h"
        if test x$host != x$target
        then
                tmake_file=rs6000/t-xnewas
@@ -2802,7 +2907,7 @@ rs6000-ibm-aix4.[12]* | powerpc-ibm-aix4.[12]*)
        use_collect2=yes
        ;;
 rs6000-ibm-aix4.[3456789]* | powerpc-ibm-aix4.[3456789]*)
-       tm_file=rs6000/aix43.h
+       tm_file="${tm_file} rs6000/aix.h rs6000/aix43.h"
        tmake_file=rs6000/t-aix43
        xmake_file=rs6000/x-aix41
        float_format=none
@@ -2810,7 +2915,7 @@ rs6000-ibm-aix4.[3456789]* | powerpc-ibm-aix4.[3456789]*)
        thread_file='aix'
        ;;
 rs6000-ibm-aix[56789].* | powerpc-ibm-aix[56789].*)
-       tm_file=rs6000/aix43.h
+       tm_file="${tm_file} rs6000/aix.h rs6000/aix51.h"
        tmake_file=rs6000/t-aix43
        xmake_file=rs6000/x-aix41
        float_format=none
@@ -2818,10 +2923,12 @@ rs6000-ibm-aix[56789].* | powerpc-ibm-aix[56789].*)
        thread_file='aix'
        ;;
 rs6000-ibm-aix*)
+       tm_file="${tm_file} rs6000/aix.h"
        float_format=none
        use_collect2=yes
        ;;
 rs6000-bull-bosx)
+       tm_file="${tm_file} rs6000/aix.h"
        float_format=none
        use_collect2=yes
        ;;
@@ -2847,11 +2954,17 @@ sh-*-rtemself*)
        tmake_file="sh/t-sh sh/t-elf t-rtems"
        tm_file="sh/sh.h sh/elf.h sh/rtemself.h"
        float_format=sh
+       if test x$enable_threads = xyes; then
+         thread_file='rtems'
+       fi
        ;;
 sh-*-rtems*)
        tmake_file="sh/t-sh t-rtems"
        tm_file="sh/sh.h 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"
@@ -2871,6 +2984,11 @@ sparc-tti-*)
        xm_file="xm-alloca.h ${xm_file}"
        xm_defines=USG
        ;;
+sparc64-wrs-vxworks*)
+        tm_file="sparc/sol2.h sparc/elf.h sparc/vxsparc64.h"
+        tmake_file=sparc/t-vxsparc64
+        use_collect2=yes
+        ;;
 sparc-wrs-vxworks* | sparclite-wrs-vxworks*)
        tm_file=sparc/vxsparc.h
        tmake_file=sparc/t-vxsparc
@@ -2893,8 +3011,19 @@ sparc-*-openbsd*)
 sparc-*-bsd*)
        tm_file=sparc/bsd.h
        ;;
+sparc-*-chorusos*)
+       tm_file="sparc/sol2.h sparc/elf.h sparc/chorus.h"
+       tmake_file=sparc/t-chorus-elf
+       extra_parts="crti.o crtn.o crtbegin.o crtend.o"
+       float_format=i64
+       case x${enable_threads} in
+         xyes | xpthreads | xposix)
+               thread_file='posix'
+               ;;
+       esac
+       ;;
 sparc-*-elf*)
-       tm_file=sparc/elf.h
+       tm_file="sparc/sol2.h sparc/elf.h"
        tmake_file=sparc/t-elf
        extra_parts="crti.o crtn.o crtbegin.o crtend.o"
        #float_format=i128
@@ -2941,13 +3070,19 @@ sparc-*-lynxos*)
 sparc-*-rtemsaout*)
        tmake_file="sparc/t-sparcbare t-rtems"
        tm_file=sparc/rtems.h
+       if test x$enable_threads = xyes; then
+         thread_file='rtems'
+       fi
        ;;
 sparc-*-rtems*|sparc-*-rtemself*)
-       tm_file="sparc/rtemself.h"
+       tm_file="sparc/sol2.h sparc/elf.h sparc/rtemself.h"
        tmake_file="sparc/t-elf t-rtems"
        extra_parts="crti.o crtn.o crtbegin.o crtend.o"
        #float_format=i128
        float_format=i64
+       if test x$enable_threads = xyes; then
+         thread_file='rtems'
+       fi
        ;;
 sparcv9-*-solaris2*)
        if test x$gnu_ld = xyes
@@ -3100,7 +3235,7 @@ sparclite-*-aout*)
        tmake_file=sparc/t-sparclite
        ;;
 sparclite-*-elf*)
-       tm_file="sparc/liteelf.h"
+       tm_file="sparc/sol2.h sparc/elf.h sparc/liteelf.h"
        tmake_file=sparc/t-sparclite
         extra_parts="crtbegin.o crtend.o"
        ;;
@@ -3109,7 +3244,7 @@ sparc86x-*-aout*)
        tmake_file=sparc/t-sp86x
        ;;
 sparc86x-*-elf*)       
-       tm_file="sparc/sp86x-elf.h"
+       tm_file="sparc/sol2.h sparc./elf.h sparc/sp86x-elf.h"
        tmake_file=sparc/t-sp86x
         extra_parts="crtbegin.o crtend.o"
        ;;