While looking at the multiarch patches, I noticed that a previous change is not
necessary.  MULTILIB_DEFAULTS is handled in config/mips/mips.h.

  Matthias

gcc/

2011-08-22  Matthias Klose <d...@debian.org>

        Revert:
        2011-07-11  Arthur Loiret  <aloi...@debian.org>
                    Matthias Klose <d...@debian.org>
        * config/mips/t-linux64 (MULTILIB_DIRNAMES): Set to 'n32 . 64' if
        tm_defines contains MIPS_ABI_DEFAULT ABI_32, to follow the glibc
        convention.
 
Index: gcc/config/mips/t-linux64
===================================================================
--- gcc/config/mips/t-linux64   (revision 177952)
+++ gcc/config/mips/t-linux64   (working copy)
@@ -17,11 +17,7 @@
 # <http://www.gnu.org/licenses/>.
 
 MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64
-ifneq ($(filter MIPS_ABI_DEFAULT=ABI_32,$(tm_defines)),)
-MULTILIB_DIRNAMES = n32 . 64
-else
 MULTILIB_DIRNAMES = n32 32 64
-endif
 MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64
 
 EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o

Reply via email to