From: Daniel Hellstrom <daniel@gaisler.com>
Date: Mon, 10 Nov 2014 11:35:27 +0000 (+0100)
Subject: backport: config.gcc (sparc-*-rtems*): Clean away unused t-elf.
X-Git-Tag: releases/gcc-4.8.4~128
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1c98ec82774f77c307446537c0cd78e4e43cee1;p=thirdparty%2Fgcc.git

backport: config.gcc (sparc-*-rtems*): Clean away unused t-elf.

2014-11-10  Daniel Hellstrom  <daniel@gaisler.com>

	Backport from mainline
	* config.gcc (sparc-*-rtems*): Clean away unused t-elf.
	* config/sparc/t-rtems: Add leon3v7 and muser-mode multilibs.

From-SVN: r217283
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8bc6fc86a51f..99bba83ecde7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-10  Daniel Hellstrom  <daniel@gaisler.com>
+
+	Backport from mainline
+	* config.gcc (sparc-*-rtems*): Clean away unused t-elf.
+	* config/sparc/t-rtems: Add leon3v7 and muser-mode multilibs.
+
 2014-11-07  Daniel Hellstrom  <daniel@gaisler.com>
 
 	* config.gcc (sparc*-*-*): Accept mcpu=leon3v7 processor.
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 2491f10496fd..57a415ba7db6 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -2466,7 +2466,7 @@ sparc-*-elf*)
 	;;
 sparc-*-rtems*)
 	tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h sparc/sp-elf.h sparc/rtemself.h rtems.h newlib-stdint.h"
-	tmake_file="sparc/t-sparc sparc/t-elf sparc/t-rtems t-rtems"
+	tmake_file="sparc/t-sparc sparc/t-rtems t-rtems"
 	;;
 sparc-*-linux*)
 	tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h gnu-user.h linux.h glibc-stdint.h sparc/tso.h"
diff --git a/gcc/config/sparc/t-rtems b/gcc/config/sparc/t-rtems
index f1a3d845e32d..5b4d4143f674 100644
--- a/gcc/config/sparc/t-rtems
+++ b/gcc/config/sparc/t-rtems
@@ -17,6 +17,15 @@
 # <http://www.gnu.org/licenses/>.
 #
 
-MULTILIB_OPTIONS = msoft-float mcpu=v8/mcpu=leon3
-MULTILIB_DIRNAMES = soft v8 leon3
+MULTILIB_OPTIONS = msoft-float mcpu=v8/mcpu=leon3/mcpu=leon3v7 muser-mode
+MULTILIB_DIRNAMES = soft v8 leon3 leon3v7 user-mode
 MULTILIB_MATCHES = msoft-float=mno-fpu
+
+MULTILIB_EXCEPTIONS = muser-mode
+MULTILIB_EXCEPTIONS += mcpu=leon3
+MULTILIB_EXCEPTIONS += mcpu=leon3v7
+MULTILIB_EXCEPTIONS += msoft-float/mcpu=leon3
+MULTILIB_EXCEPTIONS += msoft-float/mcpu=leon3v7
+MULTILIB_EXCEPTIONS += msoft-float/muser-mode
+MULTILIB_EXCEPTIONS += msoft-float/mcpu=v8/muser-mode
+MULTILIB_EXCEPTIONS += mcpu=v8/muser-mode