re PR bootstrap/12752 (irix bootstrap failure - genmultilib)

	PR bootstrap/12752
	* config/mips/t-iris6 (MULTILIB_OPTIONS): Put -mabi=n32 first.
	(MULTILIB_OSDIRNAMES): Reorder accordingly.

From-SVN: r73518

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index dfb51cfea704236bf4b8e24c8b586ed7d0603a94..1fca412f0f7fe95efeac3bf4e4ced0e53f742ef6 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2003-11-12  Richard Sandiford  <rsandifo@redhat.com>
+
+       PR bootstrap/12752
+       * config/mips/t-iris6 (MULTILIB_OPTIONS): Put -mabi=n32 first.
+       (MULTILIB_OSDIRNAMES): Reorder accordingly.
+
 2003-11-12  Janis Johnson  <janis187@us.ibm.com>
 
        * rs6000-protos.h (rs6000_initial_elimination_offset): Add.

diff --git a/gcc/config/mips/t-iris6 b/gcc/config/mips/t-iris6
index d157b3a0ca98bd12e5dab516630de2572c445227..0af637485d7cd20711c98f65770a509a51c943fd 100644 (file)
--- a/gcc/config/mips/t-iris6
+++ b/gcc/config/mips/t-iris6
@@ -1,9 +1,9 @@
 # ??? If no mabi=X option given, but a mipsX option is, then should deal
 # with that.
-MULTILIB_OPTIONS=mabi=32/mabi=n32/mabi=64
+MULTILIB_OPTIONS=mabi=n32/mabi=32/mabi=64
 MULTILIB_DIRNAMES=
 MULTILIB_MATCHES=
-MULTILIB_OSDIRNAMES=mabi=32 . mabi=64
+MULTILIB_OSDIRNAMES=. mabi=32 mabi=64
 
 LIBGCC = stmp-multilib
 INSTALL_LIBGCC = install-multilib