From 9c2813123ce2131adc705c6f0e5aa9a24738c140 Mon Sep 17 00:00:00 2001 From: Daniel Hellstrom Date: Fri, 7 Nov 2014 17:35:01 +0100 Subject: [PATCH] config.gcc (sparc-*-rtems*): Clean away unused t-elf. 2014-11-07 Daniel Hellstrom * config.gcc (sparc-*-rtems*): Clean away unused t-elf. * config/sparc/t-rtems: Add leon3v7 and muser-mode multilibs. From-SVN: r217231 --- gcc/ChangeLog | 5 +++++ gcc/config.gcc | 2 +- gcc/config/sparc/t-rtems | 13 +++++++++++-- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c418283e84a..0a7a43d8e2e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2014-11-07 Daniel Hellstrom + + * config.gcc (sparc-*-rtems*): Clean away unused t-elf. + * config/sparc/t-rtems: Add leon3v7 and muser-mode multilibs. + 2014-11-07 Martin Liska PR ipa/63580 diff --git a/gcc/config.gcc b/gcc/config.gcc index f1bfb656746..7afe5a7e8c3 100644 --- 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 86a2302614c..ae7a33ab447 100644 --- a/gcc/config/sparc/t-rtems +++ b/gcc/config/sparc/t-rtems @@ -17,6 +17,15 @@ # . # -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 -- 2.30.2