OSDN Git Service

gcc/
[pf3gnuchains/gcc-fork.git] / gcc / config.gcc
index dbc6deb..7a911ff 100644 (file)
@@ -1,5 +1,5 @@
 # GCC target-specific configuration file.
-# Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+# Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 # Free Software Foundation, Inc.
 
 #This file is part of GCC.
@@ -25,6 +25,9 @@
 # configure script.  Putting it in a separate shell file lets us skip
 # running autoconf when modifying target-specific information.
 
+# When you change the cases in the OS or target switches, consider
+# updating ../libgcc/config.host also.
+
 # This file switches on the shell variable ${target}, and also uses the
 # following shell variables:
 #
@@ -268,11 +271,13 @@ xscale-*-*)
        ;;
 i[34567]86-*-*)
        cpu_type=i386
-       extra_headers="mmintrin.h mm3dnow.h xmmintrin.h emmintrin.h pmmintrin.h"
+       extra_headers="mmintrin.h mm3dnow.h xmmintrin.h emmintrin.h
+                      pmmintrin.h tmmintrin.h"
        ;;
 x86_64-*-*)
        cpu_type=i386
-       extra_headers="mmintrin.h mm3dnow.h xmmintrin.h emmintrin.h pmmintrin.h"
+       extra_headers="mmintrin.h mm3dnow.h xmmintrin.h emmintrin.h
+                      pmmintrin.h tmmintrin.h"
        need_64bit_hwint=yes
        ;;
 ia64-*-*)
@@ -301,7 +306,7 @@ powerpc*-*-*)
        extra_headers="ppc-asm.h altivec.h spe.h"
        need_64bit_hwint=yes
        case x$with_cpu in
-           xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[345]|xrs64a)
+           xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[3456]|xpower6x|xrs64a)
                cpu_is_64bit=yes
                ;;
        esac
@@ -309,6 +314,9 @@ powerpc*-*-*)
 rs6000*-*-*)
        need_64bit_hwint=yes
        ;;
+score*-*-*)
+       cpu_type=score
+       ;;
 sparc64*-*-*)
        cpu_type=sparc
        need_64bit_hwint=yes
@@ -316,6 +324,10 @@ sparc64*-*-*)
 sparc*-*-*)
        cpu_type=sparc
        ;;
+spu*-*-*)
+       cpu_type=spu
+       need_64bit_hwint=yes
+       ;;
 s390*-*-*)
        cpu_type=s390
        need_64bit_hwint=yes
@@ -361,7 +373,13 @@ esac
 # Common parts for widely ported systems.
 case ${target} in
 *-*-darwin*)
-  tm_file="${tm_file} darwin.h ${cpu_type}/darwin.h"
+  tm_file="${tm_file} darwin.h"
+  case ${target} in
+  *-*-darwin9*)
+    tm_file="${tm_file} darwin9.h"
+    ;;
+  esac
+  tm_file="${tm_file} ${cpu_type}/darwin.h"
   tm_p_file="${tm_p_file} darwin-protos.h"
   tmake_file="t-darwin ${cpu_type}/t-darwin t-slibgcc-darwin"
   target_gtfiles="\$(srcdir)/config/darwin.c"
@@ -438,7 +456,7 @@ case ${target} in
           ;;
       esac
       ;;
-    *) 
+    *)
       echo 'Unknown thread configuration for FreeBSD'
       exit 1
       ;;
@@ -693,13 +711,13 @@ arm*-*-netbsd*)
        use_collect2=yes
        ;;
 arm*-*-linux*)                 # ARM GNU/Linux with ELF
-       tm_file="dbxelf.h elfos.h linux.h arm/elf.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"
        tmake_file="${tmake_file} t-linux arm/t-arm"
        case ${target} in
        arm*-*-linux-*eabi)
            tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h"
            tmake_file="$tmake_file arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi"
-           # The BPABI long long divmod functions return a 128-bit value in 
+           # The BPABI long long divmod functions return a 128-bit value in
            # registers r0-r3.  Correctly modeling that requires the use of
            # TImode.
            need_64bit_hwint=yes
@@ -721,7 +739,7 @@ arm*-*-ecos-elf)
        tmake_file="arm/t-arm arm/t-arm-elf"
        ;;
 arm*-*-eabi* | arm*-*-symbianelf* )
-       # The BPABI long long divmod functions return a 128-bit value in 
+       # The BPABI long long divmod functions return a 128-bit value in
        # registers r0-r3.  Correctly modeling that requires the use of
        # TImode.
        need_64bit_hwint=yes
@@ -783,6 +801,10 @@ bfin*-uclinux*)
         tmake_file=bfin/t-bfin-elf
         use_collect2=no
         ;;
+bfin*-rtems*)
+       tm_file="${tm_file} dbxelf.h elfos.h bfin/elf.h bfin/rtems.h rtems.h"
+       tmake_file="bfin/t-bfin t-rtems bfin/t-rtems"
+        ;;
 bfin*-*)
        tm_file="${tm_file} dbxelf.h elfos.h bfin/elf.h"
         tmake_file=bfin/t-bfin
@@ -931,6 +953,7 @@ hppa[12]*-*-hpux10*)
        fi
        use_collect2=yes
        use_fixproto=yes
+       gas=yes
        ;;
 hppa*64*-*-hpux11*)
        target_cpu_default="MASK_PA_11|MASK_PA_20"
@@ -938,16 +961,9 @@ hppa*64*-*-hpux11*)
        then
                target_cpu_default="${target_cpu_default}|MASK_GNU_LD"
        fi
-       if test x$gas = xyes
-       then
-               tm_file="pa/pa64-start.h ${tm_file} dbxelf.h elfos.h \
-                        pa/pa64-regs.h pa/pa-hpux.h pa/pa-hpux1010.h \
-                        pa/pa-hpux11.h"
-       else
-               tm_file="pa/pa64-start.h ${tm_file} dbxelf.h pa/elf.h \
-                        pa/pa64-regs.h pa/pa-hpux.h pa/pa-hpux1010.h \
-                        pa/pa-hpux11.h"
-       fi
+       tm_file="pa/pa64-start.h ${tm_file} dbxelf.h elfos.h \
+                pa/pa64-regs.h pa/pa-hpux.h pa/pa-hpux1010.h \
+                pa/pa-hpux11.h"
        case ${target} in
        *-*-hpux11.[1-9]*)
                tm_file="${tm_file} pa/pa-hpux1111.h pa/pa-64.h pa/pa64-hpux.h"
@@ -970,10 +986,11 @@ hppa*64*-*-hpux11*)
        extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o \
                     libgcc_stub.a"
        case x${enable_threads} in
-       xyes | xposix )
-               thread_file=posix 
+       x | xyes | xposix )
+               thread_file=posix
                ;;
        esac
+       gas=yes
        ;;
 hppa[12]*-*-hpux11*)
        case ${target} in
@@ -998,14 +1015,28 @@ hppa[12]*-*-hpux11*)
            tmake_file="$tmake_file pa/t-slibgcc-dwarf-ver"
        fi
        case x${enable_threads} in
-       xyes | xposix )
-               thread_file=posix 
+       x | xyes | xposix )
+               thread_file=posix
                ;;
        esac
        use_collect2=yes
+       gas=yes
        ;;
 i[34567]86-*-darwin*)
-       # All the configuration is presently done generically.
+       need_64bit_hwint=yes
+
+       # This is so that '.../configure && make' doesn't fail due to
+       # config.guess deciding that the configuration is i386-*-darwin* and
+       # then this file using that to set --with-cpu=i386 which has no -m64
+       # support.
+       with_arch=${with_arch:-nocona}
+       with_cpu=${with_cpu:-generic}
+       ;;
+x86_64-*-darwin*)
+       with_arch=${with_arch:-nocona}
+       with_cpu=${with_cpu:-generic}
+       tmake_file="t-darwin ${cpu_type}/t-darwin64 t-slibgcc-darwin"
+       tm_file="${tm_file} ${cpu_type}/darwin64.h"
        ;;
 i[34567]86-*-elf*)
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h i386/i386elf.h"
@@ -1069,10 +1100,34 @@ i[34567]86-*-coff*)
 i[34567]86-*-linux* | i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-knetbsd*-gnu)
                        # Intel 80386's running GNU/*
                        # with ELF format using glibc 2
-       tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h linux.h i386/linux.h"
+       tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h linux.h"
        case ${target} in
-       i[34567]86-*-knetbsd*-gnu) tm_file="${tm_file} knetbsd-gnu.h i386/knetbsd-gnu.h" ;;
-       i[34567]86-*-kfreebsd*-gnu) tm_file="${tm_file} kfreebsd-gnu.h i386/kfreebsd-gnu.h" ;;
+       i[34567]86-*-linux*)
+               if test x$enable_targets = xall; then
+                       tm_file="${tm_file} i386/x86-64.h i386/linux64.h"
+                       tm_defines="${tm_defines} TARGET_BI_ARCH=1"
+                       tmake_file="${tmake_file} i386/t-linux64"
+                       need_64bit_hwint=yes
+                       # FIXME: -m64 for i[34567]86-*-* should be allowed just
+                       # like -m32 for x86_64-*-*.
+                       case X"${with_cpu}" in
+                       Xgeneric|Xcore2|Xnocona|Xx86-64|Xk8|Xopteron|Xathlon64|Xathlon-fx)
+                               ;;
+                       X)
+                               with_cpu=generic
+                               ;;
+                       *)
+                               echo "Unsupported CPU used in --with-cpu=$with_cpu, supported values:" 1>&2
+                               echo "generic core2 nocona x86-64 k8 opteron athlon64 athlon-fx" 1>&2
+                               exit 1
+                               ;;
+                       esac
+               else
+                       tm_file="${tm_file} i386/linux.h"
+               fi
+               ;;
+       i[34567]86-*-knetbsd*-gnu) tm_file="${tm_file} i386/linux.h knetbsd-gnu.h i386/knetbsd-gnu.h" ;;
+       i[34567]86-*-kfreebsd*-gnu) tm_file="${tm_file} i386/linux.h kfreebsd-gnu.h i386/kfreebsd-gnu.h" ;;
        esac
        tmake_file="${tmake_file} i386/t-crtstuff i386/t-crtfm t-dfprules"
        ;;
@@ -1168,6 +1223,9 @@ i[34567]86-*-solaris2*)
        else
                tmake_file="$tmake_file t-slibgcc-sld"
        fi
+       if test x$gas = xyes; then
+               tm_file="usegas.h ${tm_file}"
+       fi
        case ${target} in
        *-*-solaris2.[789] | *-*-solaris2.1[0-9]*)
                tm_file="$tm_file tm-dwarf2.h"
@@ -1179,7 +1237,21 @@ i[34567]86-*-solaris2*)
                tm_defines="${tm_defines} TARGET_BI_ARCH=1"
                tmake_file="$tmake_file i386/t-sol2-10"
                need_64bit_hwint=yes
-               # Solaris 2.10 provides crt1.o, crti.o, crtn.o, and gcrt1.o as 
+               # FIXME: -m64 for i[34567]86-*-* should be allowed just
+               # like -m32 for x86_64-*-*.
+               case X"${with_cpu}" in
+               Xgeneric|Xcore2|Xnocona|Xx86-64|Xk8|Xopteron|Xathlon64|Xathlon-fx)
+                       ;;
+               X)
+                       with_cpu=generic
+                       ;;
+               *)
+                       echo "Unsupported CPU used in --with-cpu=$with_cpu, supported values:" 1>&2
+                       echo "generic core2 nocona x86-64 k8 opteron athlon64 athlon-fx" 1>&2
+                       exit 1
+                       ;;
+               esac
+               # Solaris 2.10 provides crt1.o, crti.o, crtn.o, and gcrt1.o as
                # part of the base system.
                extra_parts="gmon.o crtbegin.o crtend.o"
                ;;
@@ -1261,8 +1333,12 @@ i[34567]86-*-mingw32*)
        extra_options="${extra_options} i386/cygming.opt"
        extra_objs="winnt.o winnt-stubs.o"
        cxx_target_objs=winnt-cxx.o
+       default_use_cxa_atexit=yes
        case ${enable_threads} in
-         "" | yes | win32) thread_file='win32' ;;
+         "" | yes | win32)
+         thread_file='win32'
+         tmake_file="${tmake_file} i386/t-gthr-win32"
+         ;;
        esac
        case ${target} in
                *mingw32crt*)
@@ -1402,53 +1478,64 @@ m68hc12-*-*|m6812-*-*)
        use_fixproto=yes
         ;;
 m68k-*-aout*)
+       default_m68k_cpu=68020
        tmake_file=m68k/t-m68kbare
-       tm_file="m68k/m68k.h m68k/m68k-none.h m68k/m68kemb.h m68k/m68k-aout.h libgloss.h"
+       tm_file="${tm_file} m68k/m68k-none.h m68k/m68kemb.h m68k/m68k-aout.h libgloss.h"
        ;;
 m68k-*-coff*)
+       default_m68k_cpu=68020
        tmake_file=m68k/t-m68kbare
-       tm_defines="${tm_defines} MOTOROLA USE_GAS"
-       tm_file="m68k/m68k.h m68k/m68k-none.h m68k/m68kemb.h dbxcoff.h m68k/coff.h dbx.h"
+       tm_defines="${tm_defines} MOTOROLA=1 USE_GAS"
+       tm_file="${tm_file} m68k/m68k-none.h m68k/m68kemb.h dbxcoff.h m68k/coff.h dbx.h"
        use_fixproto=yes
        ;;
 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="${tm_defines} MOTOROLA USE_GAS"
+       default_m68k_cpu=68020
+       tm_file="${tm_file} m68k/m68k-none.h m68k/m68kelf.h dbxelf.h elfos.h m68k/m68kemb.h m68k/m68020-elf.h"
+       tm_defines="${tm_defines} MOTOROLA=1 USE_GAS"
        tmake_file=m68k/t-m68kelf
        extra_parts="crtbegin.o crtend.o"
        ;;
 m68010-*-netbsdelf* | m68k*-*-netbsdelf*)
+       default_m68k_cpu=68020
        tm_file="${tm_file} dbxelf.h elfos.h netbsd.h netbsd-elf.h m68k/netbsd-elf.h"
-       tm_defines="${tm_defines} MOTOROLA USE_GAS"
-       case ${target} in
-       m68010*)
-               target_cpu_default="0"
-               ;;
-       *)
-               target_cpu_default="MASK_68020|MASK_68881|MASK_BITFIELD"
-               ;;
-       esac
+       tm_defines="${tm_defines} MOTOROLA=1 USE_GAS"
        ;;
 m68k*-*-openbsd*)
+       default_m68k_cpu=68020
        # needed to unconfuse gdb
-       tm_defines="${tm_defines} OBSD_OLD_GAS TARGET_DEFAULT=(MASK_68020|MASK_68881|MASK_BITFIELD)"
-       tm_file="m68k/m68k.h openbsd.h m68k/openbsd.h"
+       tm_defines="${tm_defines} OBSD_OLD_GAS"
+       tm_file="${tm_file} openbsd.h m68k/openbsd.h"
        tmake_file="t-libc-ok t-openbsd m68k/t-openbsd"
        # we need collect2 until our bug is fixed...
        use_collect2=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="${tm_defines} MOTOROLA USE_GAS"
+m68k-*-uclinuxoldabi*)         # Motorola m68k/ColdFire running uClinux
+                               # with uClibc, using the original
+                               # m68k-elf-based ABI
+       default_m68k_cpu=68020
+       tm_file="${tm_file} m68k/m68k-none.h m68k/m68kelf.h dbxelf.h elfos.h m68k/uclinux-oldabi.h"
+       tm_defines="${tm_defines} MOTOROLA=1 USE_GAS"
+       tmake_file=m68k/t-uclinux
+       use_fixproto=no
+       ;;
+m68k-*-uclinux*)               # Motorola m68k/ColdFire running uClinux
+                               # with uClibc, using the new GNU/Linux-style
+                               # ABI.
+       default_m68k_cpu=68020
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h flat.h m68k/linux.h m68k/uclinux.h"
+       tm_defines="${tm_defines} MOTOROLA=1 USE_GAS UCLIBC_DEFAULT=1"
+       extra_options="${extra_options} linux.opt"
        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.
-       tm_file="m68k/m68k.h dbxelf.h elfos.h svr4.h linux.h m68k/linux.h"
+       default_m68k_cpu=68020
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h m68k/linux.h"
        extra_options="${extra_options} m68k/ieee.opt"
-       tm_defines="${tm_defines} MOTOROLA USE_GAS"
+       tm_defines="${tm_defines} MOTOROLA=1 USE_GAS"
        # if not configured with --enable-sjlj-exceptions, bump the
        # libgcc version number
        if test x$sjlj != x1; then
@@ -1456,9 +1543,10 @@ m68k-*-linux*)           # Motorola m68k's running GNU/Linux
        fi
        ;;
 m68k-*-rtems*)
+       default_m68k_cpu=68020
        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="${tm_defines} MOTOROLA USE_GAS"
+       tm_file="${tm_file} 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="${tm_defines} MOTOROLA=1 USE_GAS"
        extra_parts="crtbegin.o crtend.o"
        ;;
 mcore-*-elf)
@@ -1524,7 +1612,7 @@ mips*-*-openbsd*)
        target_cpu_default="MASK_ABICALLS"
        tm_file="mips/mips.h openbsd.h mips/openbsd.h mips/sdb.h"
        case ${target} in
-       mips*el-*-openbsd*) 
+       mips*el-*-openbsd*)
            tm_defines="${tm_defines} TARGET_ENDIAN_DEFAULT=0";;
        *)  tm_defines="${tm_defines} TARGET_ENDIAN_DEFAULT=MASK_BIG_ENDIAN";;
         esac
@@ -1557,7 +1645,7 @@ mipsisa64sr71k-*-elf*)
         ;;
 mipsisa64sb1-*-elf* | mipsisa64sb1el-*-elf*)
        tm_file="elfos.h ${tm_file} mips/elf.h"
-       tmake_file=mips/t-elf
+       tmake_file="mips/t-elf mips/t-sb1"
        target_cpu_default="MASK_64BIT|MASK_FLOAT64"
        tm_defines="${tm_defines} MIPS_ISA_DEFAULT=64 MIPS_CPU_STRING_DEFAULT=\\\"sb1\\\" MIPS_ABI_DEFAULT=ABI_O64"
        use_fixproto=yes
@@ -1672,7 +1760,7 @@ powerpc-*-darwin*)
        extra_parts="crt2.o"
        case ${target} in
          *-darwin1[0-9]* | *-darwin[8-9]*)
-           tmake_file="${tmake_file} rs6000/t-darwin8" 
+           tmake_file="${tmake_file} rs6000/t-darwin8"
            tm_file="${tm_file} rs6000/darwin8.h"
            ;;
          *-darwin7*)
@@ -1683,6 +1771,12 @@ powerpc-*-darwin*)
        esac
        extra_headers=altivec.h
        ;;
+powerpc64-*-darwin*)
+       tm_file="${tm_file} ${cpu_type}/darwin8.h ${cpu_type}/darwin64.h"
+       extra_options="${extra_options} ${cpu_type}/darwin.opt"
+       # We're omitting t-darwin8 to avoid building any multilibs
+       extra_headers=altivec.h
+       ;;
 powerpc*-*-freebsd*)
        tm_file="${tm_file} dbxelf.h elfos.h ${fbsd_tm_file} rs6000/sysv4.h rs6000/freebsd.h"
        tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
@@ -1705,17 +1799,17 @@ powerpc-*-chorusos*)
        use_fixproto=yes
        ;;
 powerpc-*-eabispe*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/eabispe.h"
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h rs6000/eabispe.h"
        extra_options="${extra_options} rs6000/sysv4.opt"
        tmake_file="rs6000/t-spe rs6000/t-ppccomm"
        ;;
 powerpc-*-eabisimaltivec*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/eabisim.h rs6000/eabialtivec.h"
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h rs6000/eabisim.h rs6000/eabialtivec.h"
        extra_options="${extra_options} rs6000/sysv4.opt"
        tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcendian rs6000/t-ppccomm"
        ;;
 powerpc-*-eabisim*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/eabisim.h"
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h rs6000/eabisim.h"
        extra_options="${extra_options} rs6000/sysv4.opt"
        tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
        ;;
@@ -1726,17 +1820,17 @@ powerpc-*-elf*)
        use_fixproto=yes
        ;;
 powerpc-*-eabialtivec*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/eabialtivec.h"
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h rs6000/eabialtivec.h"
        extra_options="${extra_options} rs6000/sysv4.opt"
        tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcendian rs6000/t-ppccomm"
        ;;
 powerpc-*-eabi*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h"
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h"
        extra_options="${extra_options} rs6000/sysv4.opt"
        tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
        ;;
 powerpc-*-rtems*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/rtems.h rtems.h"
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/e500.h rs6000/rtems.h rtems.h"
        extra_options="${extra_options} rs6000/sysv4.opt"
        tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-rtems t-rtems rs6000/t-ppccomm"
        ;;
@@ -1746,7 +1840,7 @@ powerpc-*-linux*altivec*)
        tmake_file="rs6000/t-fprules rs6000/t-fprules-softfp soft-fp/t-softfp rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
        ;;
 powerpc-*-linux*spe*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/linux.h rs6000/linuxspe.h"
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/linux.h rs6000/linuxspe.h rs6000/e500.h"
        extra_options="${extra_options} rs6000/sysv4.opt"
        tmake_file="rs6000/t-fprules rs6000/t-fprules-softfp soft-fp/t-softfp rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
        ;;
@@ -1796,11 +1890,11 @@ powerpc-wrs-vxworks|powerpc-wrs-vxworksae)
        extra_headers=ppc-asm.h
        case ${target} in
          *-vxworksae*)
-           tm_file="${tm_file} vx-common.h vxworksae.h rs6000/vxworks.h rs6000/vxworksae.h"
+           tm_file="${tm_file} vx-common.h vxworksae.h rs6000/vxworks.h rs6000/e500.h rs6000/vxworksae.h"
            tmake_file="${tmake_file} rs6000/t-vxworksae"
            ;;
          *-vxworks*)
-           tm_file="${tm_file} vx-common.h vxworks.h rs6000/vxworks.h"
+           tm_file="${tm_file} vx-common.h vxworks.h rs6000/vxworks.h rs6000/e500.h"
            ;;
        esac
        ;;
@@ -1835,12 +1929,12 @@ powerpcle-*-elf*)
        use_fixproto=yes
        ;;
 powerpcle-*-eabisim*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/eabi.h rs6000/eabisim.h"
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/eabi.h rs6000/e500.h rs6000/eabisim.h"
        tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
        extra_options="${extra_options} rs6000/sysv4.opt"
        ;;
 powerpcle-*-eabi*)
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/eabi.h"
+       tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/eabi.h rs6000/e500.h"
        tmake_file="rs6000/t-fprules rs6000/t-fprules-fpbit rs6000/t-ppcgas rs6000/t-ppccomm"
        extra_options="${extra_options} rs6000/sysv4.opt"
        ;;
@@ -1909,6 +2003,11 @@ s390x-ibm-tpf*)
         thread_file='tpf'
        extra_options="${extra_options} s390/tpf.opt"
        ;;
+score-*-elf)
+        tm_file="dbxelf.h elfos.h score/elf.h score/score.h"
+        tmake_file=score/t-score-elf
+        extra_objs="score-mdaux.o"
+        ;;
 sh-*-elf* | sh[12346l]*-*-elf* | sh*-*-kaos* | \
 sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
   sh-*-linux* | sh[346lbe]*-*-linux* | \
@@ -1950,7 +2049,8 @@ sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
                                with_libgloss=yes
                                tm_file="${tm_file} sh/newlib.h"
                        fi
-                       tm_file="${tm_file} sh/embed-elf.h"
+                       tm_file="${tm_file} sh/embed-elf.h sh/superh.h"
+                       tmake_file="${tmake_file} sh/t-superh"
                        extra_options="${extra_options} sh/superh.opt" ;;
        *)              if test x$with_newlib = xyes \
                           && test x$with_libgloss = xyes; then
@@ -1985,7 +2085,7 @@ sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
                tm_file="sh/symbian-pre.h sh/little.h ${tm_file} sh/symbian-post.h"
                extra_objs="symbian.o"
                extra_parts="crt1.o crti.o crtn.o crtbegin.o crtend.o crtbeginS.o crtendS.o"
-               ;;      
+               ;;
        esac
        # sed el/eb endian suffixes away to avoid confusion with sh[23]e
        case `echo ${target} | sed 's/e[lb]-/-/'` in
@@ -2249,6 +2349,14 @@ sparc64-*-netbsd*)
        extra_options="${extra_options} sparc/long-double-switch.opt"
        tmake_file="${tmake_file} sparc/t-netbsd64"
        ;;
+spu-*-elf*)
+       tm_file="dbxelf.h elfos.h spu/spu-elf.h spu/spu.h"
+       tmake_file="spu/t-spu-elf"
+       extra_headers="spu_intrinsics.h spu_internals.h vmx2spu.h spu_mfcio.h vec_types.h"
+       extra_modes=spu/spu-modes.def
+       c_target_objs="${c_target_objs} spu-c.o"
+       cxx_target_objs="${cxx_target_objs} spu-c.o"
+       ;;
 strongarm-*-elf*)
        tm_file="arm/strongarm-elf.h dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h"
        tmake_file="arm/t-arm arm/t-strongarm-elf"
@@ -2484,6 +2592,9 @@ if test x$with_cpu = x ; then
         nocona-*)
           with_cpu=nocona
           ;;
+       core2-*)
+         with_cpu=core2
+         ;;
         pentium_m-*)
           with_cpu=pentium-m
           ;;
@@ -2503,6 +2614,9 @@ if test x$with_cpu = x ; then
         nocona-*)
           with_cpu=nocona
           ;;
+       core2-*)
+         with_cpu=core2
+         ;;
         *)
           with_cpu=generic
           ;;
@@ -2529,6 +2643,12 @@ if test x$with_cpu = x ; then
     frv550-*-*linux*)
       with_cpu=fr550
       ;;
+    m680[012]0-*-*)
+      with_cpu=`echo ${target} | sed 's/-.*$//'`
+      ;;
+    m68k*-*-*)
+      with_cpu=m${default_m68k_cpu}
+      ;;
     sparc*-*-*)
       with_cpu="`echo ${target} | sed 's/-.*$//'`"
       ;;
@@ -2677,16 +2797,33 @@ case "${target}" in
                esac
                ;;
 
-       m68k*-linux*)
+       m680[012]0-*-* | m68k*-*-*)
                supported_defaults="cpu"
+
+               # We always have a $with_cpu setting here.
                case "$with_cpu" in
-               "" | "m68020" | "m68030" | "m68040" | "m68060" | "m68020-40" | "m68020-60")
-                       # OK
+               "m68000" | "m68010" | "m68020" | "m68030" | "m68040" | "m68060")
+                       m68k_cpu_ident=$with_cpu
+                       ;;
+               "m68020-40")
+                       m68k_cpu_ident=m68020
+                       tm_defines="$tm_defines M68K_DEFAULT_TUNE=u68020_40"
+                       ;;
+               "m68020-60")
+                       m68k_cpu_ident=m68020
+                       tm_defines="$tm_defines M68K_DEFAULT_TUNE=u68020_60"
                        ;;
                *)
-                       echo "Unknown CPU used in --with-cpu=$with_cpu, known values:"  1>&2
-                       echo "m68020 m68030 m68040 m68060 m68020-40 m68020-60" 1>&2
-                       exit 1
+                       # We need the C identifier rather than the string.
+                       m68k_cpu_ident=`awk -v arg="\"$with_cpu\"" \
+                          'BEGIN { FS="[ \t]*[,()][ \t]*" }; \
+                           $1 == "M68K_DEVICE" && $2 == arg { print $3 }' \
+                                ${srcdir}/config/m68k/m68k-devices.def`
+                       if [ x"$m68k_cpu_ident" = x ] ; then
+                               echo "Unknown CPU used in --with-cpu=$with_cpu" 1>&2
+                               exit 1
+                       fi
+                       with_cpu="mcpu=$with_cpu"
                        ;;
                esac
                ;;
@@ -2734,7 +2871,7 @@ case "${target}" in
                                esac
                                # OK
                                ;;
-                       "" | k8 | opteron | athlon64 | athlon-fx | nocona | generic)
+                       "" | k8 | opteron | athlon64 | athlon-fx | nocona | core2 | generic)
                                # OK
                                ;;
                        *)
@@ -2812,7 +2949,7 @@ case "${target}" in
                                eval "with_$which=405"
                                ;;
                        "" | common \
-                       | power | power[2345] | powerpc | powerpc64 \
+                       | power | power[23456] | power6x | powerpc | powerpc64 \
                        | rios | rios1 | rios2 | rsc | rsc1 | rs64a \
                        | 401 | 403 | 405 | 405fp | 440 | 440fp | 505 \
                        | 601 | 602 | 603 | 603e | ec603e | 604 \
@@ -2937,37 +3074,6 @@ case ${target} in
                fi
                ;;
 
-       m68k*-linux*)
-               case "x$with_cpu" in
-               x)
-                       # The most generic
-                       target_cpu_default2="(MASK_68020|MASK_68881|MASK_BITFIELD)"
-                       ;;
-               xm68020)
-                       target_cpu_default2="(MASK_68020|MASK_68881|MASK_BITFIELD)"
-                       ;;
-               xm68030)
-                       target_cpu_default2="(MASK_68030|MASK_68020|MASK_68881|MASK_BITFIELD)"
-                       ;;
-               xm68040)
-                       target_cpu_default2="(MASK_68040|MASK_68040_ONLY|MASK_68020|MASK_68881|MASK_BITFIELD)"
-                       ;;
-               xm68060)
-                       target_cpu_default2="(MASK_68060|MASK_68040_ONLY|MASK_68020|MASK_68881|MASK_BITFIELD)"
-                       ;;
-               xm68020-40)
-                       target_cpu_default2="(MASK_BITFIELD|MASK_68881|MASK_68020|MASK_68040)"
-                       ;;
-               xm68020-60)
-                       target_cpu_default2="(MASK_BITFIELD|MASK_68881|MASK_68020|MASK_68040|MASK_68060)"
-                       ;;
-               *)
-                       echo "Unknown CPU used in --with-cpu=$with_cpu"  1>&2
-                       exit 1
-                       ;;
-               esac
-               ;;
-
        hppa*-*-* | parisc*-*-*)
                target_cpu_default2="MASK_BIG_SWITCH"
                if test x$gas = xyes
@@ -2976,6 +3082,10 @@ case ${target} in
                fi
                ;;
 
+       m680[012]0-*-* | m68k*-*-*)
+               target_cpu_default2=$m68k_cpu_ident
+               ;;
+
        mips*-*-*)
                if test x$gnu_ld = xyes
                then