From 2f87f72a8c71ac755f63676bce3a06fc87e10269 Mon Sep 17 00:00:00 2001 From: rsandifo Date: Thu, 18 Jan 2007 19:26:21 +0000 Subject: [PATCH] gcc/ 200x-xx-xx Nathan Sidwell * config.gcc (m68k-*-aout*, m68k-*-coff*, m68020-*-elf*, m68k-*-elf*) (m68010-*-netbsdelf*, m68k*-*-netbsdelf*, m68k*-*-openbsd*) (m68k-*-uclinuxoldabi, m68k-*-uclinux*, m68k-*-linux*) (m68k-*-rtems*): Use tm_file rather than m68k/m68k.h and explicitly set MOTOROLA to 1. * config/m68k/m68k.h (MOTOROLA): Simplify definition accordingly. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@120916 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 9 +++++++++ gcc/config.gcc | 30 +++++++++++++++--------------- gcc/config/m68k/m68k.h | 6 ++---- 3 files changed, 26 insertions(+), 19 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d800959..929686b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2007-01-18 Nathan Sidwell + + * config.gcc (m68k-*-aout*, m68k-*-coff*, m68020-*-elf*, m68k-*-elf*) + (m68010-*-netbsdelf*, m68k*-*-netbsdelf*, m68k*-*-openbsd*) + (m68k-*-uclinuxoldabi, m68k-*-uclinux*, m68k-*-linux*) + (m68k-*-rtems*): Use tm_file rather than m68k/m68k.h and + explicitly set MOTOROLA to 1. + * config/m68k/m68k.h (MOTOROLA): Simplify definition accordingly. + 2007-01-18 Richard Sandiford Nathan Sidwell diff --git a/gcc/config.gcc b/gcc/config.gcc index ecb7fe6..7a911ff 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -1480,32 +1480,32 @@ m68hc12-*-*|m6812-*-*) 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*) 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" + 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" + 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" - tm_file="m68k/m68k.h openbsd.h m68k/openbsd.h" + 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 @@ -1514,8 +1514,8 @@ m68k-*-uclinuxoldabi*) # Motorola m68k/ColdFire running uClinux # with uClibc, using the original # m68k-elf-based ABI default_m68k_cpu=68020 - tm_file="m68k/m68k.h m68k/m68k-none.h m68k/m68kelf.h dbxelf.h elfos.h m68k/uclinux-oldabi.h" - tm_defines="${tm_defines} MOTOROLA USE_GAS" + 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 ;; @@ -1523,8 +1523,8 @@ m68k-*-uclinux*) # Motorola m68k/ColdFire running uClinux # with uClibc, using the new GNU/Linux-style # ABI. default_m68k_cpu=68020 - tm_file="m68k/m68k.h dbxelf.h elfos.h svr4.h linux.h flat.h m68k/linux.h m68k/uclinux.h" - tm_defines="${tm_defines} MOTOROLA USE_GAS UCLIBC_DEFAULT=1" + 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 @@ -1533,9 +1533,9 @@ 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" + 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 @@ -1545,8 +1545,8 @@ m68k-*-linux*) # Motorola m68k's running GNU/Linux 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) diff --git a/gcc/config/m68k/m68k.h b/gcc/config/m68k/m68k.h index 1d8b4ae..434c25d 100644 --- a/gcc/config/m68k/m68k.h +++ b/gcc/config/m68k/m68k.h @@ -23,13 +23,11 @@ Boston, MA 02110-1301, USA. */ if-statements and ?: on it. This way we have compile-time error checking for both the MOTOROLA and MIT code paths. We do rely on the host compiler to optimize away all constant tests. */ -#ifdef MOTOROLA -# undef MOTOROLA -# define MOTOROLA 1 /* Use the Motorola assembly syntax. */ +#if MOTOROLA /* Use the Motorola assembly syntax. */ # define TARGET_VERSION fprintf (stderr, " (68k, Motorola syntax)") #else -# define TARGET_VERSION fprintf (stderr, " (68k, MIT syntax)") # define MOTOROLA 0 /* Use the MIT assembly syntax. */ +# define TARGET_VERSION fprintf (stderr, " (68k, MIT syntax)") #endif /* Handle --with-cpu default option from configure script. */ -- 2.7.4