diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 64022b01e98..941c40551fd 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+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
diff --git a/gcc/config/mips/mti-linux.h b/gcc/config/mips/mti-linux.h
index db9896b4047..318e981290b 100644
--- a/gcc/config/mips/mti-linux.h
+++ b/gcc/config/mips/mti-linux.h
@@ -20,7 +20,7 @@ along with GCC; see the file COPYING3.  If not see
 /* 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						\
diff --git a/gcc/config/mips/t-mti-elf b/gcc/config/mips/t-mti-elf
index cd0a9673bb8..487a015a22d 100644
--- a/gcc/config/mips/t-mti-elf
+++ b/gcc/config/mips/t-mti-elf
@@ -19,8 +19,8 @@
 # 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.
@@ -43,8 +43,3 @@ MULTILIB_EXCEPTIONS += *mmicromips/mabi=64*
 
 # 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*
diff --git a/gcc/config/mips/t-mti-linux b/gcc/config/mips/t-mti-linux
index cd0a9673bb8..487a015a22d 100644
--- a/gcc/config/mips/t-mti-linux
+++ b/gcc/config/mips/t-mti-linux
@@ -19,8 +19,8 @@
 # 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.
@@ -43,8 +43,3 @@ MULTILIB_EXCEPTIONS += *mmicromips/mabi=64*
 
 # 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*