t-mti-linux (MULTILIB_EXCEPTIONS): Add exceptions for mips32[r1] and mips64[r1] with...

2014-12-29  Steve Ellcey  <sellcey@mips.com>

	* config/mips/t-mti-linux (MULTILIB_EXCEPTIONS): Add exceptions
	for mips32[r1] and mips64[r1] with -mnan=2008.
	* config/mips/t-mti-elf (MULTILIB_EXCEPTIONS): Ditto.

From-SVN: r219101

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ff8a5e6..4a036a0 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2014-12-29  Steve Ellcey  <sellcey@mips.com>
+
+       * config/mips/t-mti-linux (MULTILIB_EXCEPTIONS): Add exceptions
+       for mips32[r1] and mips64[r1] with -mnan=2008.
+       * config/mips/t-mti-elf (MULTILIB_EXCEPTIONS): Ditto.
+
 2014-12-27  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR target/64409

diff --git a/gcc/config/mips/t-mti-elf b/gcc/config/mips/t-mti-elf
index 487a015..5525a7a 100644 (file)
--- a/gcc/config/mips/t-mti-elf
+++ b/gcc/config/mips/t-mti-elf
@@ -41,5 +41,8 @@ MULTILIB_EXCEPTIONS += *mips32/mmicromips*
 MULTILIB_EXCEPTIONS += *mips64*/mmicromips*
 MULTILIB_EXCEPTIONS += *mmicromips/mabi=64*
 
-# We do not want nan2008 libraries for soft-float.
+# We do not want nan2008 libraries for soft-float,
+# mips32[r1], or mips64[r1].
 MULTILIB_EXCEPTIONS += *msoft-float*/*mnan=2008*
+MULTILIB_EXCEPTIONS += *mips32/*mnan=2008*
+MULTILIB_EXCEPTIONS += *mips64/*mnan=2008*

diff --git a/gcc/config/mips/t-mti-linux b/gcc/config/mips/t-mti-linux
index 487a015..5525a7a 100644 (file)
--- a/gcc/config/mips/t-mti-linux
+++ b/gcc/config/mips/t-mti-linux
@@ -41,5 +41,8 @@ MULTILIB_EXCEPTIONS += *mips32/mmicromips*
 MULTILIB_EXCEPTIONS += *mips64*/mmicromips*
 MULTILIB_EXCEPTIONS += *mmicromips/mabi=64*
 
-# We do not want nan2008 libraries for soft-float.
+# We do not want nan2008 libraries for soft-float,
+# mips32[r1], or mips64[r1].
 MULTILIB_EXCEPTIONS += *msoft-float*/*mnan=2008*
+MULTILIB_EXCEPTIONS += *mips32/*mnan=2008*
+MULTILIB_EXCEPTIONS += *mips64/*mnan=2008*