• Bug#851869: gcc-6: Please support multiarch paths for sh3

    From John Paul Adrian Glaubitz@21:1/5 to All on Thu Jan 19 14:50:01 2017
    XPost: linux.debian.bugs.dist

    This is a multi-part MIME message sent by reportbug.


    Source: gcc-6
    Version: 6.3.0-3
    Severity: normal
    Tags: patch
    User: helmutg@debian.org
    Usertags: rebootstrap

    Hi!

    In order to be able to support sh3 as an architecture in rebootstrap,
    we need to modify the gcc-multiarch patch to support both "sh4"
    and "sh3" for multiarch paths.

    This is achieved by applying the attached patch.

    Thanks,
    Adrian

    --
    .''`. John Paul Adrian Glaubitz
    : :' : Debian Developer - glaubitz@debian.org
    `. `' Freie Universitaet Berlin - glaubitz@physik.fu-berlin.de
    `- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913

    diff -Nru old/gcc-6-6.3.0/debian/patches/gcc-multiarch.diff new/gcc-6-6.3.0/debian/patches/gcc-multiarch.diff
    --- old/gcc-6-6.3.0/debian/patches/gcc-multiarch.diff 2017-01-18 20:37:40.000000000 +0100
    +++ new/gcc-6-6.3.0/debian/patches/gcc-multiarch.diff 2017-01-17 14:23:25.412976232 +0100
    @@ -19,12 +19,17 @@
    ===================================================================
    --- 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

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)