+2013-08-08 Steve Ellcey <sellcey@mips.com>
+
+ * config/mips/mti-linux.h (SYSROOT_SUFFIX_SPEC): Add nan2008.
+ * config/mips/t-mti-elf (MULTILIB_OPTIONS): Make mips16 and
+ micromips incompatible. Add nan2008.
+ (MULTILIB_DIRNAMES): Add nan2008.
+ (MULTILIB_EXCEPTIONS): Remove mips16/micromips entry.
+ * config/mips/t-mti-linux (MULTILIB_OPTIONS): Make mips16
+ and micromips incompatible. Add nan2008.
+ (MULTILIB_DIRNAMES): Add nan2008.
+ (MULTILIB_EXCEPTIONS): Remove mips16/micromips entry.
+
2013-08-08 Richard Sandiford <rdsandiford@googlemail.com>
PR rtl-optimization/58079
/* This target is a multilib target, specify the sysroot paths. */
#undef SYSROOT_SUFFIX_SPEC
#define SYSROOT_SUFFIX_SPEC \
- "%{mips32:/mips32}%{mips64:/mips64}%{mips64r2:/mips64r2}%{mips16:/mips16}%{mmicromips:/micromips}%{mabi=64:/64}%{mel|EL:/el}%{msoft-float:/sof}"
+ "%{mips32:/mips32}%{mips64:/mips64}%{mips64r2:/mips64r2}%{mips16:/mips16}%{mmicromips:/micromips}%{mabi=64:/64}%{mel|EL:/el}%{msoft-float:/sof}%{mnan=2008:/nan2008}"
#undef DRIVER_SELF_SPECS
#define DRIVER_SELF_SPECS \
# The default build is mips32r2, hard-float big-endian. Add mips32,
# soft-float, and little-endian variations.
-MULTILIB_OPTIONS = mips32/mips64/mips64r2 mips16 mmicromips mabi=64 EL msoft-float
-MULTILIB_DIRNAMES = mips32 mips64 mips64r2 mips16 micromips 64 el sof
+MULTILIB_OPTIONS = mips32/mips64/mips64r2 mips16/mmicromips mabi=64 EL msoft-float/mnan=2008
+MULTILIB_DIRNAMES = mips32 mips64 mips64r2 mips16 micromips 64 el sof nan2008
MULTILIB_MATCHES = EL=mel EB=meb
# The 64 bit ABI is not supported on the mips32 architecture.
MULTILIB_EXCEPTIONS += *mips64*/*mips16*
MULTILIB_EXCEPTIONS += *mips16/mabi=64*
-# We only want micromips for mips32r2 architecture and we do not want
-# it used in conjunction with -mips16.
-MULTILIB_EXCEPTIONS += *mips16/mmicromips*
+# We only want micromips for mips32r2 architecture.
MULTILIB_EXCEPTIONS += *mips64*/mmicromips*
MULTILIB_EXCEPTIONS += *mips32/mmicromips*
MULTILIB_EXCEPTIONS += *mmicromips/mabi=64*
# The default build is mips32r2, hard-float big-endian. Add mips32,
# soft-float, and little-endian variations.
-MULTILIB_OPTIONS = mips32/mips64/mips64r2 mips16 mmicromips mabi=64 EL msoft-float
-MULTILIB_DIRNAMES = mips32 mips64 mips64r2 mips16 micromips 64 el sof
+MULTILIB_OPTIONS = mips32/mips64/mips64r2 mips16/mmicromips mabi=64 EL msoft-float/mnan=2008
+MULTILIB_DIRNAMES = mips32 mips64 mips64r2 mips16 micromips 64 el sof nan2008
MULTILIB_MATCHES = EL=mel EB=meb
# The 64 bit ABI is not supported on the mips32 architecture.
MULTILIB_EXCEPTIONS += *mips64*/*mips16*
MULTILIB_EXCEPTIONS += *mips16/mabi=64*
-# We only want micromips for mips32r2 architecture and we do not want
-# it used in conjunction with -mips16.
-MULTILIB_EXCEPTIONS += *mips16/mmicromips*
+# We only want micromips for mips32r2 architecture.
MULTILIB_EXCEPTIONS += *mips64*/mmicromips*
MULTILIB_EXCEPTIONS += *mips32/mmicromips*
MULTILIB_EXCEPTIONS += *mmicromips/mabi=64*