"Steve Ellcey " <sell...@imgtec.com> writes: > 2013-05-28 Steve Ellcey <sell...@imgtec.com> > > * config/mips/mti-linux.h (SYSROOT_SUFFIX_SPEC): Add micromips > and mips16 directories. > * config/mips/t-mti-linux (MULTILIB_OPTIONS): Add micromips and > mips16. > (MULTILIB_DIRNAMES): Ditto. > (MULTILIB_EXCEPTIONS): Add new exceptions. > * config/mips/t-mti-elf (MULTILIB_OPTIONS): Add micromips. > (MULTILIB_DIRNAMES): Ditto. > (MULTILIB_EXCEPTIONS): Add new exceptions.
OK, thanks. Just one minor suggestion: > @@ -32,4 +32,11 @@ MULTILIB_EXCEPTIONS += *mips32*/*mabi=64* > # or mips64r2 but does specify mabi=64 is not allowed because that > # would be defaulting to the mips32r2 architecture. > MULTILIB_EXCEPTIONS += mabi=64* > -MULTILIB_EXCEPTIONS += mips16/mabi=64* > +MULTILIB_EXCEPTIONS += *mips16/mabi=64* > +MULTILIB_EXCEPTIONS += *mmicromips/mabi=64* The new lines here and: > # The 64 bit ABI is not supported on the mips32r2 architecture. > # Because mips32r2 is the default we can't use that flag to trigger > -# the exception so we check for mabi=64 with no specific mips flag > -# instead. > +# the exception so we check for mabi=64 with no specific mips > +# architecture flag instead. > MULTILIB_EXCEPTIONS += mabi=64* > +MULTILIB_EXCEPTIONS += *mips16/mabi=64* > +MULTILIB_EXCEPTIONS += *mmicromips/mabi=64* here aren't really doing what the comment says. The "*" at the beginning allows any intervening flags, including -mips64 and -mips64r2. The lines are correct for a different reason: we're excluding all 64-bit MIPS16 and microMIPS multilibs, even when a correct -mips option is present. I think it would be clearer if you put these lines in the "restrict MIPS16 to 32-bit targets" and "restrict microMIPS to mips32r2" blocks instead. Changing the order like that shouldn't need a full retest. Richard
