[gcc-7] 158/354: * Add multiarch bits for non-glibc architectures (musl, uclibc) (Helmut Grohne). Closes: #861588.

[Ximin Luo]

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

infinity0 pushed a commit to branch master
in repository gcc-7.

commit 5e38592f80b04deccc5b42a15d81267946f860fd
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Tue May 2 09:42:41 2017 +0000

      * Add multiarch bits for non-glibc architectures (musl, uclibc) (Helmut
        Grohne). Closes: #861588.
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9412 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog                  |  7 +++++++
 debian/patches/gcc-multiarch.diff | 27 +++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c42874f..b977032 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gcc-7 (7-20170407-2) UNRELEASED; urgency=medium
+
+  * Add multiarch bits for non-glibc architectures (musl, uclibc) (Helmut
+    Grohne). Closes: #861588.
+
+ -- Matthias Klose <doko at debian.org>  Tue, 02 May 2017 11:40:02 +0200
+
 gcc-7 (7-20170407-1) experimental; urgency=medium
 
   * GCC 7 snapshot build, taken from the trunk 20170407.
diff --git a/debian/patches/gcc-multiarch.diff b/debian/patches/gcc-multiarch.diff
index 7768a6c..a65a646 100644
--- a/debian/patches/gcc-multiarch.diff
+++ b/debian/patches/gcc-multiarch.diff
@@ -145,6 +145,23 @@ Index: b/src/gcc/config.gcc
  		mips64*-*-linux* | mipsisa64*-*-linux*)
  			default_mips_abi=n32
  			enable_mips_multilibs="yes"
+@@ -3002,6 +3011,16 @@
+ 	tm_file="${tm_file} rs6000/option-defaults.h"
+ esac
+
++# non-glibc systems
++case ${target} in
++*-linux-musl*)
++	tmake_file="${tmake_file} t-musl"
++	;;
++*-linux-uclibc*)
++	tmake_file="${tmake_file} t-uclibc"
++	;;
++esac
++
+ # Build mkoffload tool
+ case ${target} in
+ *-intelmic-* | *-intelmicemul-*)
 @@ -4507,7 +4516,7 @@ case ${target} in
  	i[34567]86-*-darwin* | x86_64-*-darwin*)
  		;;
@@ -214,3 +231,13 @@ Index: b/src/gcc/config/tilegx/t-tilegx
 
  # Directory for prefix to system directories, for
  # each of $(system_prefix)/usr/include, $(system_prefix)/usr/lib, etc.
+--- /dev/null
++++ b/src/gcc/config/t-musl
+@@ -0,0 +1,2 @@
++MULTIARCH_DIRNAME := $(subst -linux-gnu,-linux-musl,$(MULTIARCH_DIRNAME))
++MULTILIB_OSDIRNAMES := $(subst -linux-gnu,-linux-musl,$(MULTILIB_OSDIRNAMES))
+--- /dev/null
++++ b/src/gcc/config/t-uclibc
+@@ -0,0 +1,2 @@
++MULTIARCH_DIRNAME := $(subst -linux-gnu,-linux-uclibc,$(MULTIARCH_DIRNAME))
++MULTILIB_OSDIRNAMES := $(subst -linux-gnu,-linux-uclibc,$(MULTILIB_OSDIRNAMES))

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