gcc/

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

diff --git a/gcc/config.gcc b/gcc/config.gcc
index 17f429c..de39b9e 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1479,30 +1479,35 @@ m68hc12-*-*|m6812-*-*)
         ;;
 m68k-*-aout*)
        default_m68k_cpu=68020
-       tmake_file="m68k/t-floatlib m68k/t-m68kbare"
+       default_cf_cpu=5206
+       tmake_file="m68k/t-floatlib m68k/t-m68kbare m68k/t-mlibs"
        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-floatlib m68k/t-m68kbare"
+       default_cf_cpu=5206
+       tmake_file="m68k/t-floatlib m68k/t-m68kbare m68k/t-mlibs"
        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*)
        default_m68k_cpu=68020
+       default_cf_cpu=5206
        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-floatlib m68k/t-m68kelf"
+       tmake_file="m68k/t-floatlib m68k/t-m68kbare m68k/t-m68kelf m68k/t-mlibs"
        extra_parts="crtbegin.o crtend.o"
        ;;
 m68010-*-netbsdelf* | m68k*-*-netbsdelf*)
        default_m68k_cpu=68020
+       default_cf_cpu=5475
        tm_file="${tm_file} dbxelf.h elfos.h netbsd.h netbsd-elf.h m68k/netbsd-elf.h"
        tm_defines="${tm_defines} MOTOROLA=1 USE_GAS"
        ;;
 m68k*-*-openbsd*)
        default_m68k_cpu=68020
+       default_cf_cpu=5475
        # needed to unconfuse gdb
        tm_defines="${tm_defines} OBSD_OLD_GAS"
        tm_file="${tm_file} openbsd.h m68k/openbsd.h"
@@ -1514,6 +1519,7 @@ m68k-*-uclinuxoldabi*)            # Motorola m68k/ColdFire running uClinux
                                # with uClibc, using the original
                                # m68k-elf-based ABI
        default_m68k_cpu=68020
+       default_cf_cpu=5206
        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-floatlib m68k/t-uclinux"
@@ -1523,16 +1529,18 @@ m68k-*-uclinux*)                # Motorola m68k/ColdFire running uClinux
                                # with uClibc, using the new GNU/Linux-style
                                # ABI.
        default_m68k_cpu=68020
+       default_cf_cpu=5206
        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-floatlib m68k/t-uclinux"
+       tmake_file="m68k/t-floatlib m68k/t-uclinux m68k/t-mlibs"
        use_fixproto=no
        ;;
 m68k-*-linux*)         # Motorola m68k's running GNU/Linux
                                # with ELF format using glibc 2
                                # aka the GNU/Linux C library 6.
        default_m68k_cpu=68020
+       default_cf_cpu=5475
        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=1 USE_GAS"
@@ -1544,7 +1552,8 @@ m68k-*-linux*)            # Motorola m68k's running GNU/Linux
        ;;
 m68k-*-rtems*)
        default_m68k_cpu=68020
-       tmake_file="m68k/t-floatlib m68k/t-m68kbare m68k/t-crtstuff t-rtems m68k/t-rtems"
+       default_cf_cpu=5206
+       tmake_file="m68k/t-floatlib m68k/t-m68kbare m68k/t-crtstuff t-rtems m68k/t-rtems m68k/t-mlibs"
        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"
@@ -2656,7 +2665,14 @@ if test x$with_cpu = x ; then
       with_cpu=`echo ${target} | sed 's/-.*$//'`
       ;;
     m68k*-*-*)
-      with_cpu=m${default_m68k_cpu}
+      case "$with_arch" in
+       "cf")
+         with_cpu=${default_cf_cpu}
+         ;;
+       "" | "m68k")
+         with_cpu=m${default_m68k_cpu}
+         ;;
+      esac
       ;;
     sparc*-*-*)
       with_cpu="`echo ${target} | sed 's/-.*$//'`"
@@ -2807,7 +2823,16 @@ case "${target}" in
                ;;
 
        m680[012]0-*-* | m68k*-*-*)
-               supported_defaults="cpu"
+               supported_defaults="arch cpu"
+               case "$with_arch" in
+               "" | "m68k"| "cf")
+                       m68k_arch_family="$with_arch"
+                       ;;
+               *)
+                       echo "Invalid --with-arch=$with_arch" 1>&2
+                       exit 1
+                       ;;
+               esac
 
                # We always have a $with_cpu setting here.
                case "$with_cpu" in
@@ -3093,6 +3118,9 @@ case ${target} in
 
        m680[012]0-*-* | m68k*-*-*)
                target_cpu_default2=$m68k_cpu_ident
+               if [ x"$m68k_arch_family" != x ]; then
+                       tmake_file="m68k/t-$m68k_arch_family $tmake_file"
+               fi
                ;;
 
        mips*-*-*)