* config/mips/t-mti-elf (MULTILIB_OPTIONS): Remove fp64 multilib.
(MULTILIB_DIRNAMES): Ditto.
* config/mips/t-mti-elf (MULTILIB_OPTIONS): Ditto.
* config/mips/t-mti-elf (MULTILIB_EXCEPTIONS): Ditto.
* config/mips/t-mti-linux (MULTILIB_OPTIONS): Ditto.
* config/mips/t-mti-linux (MULTILIB_DIRNAMES): Ditto.
* config/mips/t-mti-linux (MULTILIB_EXCEPTIONS): Ditto.
* config/mips/mti-linux.h (SYSROOT_SUFFIX_SPEC): Ditto.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@213868
138bc75d-0d04-0410-961f-
82ee72b054a4
+2014-08-12 Steve Ellcey <sellcey@mips.com>
+
+ * config/mips/t-mti-elf (MULTILIB_OPTIONS): Remove fp64 multilib.
+ (MULTILIB_DIRNAMES): Ditto.
+ * config/mips/t-mti-elf (MULTILIB_OPTIONS): Ditto.
+ * config/mips/t-mti-elf (MULTILIB_EXCEPTIONS): Ditto.
+ * config/mips/t-mti-linux (MULTILIB_OPTIONS): Ditto.
+ * config/mips/t-mti-linux (MULTILIB_DIRNAMES): Ditto.
+ * config/mips/t-mti-linux (MULTILIB_EXCEPTIONS): Ditto.
+ * config/mips/mti-linux.h (SYSROOT_SUFFIX_SPEC): Ditto.
+
2014-08-12 Ramana Radhakrishnan <ramana.radhakrishnan@arm.com>
PR target/61413
/* 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}%{mfp64:/fp64}%{mnan=2008:/nan2008}"
+ "%{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/mfp64 mnan=2008
-MULTILIB_DIRNAMES = mips32 mips64 mips64r2 mips16 micromips 64 el sof fp64 nan2008
+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 mips32r2=mips32r3 mips32r2=mips32r5 mips64r2=mips64r3 mips64r2=mips64r5
# The 64 bit ABI is not supported on the mips32 architecture.
# We do not want nan2008 libraries for soft-float.
MULTILIB_EXCEPTIONS += *msoft-float*/*mnan=2008*
-
-# -mfp64 libraries are only built for mips32r2 and not in mips16 mode.
-MULTILIB_EXCEPTIONS += *mips32/*mfp64*
-MULTILIB_EXCEPTIONS += *mips64*/*mfp64*
-MULTILIB_EXCEPTIONS += *mips16*/*mfp64*
# 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/mfp64 mnan=2008
-MULTILIB_DIRNAMES = mips32 mips64 mips64r2 mips16 micromips 64 el sof fp64 nan2008
+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 mips32r2=mips32r3 mips32r2=mips32r5 mips64r2=mips64r3 mips64r2=mips64r5
# The 64 bit ABI is not supported on the mips32 architecture.
# We do not want nan2008 libraries for soft-float.
MULTILIB_EXCEPTIONS += *msoft-float*/*mnan=2008*
-
-# -mfp64 libraries are only built for mips32r2 and not in mips16 mode.
-MULTILIB_EXCEPTIONS += *mips32/*mfp64*
-MULTILIB_EXCEPTIONS += *mips64*/*mfp64*
-MULTILIB_EXCEPTIONS += *mips16*/*mfp64*