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

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

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

From-SVN: r217231

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c418283e84a94feebacdf93402e1734754de3560..0a7a43d8e2eedaa3e474a3fb547b722f2888a411 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-07  Daniel Hellstrom  <daniel@gaisler.com>
+
+       * config.gcc (sparc-*-rtems*): Clean away unused t-elf.
+       * config/sparc/t-rtems: Add leon3v7 and muser-mode multilibs.
+
 2014-11-07  Martin Liska  <mliska@suse.cz>
 
        PR ipa/63580

diff --git a/gcc/config.gcc b/gcc/config.gcc
index f1bfb6567467634917611a5b58c6490acc8bb052..7afe5a7e8c3e2c93d28f8e62f33b046d32567ed5 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -2642,7 +2642,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="${tmake_file} sparc/t-sparc sparc/t-elf sparc/t-rtems"
+       tmake_file="${tmake_file} sparc/t-sparc sparc/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 86a2302614c73b089e2eb3a6303bc902854db6e1..ae7a33ab447ff64b75ea391b1255d6493938d45d 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