mti-linux.h (MIPS_SYSVERSION_SPEC): Update to handle mips[32|64]r3 and mips[32|64]r5.

2015-07-09  Steve Ellcey  <sellcey@imgtec.com>

	* config/mips/mti-linux.h (MIPS_SYSVERSION_SPEC): Update
	to handle mips[32|64]r3 and mips[32|64]r5.

From-SVN: r225643

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5bc2f6ac78e4e1056789cfd79eb56b3ce17159a8..43687fe4423b49e61fccff8157745d5e508bedab 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-07-09  Steve Ellcey  <sellcey@imgtec.com>
+
+       * config/mips/mti-linux.h (MIPS_SYSVERSION_SPEC): Update
+       to handle mips[32|64]r3 and mips[32|64]r5.
+
 2015-07-09  Jakub Jelinek  <jakub@redhat.com>
 
        PR middle-end/66633

diff --git a/gcc/config/mips/mti-linux.h b/gcc/config/mips/mti-linux.h
index 03d1baa8411f9273a888539b7d2e7068fdbf5bf4..b497625802a2b9fa8fcea4866ce3d52f65d00c57 100644 (file)
--- a/gcc/config/mips/mti-linux.h
+++ b/gcc/config/mips/mti-linux.h
@@ -17,10 +17,14 @@ You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING3.  If not see
 <http://www.gnu.org/licenses/>.  */
 
-/* This target is a multilib target, specify the sysroot paths.  */
-#define MIPS_SYSVERSION_SPEC                                   \
-    "%{mips32:r1}%{mips64:r1}%{mips32r2:r2}%{mips64r2:r2}"     \
-    "%{mips32r6:r6}%{mips64r6:r6}%{mips16:-mips16}"
+/* This target is a multilib target, specify the sysroot paths.
+   MIPS_SYSVERSION_SPEC defaults to 'r2' (mips32r2 or mips64r2) unless
+   'r1' or 'r6' are specifically given so that mips32r3, mips32r5,
+   mips64r3, and mips64r5 will all default to 'r2'.  See MULTILIB_MATCHES
+   definition in t-mti-linux.  */
+
+#define MIPS_SYSVERSION_SPEC \
+    "%{mips32|mips64:r1;mips32r6|mips64r6:r6;:r2}%{mips16:-mips16}"
 
 #undef SYSROOT_SUFFIX_SPEC
 #define SYSROOT_SUFFIX_SPEC                                            \