From: sje <sje@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 29 Dec 2014 16:42:26 +0000 (+0000)
Subject: 2014-12-29  Steve Ellcey  <sellcey@mips.com>
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=92df8675e4c2646f8af773328243b2b05646770c;p=thirdparty%2Fgcc.git

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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@219101 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ff8a5e640f13..4a036a061aae 100644
--- 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 487a015a22d8..5525a7a6421c 100644
--- 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 487a015a22d8..5525a7a6421c 100644
--- 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*