[gcc-6] 358/401: * Update multiarch builds for a new sh3 target. Closes: #851869.

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch pu/reproducible_builds
in repository gcc-6.

commit 8dfd1f0934f0b3fe18354206be27515181283aeb
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Mon Jan 23 22:47:59 2017 +0000

      * Update multiarch builds for a new sh3 target. Closes: #851869.
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@9252 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog                  | 1 +
 debian/patches/gcc-multiarch.diff | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8830d0b..dd97394 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ gcc-6 (6.3.0-5) UNRELEASED; urgency=medium
   * Let the gnatgcc symlinks point to the versioned names. Closes: #839209.
   * Backport patches to disable madd4 instructions on mips* targets and
     disable these by default (YunQiang Su). Closes. #852153.
+  * Update multiarch builds for a new sh3 target. Closes: #851869.
 
  -- Matthias Klose <doko at debian.org>  Mon, 23 Jan 2017 10:42:09 +0100
 
diff --git a/debian/patches/gcc-multiarch.diff b/debian/patches/gcc-multiarch.diff
index 92f2de6..ef4830d 100644
--- a/debian/patches/gcc-multiarch.diff
+++ b/debian/patches/gcc-multiarch.diff
@@ -19,12 +19,17 @@ Index: b/src/gcc/config/sh/t-linux
 ===================================================================
 --- a/src/gcc/config/sh/t-linux
 +++ b/src/gcc/config/sh/t-linux
-@@ -1,2 +1,5 @@
+@@ -1,2 +1,10 @@
  MULTILIB_DIRNAMES= 
  MULTILIB_MATCHES = 
 +
++ifneq (,$(findstring sh4,$(target)))
 +MULTILIB_OSDIRNAMES = .:sh4-linux-gnu sh4_nofpu-linux-gnu:sh4-linux-gnu
 +MULTIARCH_DIRNAME = $(call if_multiarch,sh4-linux-gnu)
++else
++MULTILIB_OSDIRNAMES = .:sh3-linux-gnu sh3_nofpu-linux-gnu:sh3-linux-gnu
++MULTIARCH_DIRNAME = $(call if_multiarch,sh3-linux-gnu)
++endif
 Index: b/src/gcc/config/sparc/t-linux64
 ===================================================================
 --- a/src/gcc/config/sparc/t-linux64

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-6.git