Message ID | 4E523319.5060605@debian.org |
---|---|
State | New |
Headers | show |
Matthias Klose <doko@debian.org> writes: > 2011-08-22 Matthias Klose <doko@debian.org> > > Revert: > 2011-07-11 Arthur Loiret <aloiret@debian.org> > Matthias Klose <doko@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. Please also remove: tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_32" from: mips*-*-linux*) # Linux MIPS, either endian. tm_file="dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h ${tm_file} mips/gnu-user.h mips/linux.h" tmake_file="${tmake_file} mips/t-libgcc-mips16" if test x$enable_targets = xall; then tm_file="${tm_file} mips/gnu-user64.h mips/linux64.h" tmake_file="${tmake_file} mips/t-linux64" tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_32" fi in config.gcc. (For the record, this follows up from: http://gcc.gnu.org/ml/gcc-patches/2010-05/msg01108.html which I'd forgotten about until Matthias reminded me this morning.) OK with that change, thanks. Richard
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