[gcc-7] 161/354: - update gcc-multiarch patch for the branch

[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 f994d812792272ad4e2188e4bdb866b771dacb77
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Tue May 2 14:17:54 2017 +0000

     - update gcc-multiarch patch for the branch
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9418 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/patches/gcc-multiarch.diff | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/debian/patches/gcc-multiarch.diff b/debian/patches/gcc-multiarch.diff
index a65a646..8fdf473 100644
--- a/debian/patches/gcc-multiarch.diff
+++ b/debian/patches/gcc-multiarch.diff
@@ -145,10 +145,10 @@ Index: b/src/gcc/config.gcc
  		mips64*-*-linux* | mipsisa64*-*-linux*)
  			default_mips_abi=n32
  			enable_mips_multilibs="yes"
-@@ -3002,6 +3011,16 @@
+@@ -3060,6 +3069,16 @@ powerpc*-*-* | rs6000-*-*)
  	tm_file="${tm_file} rs6000/option-defaults.h"
  esac
-
+ 
 +# non-glibc systems
 +case ${target} in
 +*-linux-musl*)
@@ -162,7 +162,7 @@ Index: b/src/gcc/config.gcc
  # Build mkoffload tool
  case ${target} in
  *-intelmic-* | *-intelmicemul-*)
-@@ -4507,7 +4516,7 @@ case ${target} in
+@@ -4507,7 +4526,7 @@ case ${target} in
  	i[34567]86-*-darwin* | x86_64-*-darwin*)
  		;;
  	i[34567]86-*-linux* | x86_64-*-linux*)
@@ -220,22 +220,28 @@ Index: b/src/gcc/config/tilegx/t-tilegx
  
  LIBGCC = stmp-multilib
  INSTALL_LIBGCC = install-multilib
+Index: b/src/gcc/Makefile.in
+===================================================================
 --- a/src/gcc/Makefile.in
 +++ b/src/gcc/Makefile.in
-@@ -494,7 +494,7 @@
+@@ -521,7 +521,7 @@ SYSTEM_HEADER_DIR = `echo @SYSTEM_HEADER
  STMP_FIXINC = @STMP_FIXINC@
-
+ 
  # Test to see whether <limits.h> exists in the system header files.
--LIMITS_H_TEST = [ -f $(BUILD_SYSTEM_HEADER_DIR)/limits.h ]
-+LIMITS_H_TEST = [ -f $(BUILD_SYSTEM_HEADER_DIR)/limits.h -o -f $(BUILD_SYSTEM_HEADER_DIR)/$(MULTIARCH_DIRNAME)/limits.h ]
-
+-LIMITS_H_TEST = [ -f $(SYSTEM_HEADER_DIR)/limits.h ]
++LIMITS_H_TEST = [ -f $(SYSTEM_HEADER_DIR)/limits.h -o -f $(SYSTEM_HEADER_DIR)/$(MULTIARCH_DIRNAME)/limits.h ]
+ 
  # Directory for prefix to system directories, for
  # each of $(system_prefix)/usr/include, $(system_prefix)/usr/lib, etc.
+Index: b/src/gcc/config/t-musl
+===================================================================
 --- /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))
+Index: b/src/gcc/config/t-uclibc
+===================================================================
 --- /dev/null
 +++ b/src/gcc/config/t-uclibc
 @@ -0,0 +1,2 @@

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