OSDN Git Service

* config/arm/arm.c, config/arm/arm.h, config/arm/arm.md,
[pf3gnuchains/gcc-fork.git] / gcc / config.gcc
index 3ab7ef9..16d5326 100644 (file)
@@ -1,5 +1,5 @@
 # GCC target-specific configuration file.
-# Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 # Free Software Foundation, Inc.
 
 #This file is part of GCC.
@@ -182,7 +182,23 @@ md_file=
 
 # Obsolete configurations.
 case ${target} in
- dummy)
+ d30v-* | \
+ dsp16xx-* | \
+ i370-* | \
+ i960-* | \
+ i?86-moss-msdos | i?86-*-moss* | \
+ i?86-ncr-sysv4* | \
+ i?86-*-netware | \
+ i?86-*-freebsd2* | i?86-*-freebsd*aout* | \
+ i?86-*-linux*aout* | \
+ i?86-*-linux*libc1* | \
+ i?86-*-interix | \
+ i?86-*-mach* | \
+ i?86-*-udk* | \
+ i?86-*-sysv[123]* | \
+ i386-*-vsta | \
+ m68k-hp-hpux* | m68000-hp-hpux* | \
+ m68k-*-sysv4*)
     if test "x$enable_obsolete" != xyes; then
       echo "*** Configuration ${target} is obsolete." >&2
       echo "*** Specify --enable-obsolete to build it anyway." >&2
@@ -263,6 +279,9 @@ ia64-*-*)
 hppa*-*-* | parisc*-*-*)
        cpu_type=pa
        ;;
+m32r*-*-*)
+        cpu_type=m32r
+        ;;
 m680[012]0-*-*)
        cpu_type=m68k
        extra_headers=math-68881.h
@@ -370,18 +389,25 @@ case ${target} in
   gnu_ld=yes
   extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
   case ${target} in
-    *-*-freebsd3 | *-*-freebsd[3].*) fbsd_tm_file="freebsd3.h";;
-    *-*-freebsd4 | *-*-freebsd[4].*) fbsd_tm_file="freebsd4.h";;
-    *-*-freebsd5 | *-*-freebsd[5].*) fbsd_tm_file="freebsd5.h";;
-    *-*-freebsd6 | *-*-freebsd[6].*) fbsd_tm_file="freebsd6.h";;
-    *) echo 'Please update *-*-freebsd* in gcc/config.gcc'; exit 1;;
+    *-*-freebsd3 | *-*-freebsd[3].*)
+      tm_defines="${tm_defines} FBSD_MAJOR=3" ;;
+    *-*-freebsd4 | *-*-freebsd[4].*)
+      tm_defines="${tm_defines} FBSD_MAJOR=4" ;;
+    *-*-freebsd5 | *-*-freebsd[5].*)
+      tm_defines="${tm_defines} FBSD_MAJOR=5" ;;
+    *-*-freebsd6 | *-*-freebsd[6].*)
+      tm_defines="${tm_defines} FBSD_MAJOR=6" ;;
+    *)
+      echo 'Please update *-*-freebsd* in gcc/config.gcc'
+      exit 1
+      ;;
   esac
   tmake_file="t-slibgcc-elf-ver t-freebsd"
   case ${enable_threads} in
     no)
       fbsd_tm_file="${fbsd_tm_file} freebsd-nthr.h"
       ;;
-    "" | yes | pthreads | posix)
+    "" | yes | posix)
       thread_file='posix'
       tmake_file="${tmake_file} t-freebsd-thread"
       # Before 5.0, FreeBSD can't bind shared libraries to -lc
@@ -399,6 +425,17 @@ case ${target} in
   esac
   fbsd_tm_file="${fbsd_tm_file} freebsd-spec.h freebsd.h"
   ;;
+*-*-kfreebsd*-gnu)
+  # Must come before *-*-gnu*
+  xm_defines=POSIX # needed for cross-compiling from FreeBSD?
+  extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
+  # GNU tools are the only tools.
+  gas=yes
+  gnu_ld=yes
+  case ${enable_threads} in
+    "" | yes | posix) thread_file='posix' ;;
+  esac
+  ;;
 *-*-linux*libc1* | *-*-linux*aout*)
   # Avoid the generic linux case.
   ;;
@@ -488,8 +525,13 @@ case ${target} in
 *-*-vxworks*)
   tmake_file=t-vxworks
   tm_file="${tm_file} elfos.h svr4.h vxworks.h"
-  thread_file='vxworks'
+  case ${enable_threads} in
+    no) ;;
+    "" | yes | vxworks) thread_file='vxworks' ;;
+    *) echo 'Unknown thread configuration for VxWorks'; exit 1 ;;
+  esac
   use_collect2=yes
+  xm_defines=POSIX
   ;;
 esac
 
@@ -567,8 +609,8 @@ alpha*-dec-osf[45]*)
            target_cpu_default=MASK_SUPPORT_ARCH
            ;;
        esac
-       case x${enable_threads} in
-       x | xyes | xpthreads | xposix)
+       case ${enable_threads} in
+         "" | yes | posix)
            thread_file='posix'
            tmake_file="${tmake_file} alpha/t-osf-pthread"
            ;;
@@ -601,6 +643,10 @@ arm-semi-aof | armel-semi-aof)
        tm_file="arm/semiaof.h arm/aof.h arm/arm.h"
        tmake_file=arm/t-semi
        ;;
+arm-wrs-vxworks)
+       tm_file="dbxelf.h elfos.h svr4.h vxworks.h arm/elf.h arm/aout.h arm/arm.h arm/vxworks.h"
+       tmake_file="${tmake_file} arm/t-vxworks"
+       ;;
 arm*-*-freebsd*|strongarm*-*-freebsd*)
        tm_file="dbxelf.h elfos.h ${fbsd_tm_file} arm/elf.h arm/aout.h arm/freebsd.h arm/arm.h"
        tmake_file="${tmake_file} arm/t-strongarm-elf"
@@ -616,15 +662,10 @@ arm*-*-netbsd*)
        use_collect2=yes
        ;;
 arm*-*-linux*)                 # ARM GNU/Linux with ELF
-       tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h arm/linux-gas.h arm/linux-elf.h"
+       tm_file="dbxelf.h elfos.h linux.h arm/elf.h  arm/linux-gas.h arm/linux-elf.h arm/aout.h arm/arm.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
-       case x${enable_threads} in
-       x | xyes | xpthreads | xposix)
-               thread_file='posix'
-               ;;
-       esac
        ;;
 arm*-*-uclinux*)               # ARM ucLinux
        tm_file="dbxelf.h 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"
@@ -757,7 +798,7 @@ hppa1.1-*-bsd*)
        ;;
 hppa1.1-*-hpux10* | hppa2*-*-hpux10*)
        target_cpu_default="MASK_PA_11"
-       tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h dbxelf.h pa/som.h pa/pa-hpux.h pa/pa-hpux10.h"
+       tm_file="${tm_file} pa/pa32-regs.h dbxelf.h pa/som.h pa/pa-hpux.h pa/pa-hpux10.h"
        tmake_file="pa/t-pa pa/t-pa-hpux pa/t-hpux-shlib"
        if test x$enable_threads = x; then
            enable_threads=$have_pthread_h
@@ -771,7 +812,7 @@ hppa1.1-*-hpux10* | hppa2*-*-hpux10*)
        use_fixproto=yes
        ;;
 hppa1.0-*-hpux10*)
-       tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h dbxelf.h pa/som.h pa/pa-hpux.h pa/pa-hpux10.h"
+       tm_file="${tm_file} pa/pa32-regs.h dbxelf.h pa/som.h pa/pa-hpux.h pa/pa-hpux10.h"
        tmake_file="pa/t-pa pa/t-pa-hpux pa/t-hpux-shlib"
        if test x$enable_threads = x; then
            enable_threads=$have_pthread_h
@@ -788,11 +829,11 @@ hppa*64*-*-hpux11*)
        if test x$gas = xyes
        then
                tm_file="pa/pa64-start.h ${tm_file} dbxelf.h elfos.h  \
-                        pa/pa64-regs.h pa/long_double.h pa/pa-hpux.h \
+                        pa/pa64-regs.h pa/pa-hpux.h \
                         pa/pa-hpux11.h pa/pa-64.h pa/pa64-hpux.h"
        else
                tm_file="pa/pa64-start.h ${tm_file} dbxelf.h pa/elf.h \
-                        pa/pa64-regs.h pa/long_double.h pa/pa-hpux.h \
+                        pa/pa64-regs.h pa/pa-hpux.h \
                         pa/pa-hpux11.h pa/pa-64.h pa/pa64-hpux.h"
        fi
        need_64bit_hwint=yes
@@ -811,7 +852,7 @@ hppa*64*-*-hpux11*)
        ;;
 hppa1.1-*-hpux11* | hppa2*-*-hpux11*)
        target_cpu_default="MASK_PA_11"
-       tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h dbxelf.h pa/som.h pa/pa-hpux.h pa/pa-hpux11.h"
+       tm_file="${tm_file} pa/pa32-regs.h dbxelf.h pa/som.h pa/pa-hpux.h pa/pa-hpux11.h"
        tmake_file="pa/t-pa pa/t-pa-hpux pa/t-hpux-shlib"
        case x${enable_threads} in
        xyes | xposix )
@@ -821,7 +862,7 @@ hppa1.1-*-hpux11* | hppa2*-*-hpux11*)
        use_collect2=yes
        ;;
 hppa1.0-*-hpux11*)
-       tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h dbxelf.h pa/som.h pa/pa-hpux.h pa/pa-hpux11.h"
+       tm_file="${tm_file} pa/pa32-regs.h dbxelf.h pa/som.h pa/pa-hpux.h pa/pa-hpux11.h"
        tmake_file="pa/t-pa pa/t-pa-hpux pa/t-hpux-shlib"
        case x${enable_threads} in
        xyes | xposix )
@@ -853,7 +894,6 @@ i370-*-linux*)
        ;;
 i[34567]86-*-darwin*)
        tm_file="${tm_file} i386/darwin.h"
-       use_fixproto=yes
        ;;
 i[34567]86-*-elf*)
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h i386/i386elf.h"
@@ -951,6 +991,12 @@ x86_64-*-linux*)
                 i386/x86-64.h i386/linux64.h"
        tmake_file="t-slibgcc-elf-ver t-linux i386/t-linux64"
        ;;
+i[34567]86-*-kfreebsd*-gnu) # must be before i[34567]86-*-gnu*
+       tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h linux.h i386/linux.h kfreebsdgnu.h i386/kfreebsdgnu.h"
+       tmake_file="t-slibgcc-elf-ver t-kfreebsd-gnu i386/t-crtstuff"
+       float_format=i386
+       use_fixproto=no
+       ;;
 i[34567]86-*-gnu*)
        ;;
 i[34567]86-pc-msdosdjgpp*)
@@ -1083,6 +1129,10 @@ i386-*-vsta)                     # Intel 80386's running VSTa kernel
        tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/vsta.h"
        use_fixproto=yes
        ;;
+i[4567]86-wrs-vxworks)
+       tm_file="${tm_file} i386/sysv4.h i386/unix.h i386/vxworks.h"
+       tmake_file="${tmake_file} i386/t-vxworks"
+       ;;
 i[34567]86-*-pe | i[34567]86-*-cygwin*)
        tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/cygming.h i386/cygwin.h"
        xm_file=i386/xm-cygwin.h
@@ -1201,7 +1251,7 @@ ia64*-*-linux*)
        fi
        ;;
 ia64*-*-hpux*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h ia64/sysv4.h ia64/hpux.h ia64/hpux_longdouble.h"
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h ia64/sysv4.h ia64/hpux.h"
        tmake_file="ia64/t-ia64 ia64/t-hpux"
        target_cpu_default="MASK_GNU_AS"
        case x$enable_threads in
@@ -1232,6 +1282,31 @@ m32r-*-elf*)
        extra_parts="crtinit.o crtfini.o"
        use_fixproto=yes
        ;;
+m32rle-*-elf*)
+       tm_file="dbxelf.h elfos.h svr4.h m32r/little.h ${tm_file}"
+       extra_parts="crtinit.o crtfini.o m32rx/crtinit.o m32rx/crtfini.o"
+       use_fixproto=yes
+       ;;
+m32r-*-linux*)
+       tm_file="dbxelf.h elfos.h svr4.h linux.h ${tm_file} m32r/linux.h"
+       extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
+       tmake_file="m32r/t-linux"
+       gnu_ld=yes
+       use_fixproto=yes
+       if test x$enable_threads = xyes; then
+               thread_file='posix'
+       fi
+       ;;
+m32rle-*-linux*)
+       tm_file="dbxelf.h elfos.h svr4.h linux.h m32r/little.h ${tm_file} m32r/linux.h"
+       extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
+       tmake_file="m32r/t-linux"
+       gnu_ld=yes
+       use_fixproto=yes
+       if test x$enable_threads = xyes; then
+               thread_file='posix'
+       fi
+       ;;
 # m68hc11 and m68hc12 share the same machine description.
 m68hc11-*-*|m6811-*-*)
        tm_file="dbxelf.h elfos.h m68hc11/m68hc11.h"
@@ -1292,12 +1367,14 @@ m68k-*-coff*)
        ;;
 m68020-*-elf* | m68k-*-elf*)
        tm_file="m68k/m68k.h m68k/m68k-none.h m68k/m68kelf.h dbxelf.h elfos.h m68k/m68kemb.h m68k/m68020-elf.h"
+       tm_defines="MOTOROLA USE_GAS"
        tmake_file=m68k/t-m68kelf
        extra_parts="crtbegin.o crtend.o"
        use_fixproto=yes
        ;;
 m68010-*-netbsdelf* | m68k*-*-netbsdelf*)
        tm_file="${tm_file} dbxelf.h elfos.h netbsd.h netbsd-elf.h m68k/netbsd-elf.h"
+       tm_defines="MOTOROLA USE_GAS"
        case ${target} in
        m68010*)
                target_cpu_default="0"
@@ -1308,6 +1385,13 @@ m68010-*-netbsdelf* | m68k*-*-netbsdelf*)
        esac
        ;;
 m68k*-*-netbsd*)
+    if test "x$enable_obsolete" != xyes; then
+      echo "*** Configuration ${target} is obsolete." >&2
+      echo "*** Specify --enable-obsolete to build it anyway." >&2
+      echo "*** Support will be REMOVED in the next major release of GCC," >&2
+      echo "*** unless a maintainer comes forward." >&2
+      exit 1
+    fi
        tm_file="m68k/m68k.h netbsd.h netbsd-aout.h m68k/netbsd.h"
        tmake_file=t-netbsd
        extra_parts=""
@@ -1328,6 +1412,12 @@ m68k-*-sysv4*)                   # Motorola m68k's running system V.4
        extra_parts="crtbegin.o crtend.o"
        use_fixproto=yes
        ;;
+m68k-*-uclinux*)               # Motorola m68k/ColdFire running uClinux with uClibc
+       tm_file="m68k/m68k.h m68k/m68k-none.h m68k/m68kelf.h dbxelf.h elfos.h m68k/uclinux.h"
+       tm_defines="MOTOROLA USE_GAS"
+       tmake_file=m68k/t-uclinux
+       use_fixproto=no
+       ;;
 m68k-*-linux*)         # Motorola m68k's running GNU/Linux
                                # with ELF format using glibc 2
                                # aka the GNU/Linux C library 6.
@@ -1338,6 +1428,7 @@ m68k-*-linux*)            # Motorola m68k's running GNU/Linux
 m68k-*-rtems*)
        tmake_file="m68k/t-m68kbare m68k/t-crtstuff t-rtems m68k/t-rtems"
        tm_file="m68k/m68k.h m68k/m68k-none.h m68k/m68kelf.h dbxelf.h elfos.h m68k/m68kemb.h m68k/m68020-elf.h m68k/rtemself.h rtems.h"
+       tm_defines="MOTOROLA USE_GAS"
        extra_parts="crtbegin.o crtend.o"
        ;;
 mcore-*-elf)
@@ -1350,40 +1441,26 @@ mcore-*-pe*)
        tmake_file=mcore/t-mcore-pe
        use_fixproto=yes
        ;;
-mips-sgi-irix6*o32)            # SGI System V.4., IRIX 6, O32 ABI
-       tm_file="${tm_file} mips/iris5.h"
+mips-sgi-irix6*)               # SGI System V.4., IRIX 6
+       tm_file="${tm_file} mips/iris5.h mips/iris6.h"
+       tmake_file="mips/t-iris mips/t-iris5-6 mips/t-iris6"
        if test x$gas = xyes
        then
-               tm_file="${tm_file} mips/sdb.h mips/iris5gas.h mips/iris6-o32-gas.h"
-               if test x$stabs = xyes
-               then
-                       tm_file="${tm_file} dbx.h mips/dbxmdebug.h"
-               fi
-               tmake_file=mips/t-iris5-gas
-       else
-               tm_file="${tm_file} mips/iris6-o32-as.h"
-               tmake_file=mips/t-iris5-as
+               tm_file="${tm_file} mips/iris6gas.h"
        fi
-       tm_file="${tm_file} mips/iris6-o32.h"
-       tmake_file="${tmake_file} mips/t-iris mips/t-iris5-6"
-       target_cpu_default="MASK_ABICALLS"
-       # mips-tfile doesn't work yet
-       # See comment in mips/iris5.h file.
-       use_collect2=yes
-#      if test x$enable_threads = xyes; then
-#              thread_file='irix'
-#      fi
-       use_fixproto=yes
-       ;;
-mips-sgi-irix6*)               # SGI System V.4., IRIX 6
-       tm_file="${tm_file} mips/iris5.h mips/iris6.h"
        if test "x$gnu_ld" = xyes
        then
                tm_file="${tm_file} mips/iris6gld.h"
+               tmake_file="$tmake_file mips/t-iris6gld"
        fi
-       tmake_file="mips/t-iris mips/t-iris5-6 mips/t-iris6"
        target_cpu_default="MASK_ABICALLS|MASK_FLOAT64|MASK_64BIT"
        tm_defines="MIPS_ISA_DEFAULT=3 MIPS_ABI_DEFAULT=ABI_N32"
+       # See comment in mips/iris5.h file.  Only enabled for O32 ABI
+       # without GNU as.
+       if test x$gas = xno
+       then
+               use_collect2=yes
+       fi
 #      if test x$enable_threads = xyes; then
 #              thread_file='irix'
 #      fi
@@ -1427,7 +1504,6 @@ mips-sgi-irix5*)          # SGI System V.4., IRIX 5
 mips*-*-netbsd*)                       # NetBSD/mips, either endian.
        target_cpu_default="MASK_GAS|MASK_ABICALLS"
        tm_file="elfos.h ${tm_file} mips/elf.h netbsd.h netbsd-elf.h mips/netbsd.h"
-       tmake_file="${tmake_file}"
        ;;
 mips64*-*-linux*)
        tm_file="dbxelf.h elfos.h svr4.h linux.h ${tm_file} mips/linux.h mips/linux64.h"
@@ -1443,9 +1519,6 @@ mips64*-*-linux*)
        extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
        gnu_ld=yes
        gas=yes
-       if test x$enable_threads = xyes; then
-               thread_file='posix'
-       fi
        ;;
 mips*-*-linux*)                                # Linux MIPS, either endian.
         tm_file="dbxelf.h elfos.h svr4.h linux.h ${tm_file} mips/linux.h"
@@ -1530,6 +1603,20 @@ mips*-*-rtems*)
        tm_file="${tm_file} mips/elf.h mips/rtems.h rtems.h"
        tmake_file="mips/t-elf t-rtems mips/t-rtems"
        ;;
+mips-wrs-vxworks)
+       # We want vxworks.h after mips/elf.h, which unfortunately means we
+       # have to redo the tm_file list from scratch.
+       tm_file="elfos.h mips/mips.h svr4.h mips/elf.h vxworks.h mips/vxworks.h"
+       tmake_file="${tmake_file} mips/t-vxworks"
+       target_cpu_default="MASK_GAS"
+       ;;
+mips-wrs-windiss)      # Instruction-level simulator for VxWorks.
+       xm_defines=POSIX
+       tm_file="elfos.h mips/mips.h svr4.h mips/elf.h windiss.h mips/windiss.h"
+       tmake_file="${tmake_file} mips/t-elf"
+       target_cpu_default="MASK_GAS"
+       thread_file=
+       ;;
 mipstx39-*-elf* | mipstx39el-*-elf*)
        tm_file="${tm_file} mips/r3900.h mips/elf.h"
        tmake_file=mips/t-r3900
@@ -1592,11 +1679,8 @@ powerpc-*-beos*)
        ;;
 powerpc-*-darwin*)
        tm_file="${tm_file} rs6000/darwin.h"
-       tmake_file="t-darwin rs6000/t-darwin"
+       tmake_file="t-darwin t-slibgcc-darwin rs6000/t-darwin"
        extra_headers=altivec.h
-       # override ppc default
-       need_64bit_hwint=
-       use_fixproto=yes
        ;;
 powerpc*-*-freebsd*)
        tm_file="${tm_file} dbxelf.h elfos.h ${fbsd_tm_file} rs6000/sysv4.h rs6000/freebsd.h"
@@ -1609,10 +1693,10 @@ powerpc-*-netbsd*)
 powerpc-*-chorusos*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h chorus.h"
        tmake_file="rs6000/t-fprules rs6000/t-ppcos rs6000/t-ppccomm"
-       case x${enable_threads} in
-         xyes | xpthreads | xposix)
-               thread_file='posix'
-               ;;
+       case ${enable_threads} in
+         yes | posix)
+           thread_file='posix'
+           ;;
        esac
        use_fixproto=yes
        ;;
@@ -1679,7 +1763,7 @@ powerpc-wrs-vxworks*)
        tmake_file="${tmake_file} rs6000/t-fprules rs6000/t-ppccomm rs6000/t-vxworks"
        extra_headers=ppc-asm.h
        ;;
-powerpc-wrs-windiss*)
+powerpc-wrs-windiss*)  # Instruction-level simulator for VxWorks.
        tm_file="${tm_file} elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/windiss.h"
         tmake_file="rs6000/t-fprules rs6000/t-ppcgas rs6000/t-ppccomm"
         thread_file=""
@@ -1757,6 +1841,15 @@ s390x-*-linux*)
        out_file=s390/s390.c
        tmake_file="t-slibgcc-elf-ver t-linux s390/t-crtstuff s390/t-linux64"
        ;;
+s390x-ibm-tpf*)
+       tm_file="s390/s390x.h s390/s390.h dbxelf.h elfos.h svr4.h s390/tpf.h"
+       tm_p_file=s390/s390-protos.h
+       md_file=s390/s390.md
+       extra_modes=s390/s390-modes.def
+       extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
+       out_file=s390/s390.c
+       tmake_file="t-slibgcc-elf-ver s390/t-crtstuff s390/t-tpf"
+       ;;
 sh-*-elf* | sh[2346l]*-*-elf* | sh*-*-kaos*)
        tmake_file="sh/t-sh sh/t-elf"
        case ${target} in
@@ -1858,6 +1951,10 @@ sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \
                ;;
        esac
        ;;
+sh-wrs-vxworks)
+       tmake_file="$tmake_file sh/t-sh sh/t-elf sh/t-vxworks"
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sh/embed-elf.h sh/vxworks.h"
+       ;;
 sh-*-*)
        tm_file="${tm_file} dbxcoff.h sh/coff.h"
        use_fixproto=yes
@@ -1878,7 +1975,7 @@ sparc-*-openbsd*)
        use_collect2=yes
        ;;
 sparc64-*-openbsd*)
-       tm_file="sparc/openbsd1-64.h sparc/sparc.h elfos.h svr4.h sparc/sysv4.h sparc/sol2.h sparc/sp64-elf.h openbsd.h sparc/openbsd64.h"
+       tm_file="sparc/openbsd1-64.h sparc/sparc.h elfos.h svr4.h sparc/sysv4.h sparc/sp64-elf.h openbsd.h sparc/openbsd64.h"
        gas=yes gnu_ld=yes
        with_cpu=ultrasparc
        ;;
@@ -1978,17 +2075,17 @@ sparc-*-sysv4*)
        use_fixproto=yes
        ;;
 sparclite-*-coff*)
-       tm_file="${tm_file} gofast.h sparc/lite.h svr3.h sparc/litecoff.h dbxcoff.h libgloss.h"
+       tm_file="${tm_file} sparc/lite.h svr3.h sparc/litecoff.h dbxcoff.h libgloss.h"
        tmake_file=sparc/t-sparclite
        ;;
 sparclite-*-elf*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/elf.h gofast.h sparc/liteelf.h"
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/elf.h sparc/liteelf.h"
        tmake_file="sparc/t-sparclite sparc/t-crtfm"
         extra_parts="crtbegin.o crtend.o"
        use_fixproto=yes
        ;;
 sparc86x-*-elf*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/elf.h gofast.h sparc/sp86x-elf.h"
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/elf.h sparc/sp86x-elf.h"
        tmake_file="sparc/t-sp86x sparc/t-crtfm"
         extra_parts="crtbegin.o crtend.o"
        use_fixproto=yes
@@ -2118,6 +2215,13 @@ vax-*-ultrix*)                   # VAXen running ultrix
        use_fixproto=yes
        ;;
 vax-*-*)                       # VAX default entry
+    if test "x$enable_obsolete" != xyes; then
+      echo "*** Configuration ${target} is obsolete." >&2
+      echo "*** Specify --enable-obsolete to build it anyway." >&2
+      echo "*** Support will be REMOVED in the next major release of GCC," >&2
+      echo "*** unless a maintainer comes forward." >&2
+      exit 1
+    fi
        use_fixproto=yes
        ;;
 xscale-*-elf)
@@ -2156,11 +2260,8 @@ xtensa-*-linux*)
        ;;
 am33_2.0-*-linux*)
        tm_file="mn10300/mn10300.h dbxelf.h elfos.h linux.h mn10300/linux.h"
-       tmake_file="t-linux mn10300/t-linux"
+       tmake_file="t-slibgcc-elf-ver t-linux mn10300/t-linux"
        gas=yes gnu_ld=yes
-       if test x$enable_threads = xyes; then
-               thread_file='posix'
-       fi
        extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
        use_collect2=no
        ;;
@@ -2191,7 +2292,7 @@ if test x$with_cpu = x ; then
       with_cpu=i486
       ;;
     i586-*-*)
-      case $target_alias in
+      case ${target_noncanonical} in
         k6_2-*)
           with_cpu=k6-2
           ;;
@@ -2210,8 +2311,8 @@ if test x$with_cpu = x ; then
       esac
       ;;
     i686-*-* | i786-*-*)
-      case $target_alias in
-        k8-*)
+      case ${target_noncanonical} in
+        k8-*|opteron-*|athlon_64-*)
           with_cpu=k8
           ;;
         athlon_xp-*|athlon_mp-*|athlon_4-*)
@@ -2308,9 +2409,9 @@ fi
                        | arm7m | arm7dm | arm7dmi | arm[79]tdmi \
                        | arm70 | arm700i | arm710t | arm720 \
                        | arm720t | arm740t | arm710c | arm920 \
-                       | arm920t | arm940t | arm9e | arm10tdmi \
+                       | arm920t | arm926ejs | arm940t | arm9e | arm10tdmi \
                        | arm7100 | arm7500 | arm7500fe | arm810 \
-                       | arm1020t \
+                       | arm1026ejs | arm1020t | arm1136js | arm1136jfs \
                        | xscale | iwmmxt \
                        | ep9312 \
                        | strongarm | strongarm110 | strongarm11[01]0)
@@ -2326,7 +2427,7 @@ fi
                case "$with_arch" in
                "" \
                | armv[2345] | armv2a | armv3m | armv4t | armv5t \
-               | armv5te | ep9312)
+               | armv5te | armv6j | ep9312)
                        # OK
                        ;;
                *)
@@ -2384,7 +2485,8 @@ fi
                        | i586 | pentium | pentium-mmx | winchip-c6 | winchip2 \
                        | c3 | c3-2 | i686 | pentiumpro | pentium2 | pentium3 \
                        | pentium4 | k6 | k6-2 | k6-3 | athlon | athlon-tbird \
-                       | athlon-4 | athlon-xp | athlon-mp | k8)
+                       | athlon-4 | athlon-xp | athlon-mp | k8 | opteron \
+                       | athlon64 | athlon-fx)
                                # OK
                                ;;
                        *)
@@ -2425,14 +2527,18 @@ fi
                for which in cpu tune; do
                        eval "val=\$with_$which"
                        case ${val} in
-                       "" | default32 | default64 | common \
+                       default32 | default64)
+                               with_which="with_$which"
+                               eval $with_which=
+                               ;;
+                       "" | common \
                        | power | power2 | power3 | power4 \
                        | powerpc | powerpc64 \
                        | rios | rios1 | rios2 | rsc | rsc1 | rs64a \
                        | 401 | 403 | 405 | 405fp | 440 | 440fp | 505 \
                        | 601 | 602 | 603 | 603e | ec603e | 604 \
                        | 604e | 620 | 630 | 740 | 750 | 7400 | 7450 \
-                       | 8540 | 801 | 821 | 823 | 860 | 970)
+                       | 8540 | 801 | 821 | 823 | 860 | 970 | G3 | G4 | G5)
                                # OK
                                ;;
                        *)
@@ -2576,8 +2682,7 @@ fi
                esac
                if test "x$enable_gofast" = xyes
                then
-                       tm_defines="INIT_SUBTARGET_OPTABS=INIT_GOFAST_OPTABS $tm_defines"
-                       tm_file="gofast.h $tm_file"
+                       tm_defines="US_SOFTWARE_GOFAST $tm_defines"
                        tmake_file="mips/t-gofast $tmake_file"
                else
                        tmake_file="mips/t-mips $tmake_file"