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 8bc6fc86a51f7dfedd556fa0004b90942a751a69..99bba83ecde7fe8b5e8b1593fe181cab45433a7b 100644 (file)
--- 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 2491f10496fd92aa2138b3e3608fe5cb2c3a6c9a..57a415ba7db67abdc1266c8182eb604b3c9396c0 100644 (file)
--- 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 f1a3d845e32d4bf74cf87500ade53fdcdfca5e09..5b4d4143f6746a6a4269a7ef4c7adc3f256145bf 100644 (file)
--- 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