dhowells pushed to cross-gcc (f22). "Update SH multilib specification (..more)"

[notifications at fedoraproject.org]

>From cf3ff7f8ffc10d494e67b1658c35548ab1c23ddc Mon Sep 17 00:00:00 2001
From: David Howells <dhowells at redhat.com>
Date: Thu, 26 Mar 2015 10:18:44 +0000
Subject: Update SH multilib specification

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@221685 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/cross-gcc-sh.patch b/cross-gcc-sh.patch
index 76e92f2..d6697f5 100644
--- a/cross-gcc-sh.patch
+++ b/cross-gcc-sh.patch
@@ -1,32 +1,15 @@
-Fix multilib problem caused by:
+Fix SH multilib problem caused by:
 
-  * config/sh/t-linux (MULTILIB_EXCEPTIONS): Define for m2a cases.
-    git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@221287 138bc75d-0d04-0410-961f-82ee72b054a4
+gcc/
+	* config/sh/t-linux (DEFAULT_ENDIAN, MULTILIB_EXCEPTIONS): Remove.
+	* config/sh/t-sh (MULTILIB_EXCEPTIONS): Handle default endian.
 
-Patch here: https://gcc.gnu.org/ml/gcc-patches/2015-03/msg00531.html
 
-Suggested by Kaz Kojima <kkojima at rr.iij4u.or.jp>
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@221685 138bc75d-0d04-0410-961f-82ee72b054a4
 
-Index: gcc/config/sh/t-linux
-===================================================================
---- gcc/config/sh/t-linux	(revision 221308)
-+++ gcc/config/sh/t-linux	(working copy)
-@@ -1,9 +1,9 @@
- MULTILIB_DIRNAMES= 
- MULTILIB_MATCHES = 
- 
--DEFAULT_ENDIAN = $(word 1,$(TM_ENDIAN_CONFIG))
-+# SH1 and SH2A support big endian only.
- ifeq ($(DEFAULT_ENDIAN),ml)
--MULTILIB_EXCEPTIONS = m2a m2a/ml
-+MULTILIB_EXCEPTIONS = m1 ml/m1 m2a* ml/m2a* $(TM_MULTILIB_EXCEPTIONS_CONFIG)
- else
--MULTILIB_EXCEPTIONS = ml/m2a
-+MULTILIB_EXCEPTIONS = ml/m1 ml/m2a* $(TM_MULTILIB_EXCEPTIONS_CONFIG)
- endif
 Index: gcc/config/sh/t-sh
 ===================================================================
---- gcc/config/sh/t-sh	(revision 221308)
+--- gcc/config/sh/t-sh	(revision 221670)
 +++ gcc/config/sh/t-sh	(working copy)
 @@ -63,8 +63,12 @@
      done \
@@ -42,3 +25,17 @@ Index: gcc/config/sh/t-sh
  
  MULTILIB_OSDIRNAMES = \
  	$(OTHER_ENDIAN)=!$(OTHER_ENDIAN) \
+Index: gcc/config/sh/t-linux
+===================================================================
+--- gcc/config/sh/t-linux	(revision 221670)
++++ gcc/config/sh/t-linux	(working copy)
+@@ -1,9 +1,2 @@
+ MULTILIB_DIRNAMES= 
+ MULTILIB_MATCHES = 
+-
+-DEFAULT_ENDIAN = $(word 1,$(TM_ENDIAN_CONFIG))
+-ifeq ($(DEFAULT_ENDIAN),ml)
+-MULTILIB_EXCEPTIONS = m2a m2a/ml
+-else
+-MULTILIB_EXCEPTIONS = ml/m2a
+-endif
diff --git a/cross-gcc.spec b/cross-gcc.spec
index 0e941da..6686bfb 100644
--- a/cross-gcc.spec
+++ b/cross-gcc.spec
@@ -432,7 +432,7 @@ function config_target () {
 	    CONFIG_FLAGS="--with-arch=z9-109 --with-tune=z10 --enable-decimal-float --with-long-double-128"
 	    ;;
 	sh-*)
-	    CONFIG_FLAGS=--with-multilib-list=m1,m2,m2e,m4,m4-single,m4-single-only,m2a,m2a-single,!m2a,!m2a-single
+	    CONFIG_FLAGS=--with-multilib-list=m1,m2,m2e,m4,m4-single,m4-single-only,m2a,m2a-single
 	    ;;
 	sh64-*)
 	    CONFIG_FLAGS=--with-multilib-list=m5-32media,m5-32media-nofpu,m5-compact,m5-compact-nofpu,m5-64media,m5-64media-nofpu
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/cross-gcc.git/commit/?h=f22&id=cf3ff7f8ffc10d494e67b1658c35548ab1c23ddc