Patch for bootstrap/12752
Richard Sandiford
rsandifo@redhat.com
Wed Nov 12 21:38:00 GMT 2003
This patch fixes boostrap on mips-sgi-irix6.5. It started failing after
Phil's recent patch to genmultilib, which gave a new meaning to "=" in
MULTILIB_OSDIRNAMES. Unfortunately, the irix6 makefile expects "="s to
be passed through as-is.
Since the new behaviour only applies if the first entry has an "=",
an easy fix is to put the default multilib first. However, I'm not
installing this as obvious in case anyone knows of some unwanted
side-effect.
Tested on mips-sgi-irix6.5. OK to install?
Richard
* config/mips/t-iris6 (MULTILIB_OPTIONS): Put -mabi=n32 first.
(MULTILIB_OSDIRNAMES): Reorder accordingly.
Index: config/mips/t-iris6
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/mips/t-iris6,v
retrieving revision 1.19
diff -u -d -p -F^\([(a-zA-Z0-9_]\|#define\) -r1.19 t-iris6
--- config/mips/t-iris6 17 Oct 2003 11:44:33 -0000 1.19
+++ config/mips/t-iris6 12 Nov 2003 20:57:00 -0000
@@ -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
More information about the Gcc-patches
mailing list