OSDN Git Service

* fold-const.c (fold) <TRUNC_MOD_EXPR>: The transformation "X % -Y"
[pf3gnuchains/gcc-fork.git] / gcc / config.gcc
index 0e8ad94..1899bd9 100644 (file)
@@ -248,11 +248,11 @@ xscale-*-*)
        ;;
 i[34567]86-*-*)
        cpu_type=i386
-       extra_headers="mmintrin.h xmmintrin.h emmintrin.h pmmintrin.h"
+       extra_headers="mmintrin.h mm3dnow.h xmmintrin.h emmintrin.h pmmintrin.h"
        ;;
 x86_64-*-*)
        cpu_type=i386
-       extra_headers="mmintrin.h xmmintrin.h emmintrin.h pmmintrin.h"
+       extra_headers="mmintrin.h mm3dnow.h xmmintrin.h emmintrin.h pmmintrin.h"
        need_64bit_hwint=yes
        ;;
 ia64-*-*)
@@ -295,7 +295,7 @@ s390*-*-*)
        need_64bit_hwint=yes
        ;;
 # Note the 'l'; we need to be able to match e.g. "shle" or "shl".
-sh[123456789l]*-*-*)
+sh[123456789lbe]*-*-*)
        cpu_type=sh
        need_64bit_hwint=yes
        ;;
@@ -331,6 +331,10 @@ esac
 # Common parts for widely ported systems.
 case ${target} in
 *-*-darwin*)
+  case ${target} in
+    *-darwin[0-6]*) ;;
+    *) tm_file="${tm_file} darwin7.h" ;;
+  esac
   tm_file="${tm_file} darwin.h"
   tm_p_file="${tm_p_file} darwin-protos.h"
   tmake_file="t-darwin t-slibgcc-darwin"
@@ -408,21 +412,10 @@ 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.
   ;;
-*-*-linux* | frv-*-*linux*)
+*-*-linux* | frv-*-*linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu)
   # Must come before *-*-gnu* (because of *-*-linux-gnu* systems).
   extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
   gas=yes
@@ -922,10 +915,14 @@ i[34567]86-*-coff*)
        tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/i386-coff.h"
        use_fixproto=yes
        ;;
-i[34567]86-*-linux*)   # Intel 80386's running GNU/Linux
+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
-                       # aka GNU/Linux C library 6
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h linux.h i386/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" ;;
+       esac
        tmake_file="${tmake_file} i386/t-crtstuff"
        ;;
 x86_64-*-linux*)
@@ -933,12 +930,6 @@ x86_64-*-linux*)
                 i386/x86-64.h i386/linux64.h"
        tmake_file="${tmake_file} 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*)
@@ -981,7 +972,11 @@ i[34567]86-*-sco3.2v5*)    # 80386 running SCO Open Server 5
 i[34567]86-*-solaris2*)
        xm_defines="SMALL_ARG_MAX"
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h i386/sysv4.h sol2.h i386/sol2.h"
-       tmake_file="i386/t-sol2 t-svr4"
+       tmake_file="t-sol2 i386/t-sol2 t-svr4"
+       c_target_objs="sol2-c.o"
+       cxx_target_objs="sol2-c.o"
+       extra_objs="sol2.o"
+       tm_p_file="${tm_p_file} sol2-protos.h"
        if test x$gnu_ld = xyes; then
                tmake_file="$tmake_file t-slibgcc-elf-ver"
        else
@@ -1031,6 +1026,7 @@ 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
        tmake_file="i386/t-cygwin i386/t-cygming"
+       target_gtfiles="\$(srcdir)/config/i386/winnt.c"
        extra_objs=winnt.o
        c_target_objs=cygwin2.o
        cxx_target_objs=cygwin2.o
@@ -1043,10 +1039,11 @@ i[34567]86-*-mingw32*)
        tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/cygming.h i386/mingw32.h"
        xm_file=i386/xm-mingw32.h
        tmake_file="i386/t-cygming i386/t-mingw32"
+       target_gtfiles="\$(srcdir)/config/i386/winnt.c"
        extra_objs=winnt.o
-       if test x$enable_threads = xyes; then
-               thread_file='win32'
-       fi
+       case ${enable_threads} in
+         "" | yes | win32) thread_file='win32' ;;
+       esac
        case ${target} in
                *mingw32crt*)
                        tm_file="${tm_file} i386/crtdll.h"
@@ -1059,6 +1056,7 @@ i[34567]86-*-uwin*)
        tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/cygwin.h i386/uwin.h"
        tmake_file="i386/t-cygwin i386/t-uwin"
        extra_objs=winnt.o
+       target_gtfiles="\$(srcdir)/config/i386/winnt.c"
        if test x$enable_threads = xyes; then
                thread_file='win32'
        fi
@@ -1068,6 +1066,7 @@ i[34567]86-*-interix3*)
        tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/i386-interix.h i386/i386-interix3.h interix.h interix3.h"
        tmake_file="i386/t-interix"
        extra_objs=winnt.o
+       target_gtfiles="\$(srcdir)/config/i386/winnt.c"
        if test x$enable_threads = xyes ; then
                thread_file='posix'
        fi
@@ -1368,64 +1367,64 @@ mips*-*-openbsd*)
         esac
        ;;
 mipsisa32-*-elf* | mipsisa32el-*-elf*)
-       tm_file="${tm_file} mips/elf.h"
+       tm_file="elfos.h ${tm_file} mips/elf.h"
        tmake_file=mips/t-isa3264
        tm_defines="MIPS_ISA_DEFAULT=32 MIPS_ABI_DEFAULT=ABI_EABI"
        use_fixproto=yes
        ;;
 mipsisa32r2-*-elf* | mipsisa32r2el-*-elf*)
-       tm_file="${tm_file} mips/elf.h"
+       tm_file="elfos.h ${tm_file} mips/elf.h"
        tmake_file=mips/t-isa3264
        tm_defines="MIPS_ISA_DEFAULT=33 MIPS_ABI_DEFAULT=ABI_EABI"
        use_fixproto=yes
        ;;
 mipsisa64-*-elf* | mipsisa64el-*-elf*)
-       tm_file="${tm_file} mips/elf.h"
+       tm_file="elfos.h ${tm_file} mips/elf.h"
        tmake_file=mips/t-isa3264
        target_cpu_default="MASK_64BIT|MASK_FLOAT64|MASK_GAS"
        tm_defines="MIPS_ISA_DEFAULT=64 MIPS_ABI_DEFAULT=ABI_EABI"
        use_fixproto=yes
        ;;
 mipsisa64sr71k-*-elf*)
-        tm_file="${tm_file} mips/elf.h"
+        tm_file="elfos.h ${tm_file} mips/elf.h"
         tmake_file=mips/t-sr71k
        target_cpu_default="MASK_64BIT|MASK_FLOAT64|MASK_GAS"
        tm_defines="MIPS_ISA_DEFAULT=64 MIPS_CPU_STRING_DEFAULT=\\\"sr71000\\\" MIPS_ABI_DEFAULT=ABI_EABI"
        use_fixproto=yes
         ;;
 mipsisa64sb1-*-elf* | mipsisa64sb1el-*-elf*)
-       tm_file="${tm_file} mips/elf.h"
+       tm_file="elfos.h ${tm_file} mips/elf.h"
        tmake_file=mips/t-elf
        target_cpu_default="MASK_64BIT|MASK_FLOAT64|MASK_GAS"
        tm_defines="MIPS_ISA_DEFAULT=64 MIPS_CPU_STRING_DEFAULT=\\\"sb1\\\" MIPS_ABI_DEFAULT=ABI_O64"
        use_fixproto=yes
        ;;
 mips-*-elf* | mipsel-*-elf*)
-       tm_file="${tm_file} mips/elf.h"
+       tm_file="elfos.h ${tm_file} mips/elf.h"
        tmake_file=mips/t-elf
        use_fixproto=yes
        ;;
 mips64-*-elf* | mips64el-*-elf*)
-       tm_file="${tm_file} mips/elf64.h"
+       tm_file="elfos.h ${tm_file} mips/elf.h"
        tmake_file=mips/t-elf
        target_cpu_default="MASK_64BIT|MASK_FLOAT64|MASK_GAS"
        tm_defines="MIPS_ISA_DEFAULT=3 MIPS_ABI_DEFAULT=ABI_O64"
        use_fixproto=yes
        ;;
 mips64vr-*-elf* | mips64vrel-*-elf*)
-        tm_file="mips/vr.h ${tm_file} mips/elf64.h"
+        tm_file="mips/vr.h elfos.h ${tm_file} mips/elf.h"
         tmake_file=mips/t-vr
        use_fixproto=yes
         ;;
 mips64orion-*-elf* | mips64orionel-*-elf*)
-       tm_file="${tm_file} mips/elforion.h mips/elf64.h"
+       tm_file="elfos.h ${tm_file} mips/elforion.h mips/elf.h"
        tmake_file=mips/t-elf
        target_cpu_default="MASK_64BIT|MASK_FLOAT64|MASK_GAS"
        tm_defines="MIPS_ISA_DEFAULT=3 MIPS_ABI_DEFAULT=ABI_O64"
        use_fixproto=yes
        ;;
 mips*-*-rtems*)
-       tm_file="${tm_file} mips/elf.h mips/rtems.h rtems.h"
+       tm_file="elfos.h ${tm_file} mips/elf.h mips/rtems.h rtems.h"
        tmake_file="mips/t-elf t-rtems mips/t-rtems"
        ;;
 mips-wrs-vxworks)
@@ -1443,7 +1442,7 @@ mips-wrs-windiss) # Instruction-level simulator for VxWorks.
        thread_file=
        ;;
 mipstx39-*-elf* | mipstx39el-*-elf*)
-       tm_file="${tm_file} mips/r3900.h mips/elf.h"
+       tm_file="elfos.h ${tm_file} mips/r3900.h mips/elf.h"
        tmake_file=mips/t-r3900
        use_fixproto=yes
        ;;
@@ -1675,34 +1674,143 @@ s390x-ibm-tpf*)
        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"
+sh-*-elf* | sh[12346l]*-*-elf* | sh*-*-kaos* | \
+sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
+  sh-*-linux* | sh[346lbe]*-*-linux* | \
+  sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \
+   sh64-*-netbsd* | sh64l*-*-netbsd*)
+       tmake_file="${tmake_file} sh/t-sh sh/t-elf"
+       if test x${with_endian} = x; then
+               case ${target} in
+               sh[1234]*be-*-* | sh[1234]*eb-*-*) with_endian=big ;;
+               shbe-*-* | sheb-*-*)               with_endian=big,little ;;
+               sh[1234]l* | sh[34]*-*-linux*)     with_endian=little ;;
+               shl* | sh64l* | sh*-*-linux* | \
+                 sh5l* | sh-superh-elf)           with_endian=little,big ;;
+               sh[1234]*-*-*)                     with_endian=big ;;
+               *)                                 with_endian=big,little ;;
+               esac
+       fi
+       case ${with_endian} in
+       big|little)     tmake_file="${tmake_file} sh/t-1e" ;;
+       big,little|little,big) ;;
+       *)      echo "with_endian=${with_endian} not supported."; exit 1 ;;
+       esac
+       case ${with_endian} in
+       little*)        tm_file="sh/little.h ${tm_file}" ;;
+       esac
+       tm_file="${tm_file} dbxelf.h elfos.h"
        case ${target} in
-       shl* | sh[234]l* | sh64l*)
-               tm_file="sh/little.h ${tm_file}"
-               tmake_file="${tmake_file} sh/t-le"
-               ;;
+       sh*-*-netbsd*)  ;;
+       *)              tm_file="${tm_file} svr4.h" ;;
+       esac
+       tm_file="${tm_file} sh/elf.h"
+       case ${target} in
+       sh*-*-linux*)   tmake_file="${tmake_file} sh/t-linux"
+                       tm_file="${tm_file} sh/linux.h" ;;
+       sh*-*-kaos*)    tm_file="${tm_file} sh/embed-elf.h kaos.h sh/kaos-sh.h"
+                       ;;
+       sh*-*-netbsd*)  tm_file="${tm_file} netbsd.h netbsd-elf.h sh/netbsd-elf.h" ;;
+       *)              tm_file="${tm_file} sh/embed-elf.h" ;;
        esac
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sh/elf.h sh/embed-elf.h"
        case ${target} in
+       sh5*-*-netbsd*)
+               # SHmedia, 32-bit ABI
+               tmake_file="${tmake_file} sh/t-sh64 sh/t-netbsd"
+               ;;
+       sh64*-netbsd*)
+               # SHmedia, 64-bit ABI
+               tmake_file="${tmake_file} sh/t-sh64 sh/t-netbsd sh/t-netbsd-sh5-64"
+               ;;
+       *-*-netbsd)
+                tmake_file="${tmake_file} sh/t-netbsd"
+               ;;
+       sh64*-*-linux*)
+               tmake_file="${tmake_file} sh/t-sh64 sh/t-linux64"
+               tm_file="${tm_file} sh/sh64.h"
+               extra_headers="shmedia.h ushmedia.h sshmedia.h"
+               ;;
        sh64*)
                tmake_file="${tmake_file} sh/t-sh64"
                tm_file="${tm_file} sh/sh64.h"
                extra_headers="shmedia.h ushmedia.h sshmedia.h"
                ;;
-       sh4_single*)  target_cpu_default="SELECT_SH4_SINGLE" ;;
-       sh4*)  target_cpu_default="SELECT_SH4" ;;
-       sh3e*) target_cpu_default="SELECT_SH3E" ;;
-       sh3*)  target_cpu_default="SELECT_SH3" ;;
-       sh2e*) target_cpu_default="SELECT_SH2E" ;;
-       sh2*)  target_cpu_default="SELECT_SH2" ;;
+       *-*-symbianelf*)
+               tmake_file="sh/t-symbian"
+               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
-       case ${target} in
-       sh[234]*) tmake_file="${tmake_file} sh/t-monolib" ;;
+       # sed el/eb endian suffixes away to avoid confusion with sh[23]e
+       case `echo ${target} | sed 's/e[lb]-/-/'` in
+       sh64*-*-netbsd*)        sh_cpu_target=sh5-64media ;;
+       sh64* | sh5*-*-netbsd*) sh_cpu_target=sh5-32media ;;
+       sh4a_single_only*)      sh_cpu_target=sh4a-single-only ;;
+       sh4a_single*)           sh_cpu_target=sh4a-single ;;
+       sh4a_nofpu*)            sh_cpu_target=sh4a-nofpu ;;
+       sh4al)                  sh_cpu_target=sh4al ;;
+       sh4a*)                  sh_cpu_target=sh4a ;;
+       sh4_single_only*)       sh_cpu_target=sh4-single-only ;;
+       sh4_single*)            sh_cpu_target=sh4-single ;;
+       sh4_nofpu*)             sh_cpu_target=sh4-nofpu ;;
+       sh4* | sh-superh-*)     sh_cpu_target=sh4 ;;
+       sh3e*)                  sh_cpu_target=sh3e ;;
+       sh*-*-netbsd* | sh3*)   sh_cpu_target=sh3 ;;
+       sh2a_single_only*)      sh_cpu_target=sh2a-single-only ;;
+       sh2a_single*)           sh_cpu_target=sh2a-single ;;
+       sh2a_nofpu*)            sh_cpu_target=sh2a-nofpu ;;
+       sh2a*)                  sh_cpu_target=sh2a ;;
+       sh2e*)                  sh_cpu_target=sh2e ;;
+       sh2*)                   sh_cpu_target=sh2 ;;
+       *)                      sh_cpu_target=sh1 ;;
        esac
-       case ${target} in
-       sh*-*-kaos*) tm_file="${tm_file} kaos.h sh/kaos-sh.h" ;;
+       sh_cpu_default="`echo $with_cpu|sed s/^m/sh/|tr A-Z_ a-z-`"
+       case $sh_cpu_default in
+       sh5-64media-nofpu | sh5-64media | \
+         sh5-32media-nofpu | sh5-32media | sh5-compact-nofpu | sh5-compact | \
+         sh2a-single-only | sh2a-single | sh2a-nofpu | sh2a | \
+         sh4a-single-only | sh4a-single | sh4a-nofpu | sh4a | sh4al | \
+         sh4-single-only | sh4-single | sh4-nofpu | sh4 | \
+         sh3e | sh3 | sh2e | sh2 | sh1) ;;
+       "")     sh_cpu_default=${sh_cpu_target} ;;
+       *)      echo "with_cpu=$with_cpu not supported"; exit 1 ;;
        esac
+       sh_multilibs=${with_multilib_list}
+       if test x${sh_multilibs} = x ; then
+               case ${target} in
+               sh[1234]*)      sh_multilibs=${sh_cpu_target} ;;
+               sh64* | sh5*)   sh_multilibs=m5-32media,m5-32media-nofpu,m5-compact,m5-compact-nofpu,m5-64media,m5-64media-nofpu ;;
+               sh-superh-*)    sh_multilibs=m4,m4-single,m4-single-only,m4-nofpu ;;
+               sh*-*-linux*)   sh_multilibs=m1,m3e,m4 ;;
+               sh*-*-netbsd*)  sh_multilibs=m3,m3e,m4 ;;
+               *) sh_multilibs=m1,m2,m2e,m4,m4-single,m4-single-only,m2a,m2a-single ;;
+               esac
+       fi
+       target_cpu_default=SELECT_`echo ${sh_cpu_default}|tr a-z- A-Z_`
+       tm_defines=${tm_defines}' SH_MULTILIB_CPU_DEFAULT=\"'`echo $sh_cpu_default|sed s/sh/m/`'\"'
+       sh_multilibs=`echo $sh_multilibs,$sh_cpu_default | sed -e 's/[  ,/][    ,]*/ /g' -e 's/ $//' -e s/^m/sh/ -e 's/ m/ sh/g' | tr A-Z_ a-z-`
+       for sh_multilib in ${sh_multilibs}; do
+               case ${sh_multilib} in
+               sh1 | sh2 | sh2e | sh3 | sh3e | \
+               sh4 | sh4-single | sh4-single-only | sh4-nofpu | \
+               sh4a | sh4a-single | sh4a-single-only | sh4a-nofpu | sh4al | \
+               sh2a | sh2a-single | sh2a-single-only | sh2a-nofpu | \
+               sh5-64media | sh5-64media-nofpu | \
+               sh5-32media | sh5-32media-nofpu | \
+               sh5-compact | sh5-compact-nofpu)
+                       tmake_file="${tmake_file} sh/t-mlib-${sh_multilib}"
+                       tm_defines="$tm_defines SUPPORT_`echo $sh_multilib|tr a-z- A-Z_`"
+                       ;;
+               *)
+                       echo "with_multilib_list=${sh_multilib} not supported."
+                       exit 1
+                       ;;
+               esac
+       done
+       if test x${enable_incomplete_targets} == xyes ; then
+               tm_defines="$tm_defines SUPPORT_SH1 SUPPORT_SH2E SUPPORT_SH4 SUPPORT_SH4_SINGLE SUPPORT_SH2A SUPPORT_SH2A_SINGLE SUPPORT_SH5_32MEDIA SUPPORT_SH5_32MEDIA_NOFPU SUPPORT_SH5_64MEDIA SUPPORT_SH5_64MEDIA_NOFPU"
+       fi
        use_fixproto=yes
        ;;
 sh-*-rtemscoff*)
@@ -1713,69 +1821,6 @@ sh-*-rtems*)
        tmake_file="sh/t-sh sh/t-elf t-rtems"
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h sh/elf.h sh/embed-elf.h sh/rtemself.h rtems.h"
        ;;
-sh-*-linux* | sh[2346lbe]*-*-linux*)
-       tmake_file="sh/t-sh sh/t-elf ${tmake_file}"
-       case ${target} in
-       sh*be-*-* | sh*eb-*-*) ;;
-       *)
-               tm_file="sh/little.h ${tm_file}"
-               tmake_file="${tmake_file} sh/t-le"
-               ;;
-       esac
-       tmake_file="${tmake_file} sh/t-linux"
-       tm_file="${tm_file} dbxelf.h elfos.h svr4.h sh/elf.h sh/linux.h"
-       case ${target} in
-       sh64*)
-               tmake_file="${tmake_file} sh/t-sh64"
-               tm_file="${tm_file} sh/sh64.h"
-               extra_headers="shmedia.h ushmedia.h sshmedia.h"
-               ;;
-       sh4_single*) target_cpu_default="SELECT_SH4_SINGLE" ;;
-       sh4*) target_cpu_default="SELECT_SH4" ;;
-       sh3e[lb]e*) target_cpu_default="SELECT_SH3E" ;;
-       sh3e[lb]*) target_cpu_default="SELECT_SH3" ;;
-       sh3e*) target_cpu_default="SELECT_SH3E" ;;
-       sh3*) target_cpu_default="SELECT_SH3" ;;
-       sh2e[lb]e*) target_cpu_default="SELECT_SH2E" ;;
-       sh2e[lb]*) target_cpu_default="SELECT_SH2" ;;
-       sh2e*) target_cpu_default="SELECT_SH2E" ;;
-       sh2*) target_cpu_default="SELECT_SH2" ;;
-       esac
-       case ${target} in
-       sh[234]*) tmake_file="${tmake_file} sh/t-monolib" ;;
-       esac
-       ;;
-sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \
-  sh64-*-netbsd* | sh64l*-*-netbsd*)
-       tm_file="${tm_file} dbxelf.h elfos.h sh/elf.h netbsd.h netbsd-elf.h sh/netbsd-elf.h"
-       tmake_file="${tmake_file} sh/t-sh sh/t-elf"
-       case ${target} in
-       sh*l*-*)
-               tm_file="sh/little.h ${tm_file}"
-               tmake_file="${tmake_file} sh/t-le"
-               ;;
-       *)
-               tmake_file="${tmake_file} sh/t-be"
-               ;;
-       esac
-       case ${target} in
-       sh5*-*)
-               # SHmedia, 32-bit ABI
-               target_cpu_default="SH5_BIT|SH4_BIT|SH3_BIT|SH_E_BIT"
-               tmake_file="${tmake_file} sh/t-sh64 sh/t-netbsd-sh5"
-               ;;
-       sh64*-*)
-               # SHmedia, 64-bit ABI
-               target_cpu_default="SH5_BIT|SH4_BIT"
-               tmake_file="${tmake_file} sh/t-sh64 sh/t-netbsd-sh5 sh/t-netbsd-sh5-64"
-               ;;
-       *)
-               # SH3, software floating point
-               target_cpu_default="SH1_BIT|SH2_BIT|SH3_BIT"
-               tmake_file="${tmake_file} sh/t-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"
@@ -1816,19 +1861,23 @@ sparc-*-rtems*)
        extra_parts="crti.o crtn.o crtbegin.o crtend.o"
        ;;
 sparc64-*-solaris2* | sparcv9-*-solaris2*)
-       tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/sol2-64.h sparc/sol2-bi.h"
+       tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/sol2-64.h sparc/sol2-bi.h tm-dwarf2.h"
        if test x$gnu_ld = xyes; then
                tm_file="${tm_file} sparc/sol2-gld.h sparc/sol2-gld-bi.h"
        fi
        if test x$gas = xyes; then
                tm_file="${tm_file} sparc/sol2-gas-bi.h"
        fi
-       tmake_file="sparc/t-sol2 sparc/t-sol2-64 sparc/t-crtfm"
+       tmake_file="t-sol2 sparc/t-sol2 sparc/t-sol2-64 sparc/t-crtfm"
        if test x$gnu_ld = xyes; then
                tmake_file="$tmake_file t-slibgcc-elf-ver"
        else
                tmake_file="$tmake_file t-slibgcc-sld"
        fi
+       c_target_objs="sol2-c.o"
+       cxx_target_objs="sol2-c.o"
+       extra_objs="sol2.o"
+       tm_p_file="${tm_p_file} sol2-protos.h"
        extra_parts="crt1.o crti.o crtn.o gcrt1.o crtbegin.o crtend.o"
        case ${enable_threads}:${have_pthread_h}:${have_thread_h} in
          no:*:*) ;;
@@ -1842,7 +1891,7 @@ sparc-*-solaris2*)
        if test x$gnu_ld = xyes; then
                tm_file="${tm_file} sparc/sol2-gld.h"
        fi
-       tmake_file="sparc/t-sol2 sparc/t-crtfm"
+       tmake_file="t-sol2 sparc/t-sol2 sparc/t-crtfm"
        if test x$gnu_ld = xyes; then
                tmake_file="$tmake_file t-slibgcc-elf-ver"
        else
@@ -1855,7 +1904,7 @@ sparc-*-solaris2*)
                fi
                ;;
        *-*-solaris2.[789] | *-*-solaris2.1[0-9])
-               tm_file="sparc/biarch64.h ${tm_file} sparc/sol2-bi.h"
+               tm_file="sparc/biarch64.h ${tm_file} sparc/sol2-bi.h tm-dwarf2.h"
                if test x$gnu_ld = xyes; then
                        tm_file="${tm_file} sparc/sol2-gld-bi.h"
                fi
@@ -1866,6 +1915,10 @@ sparc-*-solaris2*)
                need_64bit_hwint=yes
                ;;
        esac
+       c_target_objs="sol2-c.o"
+       cxx_target_objs="sol2-c.o"
+       extra_objs="sol2.o"
+       tm_p_file="${tm_p_file} sol2-protos.h"
        extra_parts="crt1.o crti.o crtn.o gcrt1.o gmon.o crtbegin.o crtend.o"
        case ${enable_threads}:${have_pthread_h}:${have_thread_h} in
          no:*:*) ;;
@@ -1895,10 +1948,6 @@ sparc86x-*-elf*)
         extra_parts="crtbegin.o crtend.o"
        use_fixproto=yes
        ;;
-sparc64-*-aout*)
-       tm_file="sparc/sparc.h sparc/aout.h sparc/sp64-aout.h"
-       use_fixproto=yes
-       ;;
 sparc64-*-elf*)
        tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h sparc/sol2.h sparc/sp64-elf.h"
        tmake_file="${tmake_file} sparc/t-crtfm"
@@ -1995,11 +2044,13 @@ v850-*-*)
        ;;
 vax-*-bsd*)                    # VAXen running BSD
        tm_file="${tm_file} vax/bsd.h"
+       tmake_file=vax/t-memfuncs
        use_collect2=yes
        use_fixproto=yes
        ;;
 vax-*-sysv*)                   # VAXen running system V
        tm_file="${tm_file} vax/vaxv.h"
+       tmake_file=vax/t-memfuncs
        use_fixproto=yes
        ;;
 vax-*-netbsdelf*)
@@ -2017,6 +2068,7 @@ vax-*-openbsd*)
        ;;
 vax-*-ultrix*)                 # VAXen running ultrix
        tm_file="${tm_file} vax/ultrix.h"
+       tmake_file=vax/t-memfuncs
        use_fixproto=yes
        ;;
 xscale-*-elf)
@@ -2169,6 +2221,15 @@ if test x$with_cpu = x ; then
   esac
 fi
 
+# Similarly for --with-float
+if test x$with_float = x; then
+       case ${target} in
+       ep9312-*-*)
+               with_float=hard
+               ;;
+       esac
+fi
+
        # Similarly for --with-schedule.
        if test x$with_schedule = x; then
                case ${target} in
@@ -2208,33 +2269,24 @@ fi
        arm*-*-*)
                supported_defaults="arch cpu float tune fpu abi"
                for which in cpu tune; do
+                       # See if it matches any of the entries in arm-cores.def
                        eval "val=\$with_$which"
-                       case "$val" in
-                       "" \
-                       | arm[236789] | arm250 | arm[67][01]0 \
-                       | arm60 | arm620 | arm7d | arm7di \
-                       | arm7m | arm7dm | arm7dmi | arm[79]tdmi \
-                       | arm70 | arm700i | arm710t | arm720 \
-                       | arm720t | arm740t | arm710c | arm920 \
-                       | arm920t | arm926ejs | arm940t | arm9e | arm10tdmi \
-                       | arm7100 | arm7500 | arm7500fe | arm810 \
-                       | arm1026ejs | arm1020t | arm1136js | arm1136jfs \
-                       | xscale | iwmmxt \
-                       | ep9312 \
-                       | strongarm | strongarm110 | strongarm11[01]0)
-                               # OK
-                               ;;
-                       *)
-                               echo "Unknown CPU used in --with-$which=$val" 1>&2
-                               exit 1
-                               ;;
-                       esac
+                       if [ x"$val" = x ] \
+                           || grep "^ARM_CORE($val," \
+                                   ${srcdir}/config/arm/arm-cores.def \
+                                   > /dev/null; then
+                         # Ok
+                         true
+                       else
+                         echo "Unknown CPU used in --with-$which=$val" 1>&2
+                         exit 1
+                       fi
                done
 
                case "$with_arch" in
                "" \
                | armv[23456] | armv2a | armv3m | armv4t | armv5t \
-               | armv5te | armv6j | ep9312)
+               | armv5te | armv6j | iwmmxt | ep9312)
                        # OK
                        ;;
                *)
@@ -2431,6 +2483,25 @@ fi
                esac
                ;;
 
+       sh[123456ble]-*-* | sh-*-*)
+               supported_defaults="cpu"
+               case "`echo $with_cpu | tr A-Z_ a-z- | sed s/sh/m/`" in
+               "" | m1 | m2 | m2e | m3 | m3e | m4 | m4-single | m4-single-only | m4-nofpu )
+                       # OK
+                       ;;
+               m2a | m2a-single | m2a-single-only | m2a-nofpu)
+                       ;;
+               m4a | m4a-single | m4a-single-only | m4a-nofpu | m4al)
+                       ;;
+               *)
+                       echo "Unknown CPU used in --with-cpu=$with_cpu, known values:"  1>&2
+                       echo "m1 m2 m2e m3 m3e m4 m4-single m4-single-only m4-nofpu" 1>&2
+                       echo "m4a m4a-single m4a-single-only m4a-nofpu m4al" 1>&2
+                       echo "m2a m2a-single m2a-single-only m2a-nofpu" 1>&2
+                       exit 1
+                       ;;
+               esac
+               ;;
        sparc*-*-*)
                supported_defaults="cpu float tune"
 
@@ -2562,7 +2633,7 @@ fi
                                ;;
                esac
                case $tm_file in
-                       *mips/elf.h* | *mips/elf64.h*)
+                       *mips/elf.h*)
                                tm_defines="OBJECT_FORMAT_ELF $tm_defines"
                                ;;
                esac
@@ -2576,10 +2647,6 @@ fi
                ;;
 
        powerpc*-*-* | rs6000-*-*)
-               if test x$enable_altivec = xyes
-               then
-                       tm_file="$tm_file rs6000/altivec-defs.h"
-               fi
                # FIXME: The PowerPC port uses the value set at compile time,
                # although it's only cosmetic.
                if test "x$with_cpu" != x