t-rtems-i386 (MULTILIBS): Remove k6, athlon, mno-fp-ret-in-387 multilib variants.

2005-03-18  Ralf Corsepius  <ralf.corsepius@rtems.org>

	* config/i386/t-rtems-i386 (MULTILIBS): Remove k6, athlon,
	mno-fp-ret-in-387 multilib variants.

From-SVN: r96651

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 089bf521572846be35e4fc5d82fb82ee9e558c31..1d3b7c49d580790e8694a640573057049638efe2 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-18  Ralf Corsepius  <ralf.corsepius@rtems.org>
+
+       * config/i386/t-rtems-i386 (MULTILIBS): Remove k6, athlon,
+       mno-fp-ret-in-387 multilib variants.
+
 2005-03-18  Richard Sandiford  <rsandifo@redhat.com>
 
        * common.opt (m): Remove.

diff --git a/gcc/config/i386/t-rtems-i386 b/gcc/config/i386/t-rtems-i386
index d32928c53aa6e95c769f5fecdbf6085f6eb86a1b..9400be8f50868d9f5fb0c147a29a84ec69943e43 100644 (file)
--- a/gcc/config/i386/t-rtems-i386
+++ b/gcc/config/i386/t-rtems-i386
@@ -36,17 +36,14 @@ xp-bit.c: $(srcdir)/config/fp-bit.c
        echo '#define EXTENDED_FLOAT_STUBS' > xp-bit.c
        cat $(srcdir)/config/fp-bit.c >> xp-bit.c
 
-MULTILIB_OPTIONS = mtune=i486/mtune=pentium/mtune=pentiumpro/mtune=k6/mtune=athlon \
-msoft-float mno-fp-ret-in-387
-MULTILIB_DIRNAMES= m486 mpentium mpentiumpro k6 athlon soft-float nofp
+MULTILIB_OPTIONS = mtune=i486/mtune=pentium/mtune=pentiumpro \
+msoft-float
+MULTILIB_DIRNAMES= m486 mpentium mpentiumpro soft-float
 MULTILIB_MATCHES = msoft-float=mno-m80387
+MULTILIB_MATCHES += mtune?pentium=mtune?k6 mtune?pentiumpro=mtune?mathlon
 MULTILIB_EXCEPTIONS = \
-mno-fp-ret-in-387 \
-mtune=i486/*mno-fp-ret-in-387* \
-mtune=pentium/*msoft-float* mtune=pentium/*mno-fp-ret-in-387* \
-mtune=pentiumpro/*msoft-float* mtune=pentiumpro/*mno-fp-ret-in-387* \
-mtune=k6/*msoft-float* mtune=k6/*mno-fp-ret-in-387* \
-mtune=athlon/*msoft-float* mtune=athlon/*mno-fp-ret-in-387*
+mtune=pentium/*msoft-float* \
+mtune=pentiumpro/*msoft-float*
 
 EXTRA_MULTILIB_PARTS = crtbegin.o crtend.o