* config/m68k/t-m68kbare (MULTILIB_OPTIONS): Add 68040 and 68060.

        (MULTILIB_MATCHES): Remove 68040 and 68060 aliases.
        (MULTILIB_EXCEPTIONS): Ignore 68881 and soft-float for 68040 and 68060.
        * config/m68k/t-m68kelf: Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@49159 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ff15844..c411ccc 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -2,6 +2,11 @@
 
        * expr.c (move_by_pieces_1): Extend size before negation.
 
+       * config/m68k/t-m68kbare (MULTILIB_OPTIONS): Add 68040 and 68060.
+       (MULTILIB_MATCHES): Remove 68040 and 68060 aliases.
+       (MULTILIB_EXCEPTIONS): Ignore 68881 and soft-float for 68040 and 68060.
+       * config/m68k/t-m68kelf: Likewise.
+
 2002-01-23  Bob Wilson  <bob.wilson@acm.org>
 
        * config/xtensa/elf.h: New file.

diff --git a/gcc/config/m68k/t-m68kbare b/gcc/config/m68k/t-m68kbare
index faad439..e723ee6 100644 (file)
--- a/gcc/config/m68k/t-m68kbare
+++ b/gcc/config/m68k/t-m68kbare
@@ -12,10 +12,10 @@ xfgnulib.c: $(srcdir)/config/m68k/fpgnulib.c
        echo '#define EXTFLOAT' > xfgnulib.c
        cat $(srcdir)/config/m68k/fpgnulib.c >> xfgnulib.c
 
-MULTILIB_OPTIONS = m68000/m68020/m5200/mcpu32 m68881/msoft-float
+MULTILIB_OPTIONS = m68000/m68020/m5200/mcpu32/m68040/m68060 m68881/msoft-float
 MULTILIB_DIRNAMES =
-MULTILIB_MATCHES = m68000=mc68000 m68000=m68302 mcpu32=m68332 m68020=mc68020 m68020=m68040 m68020=m68060
-MULTILIB_EXCEPTIONS = m68000/msoft-float m5200/m68881 m5200/msoft-float mcpu32/m68881 mcpu32/msoft-float
+MULTILIB_MATCHES = m68000=mc68000 m68000=m68302 mcpu32=m68332 m68020=mc68020
+MULTILIB_EXCEPTIONS = m68000/msoft-float m5200/m68881 m5200/msoft-float mcpu32/m68881 mcpu32/msoft-float m68040/m68881 m68040/msoft-float m68060/m68881 m68060/msoft-float
 
 LIBGCC = stmp-multilib
 INSTALL_LIBGCC = install-multilib

diff --git a/gcc/config/m68k/t-m68kelf b/gcc/config/m68k/t-m68kelf
index 955bdaa..6f7e3a0 100644 (file)
--- a/gcc/config/m68k/t-m68kelf
+++ b/gcc/config/m68k/t-m68kelf
@@ -12,10 +12,10 @@ xfgnulib.c: $(srcdir)/config/m68k/fpgnulib.c
        echo '#define EXTFLOAT' > xfgnulib.c
        cat $(srcdir)/config/m68k/fpgnulib.c >> xfgnulib.c
 
-MULTILIB_OPTIONS = m68000/m68020/m5200/mcpu32 m68881/msoft-float
+MULTILIB_OPTIONS = m68000/m68020/m5200/mcpu32/m68040/m68060 m68881/msoft-float
 MULTILIB_DIRNAMES =
-MULTILIB_MATCHES = m68000=mc68000 m68000=m68302 mcpu32=m68332 m68020=mc68020 m68020=m68040 m68020=m68060
-MULTILIB_EXCEPTIONS = m68000/msoft-float m5200/m68881 m5200/msoft-float mcpu32/m68881 mcpu32/msoft-float
+MULTILIB_MATCHES = m68000=mc68000 m68000=m68302 mcpu32=m68332 m68020=mc68020
+MULTILIB_EXCEPTIONS = m68000/msoft-float m5200/m68881 m5200/msoft-float mcpu32/m68881 mcpu32/msoft-float m68040/m68881 m68040/msoft-float m68060/m68881 m68060/msoft-float
 
 LIBGCC = stmp-multilib
 INSTALL_LIBGCC = install-multilib