diff options
author | Nathan Sidwell <nathan@codesourcery.com> | 2007-01-12 09:28:34 +0000 |
---|---|---|
committer | Richard Sandiford <rsandifo@gcc.gnu.org> | 2007-01-12 09:28:34 +0000 |
commit | 59fbf3cbc75f1c1bdc1cb643ea327934f0421f6e (patch) | |
tree | e90a6b8a6cdc2f46eeece94ec50f52b43ce0a1d7 /gcc/config.gcc | |
parent | 3197c4892e63fc15402ade12fe9d10db38a5272a (diff) | |
download | gcc-59fbf3cbc75f1c1bdc1cb643ea327934f0421f6e.zip gcc-59fbf3cbc75f1c1bdc1cb643ea327934f0421f6e.tar.gz gcc-59fbf3cbc75f1c1bdc1cb643ea327934f0421f6e.tar.bz2 |
200x-xx-xx Nathan Sidwell <nathan@codesourcery.com> Richard Sandiford...
gcc/
200x-xx-xx Nathan Sidwell <nathan@codesourcery.com>
Richard Sandiford <richard@codesourcery.com>
Julian Brown <julian@codesourcery.com>
* config.gcc (m68k-*-aout*, m68k-*-coff*, m68020-*-elf*, m68k-*-elf*)
(m68k-*-uclinux*, m68k-*-linux*, m68k-*-rtems*): Set default_m68k_cpu
to the configuration's default CPU.
(m68010-*-netbsdelf*, m68k*-*-netbsdelf*, m68k*-*-openbsd*): Likewise.
Remove default masks.
(m680[012]0-*-*): Set the default with_cpu to the first part of
the target name.
(m68k*-*-*): Set the default with_cpu to m$default_m68k_cpu.
(m68k*-*-linux): Extend the --with-cpu handling to...
(m680[012]0-*-*, m68k*-*-*): ...these configurations. Allow m68000
and m68010. Don't set target_cpu_default2.
* doc/install.texi: Document --with-cpu for m68k.
* config/m68k/m68k.h (OPTION_DEFAULT_SPECS): Define.
* config/m68k/m68k-none.h (TARGET_CPU_DEFAULT, M68K_CPU_m68k)
(M68K_CPU_m68000, M68K_CPU_m68010, M68K_CPU_m68020, M68K_CPU_m68030)
(M68K_CPU_m68040, M68K_CPU_m68302, M68K_CPU_m68332, TARGET_DEFAULT)
(ASM_CPU_DEFAULT_SPEC, CC1_CPU_DEFAULT_SPEC): Delete.
(ASM_SPEC): Remove use of %(asm_cpu_default).
(EXTRA_SPECS, SUBTARGET_EXTRA_SPECS, MULTILIB_DEFAULTS): Delete.
* config/m68k/linux.h (TARGET_DEFAULT): Delete.
(CPP_SPEC): Merge definitions. Do not handle __HAVE_68881__ here.
* config/m68k/netbsd-elf.h (TARGET_OS_CPP_BUILTINS): Define
__HAVE_FPU__ if TARGET_HARD_FLOAT.
(TARGET_DEFAULT): Delete.
(EXTRA_SPECS): Delete cpp_cpu_default_spec, cpp_cpu_spec,
cpp_fpu_spec, asm_default_spec and netbsd_cpp_spec.
(CPP_CPU_SPEC): Delete.
(TARGET_VERSION): Merge definitions, using TARGET_68010 to pick
the appropriate string.
(CPP_CPU_DEFAULT_SPEC, ASM_DEFAULT_SPEC, CPP_FPU_SPEC): Delete.
(CPP_SPEC): Define to NETBSD_CPP_SPEC.
(ASM_SPEC): Don't use %(asm_default_spec).
* config/m68k/m68k.c (TARGET_DEFAULT_TARGET_FLAGS): Remove
TARGET_DEFAULT and add MASK_68881.
* config/m68k/m68k.md: Remove mention of TARGET_DEFAULT from comments.
Co-Authored-By: Julian Brown <julian@codesourcery.com>
Co-Authored-By: Richard Sandiford <richard@codesourcery.com>
From-SVN: r120711
Diffstat (limited to 'gcc/config.gcc')
-rw-r--r-- | gcc/config.gcc | 63 |
1 files changed, 20 insertions, 43 deletions
diff --git a/gcc/config.gcc b/gcc/config.gcc index 28d6f27..17a69dc 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -1478,42 +1478,40 @@ 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" ;; 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" use_fixproto=yes ;; m68020-*-elf* | m68k-*-elf*) + default_m68k_cpu=68020 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" 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="MASK_68010" - ;; - *) - target_cpu_default="MASK_68020|MASK_68010|MASK_68881|MASK_BITFIELD" - ;; - esac ;; m68k*-*-openbsd*) + default_m68k_cpu=68020 # needed to unconfuse gdb - tm_defines="${tm_defines} OBSD_OLD_GAS TARGET_DEFAULT=(MASK_68020|MASK_68010|MASK_68881|MASK_BITFIELD)" + tm_defines="${tm_defines} OBSD_OLD_GAS" tm_file="m68k/m68k.h 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 + default_m68k_cpu=68020 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" tmake_file=m68k/t-uclinux @@ -1522,6 +1520,7 @@ m68k-*-uclinux*) # Motorola m68k/ColdFire running uClinux with uClibc 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 tm_file="m68k/m68k.h 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" @@ -1532,6 +1531,7 @@ 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" @@ -2625,6 +2625,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/-.*$//'`" ;; @@ -2773,15 +2779,17 @@ 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") + "m68000" | "m68010" | "m68020" | "m68030" | "m68040" | "m68060" | "m68020-40" | "m68020-60") # OK ;; *) echo "Unknown CPU used in --with-cpu=$with_cpu, known values:" 1>&2 - echo "m68020 m68030 m68040 m68060 m68020-40 m68020-60" 1>&2 + echo "m68000 m68010 m68020 m68030 m68040 m68060 m68020-40 m68020-60" 1>&2 exit 1 ;; esac @@ -3033,37 +3041,6 @@ case ${target} in fi ;; - m68k*-linux*) - case "x$with_cpu" in - x) - # The most generic - target_cpu_default2="(MASK_68020|MASK_68010|MASK_68881|MASK_BITFIELD)" - ;; - xm68020) - target_cpu_default2="(MASK_68020|MASK_68010|MASK_68881|MASK_BITFIELD)" - ;; - xm68030) - target_cpu_default2="(MASK_68030|MASK_68020|MASK_68010|MASK_68881|MASK_BITFIELD)" - ;; - xm68040) - target_cpu_default2="(MASK_68040|MASK_68040_ONLY|MASK_68020|MASK_68010|MASK_68881|MASK_BITFIELD)" - ;; - xm68060) - target_cpu_default2="(MASK_68060|MASK_68040_ONLY|MASK_68020|MASK_68010|MASK_68881|MASK_BITFIELD)" - ;; - xm68020-40) - target_cpu_default2="(MASK_BITFIELD|MASK_68881|MASK_68020|MASK_68010|MASK_68040)" - ;; - xm68020-60) - target_cpu_default2="(MASK_BITFIELD|MASK_68881|MASK_68020|MASK_68010|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 |