- refresh patches for trunk

git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-5@7894 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca

10 files changed, 27 insertions, 21 deletions

diff --git a/debian/patches/ada-mips.diff b/debian/patches/ada-mips.diff
index 25e3f12..809bf2c 100644
--- a/debian/patches/ada-mips.diff
+++ b/debian/patches/ada-mips.diff
@@ -4,7 +4,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
 ===================================================================
 --- a/src/gcc/ada/gcc-interface/Makefile.in
 +++ b/src/gcc/ada/gcc-interface/Makefile.in
-@@ -1772,10 +1772,15 @@ ifeq ($(strip $(filter-out mips linux%,$
+@@ -1748,10 +1748,15 @@ ifeq ($(strip $(filter-out mips linux%,$
    s-taprop.adb<s-taprop-linux.adb \
    s-tasinf.ads<s-tasinf-linux.ads \
    s-tasinf.adb<s-tasinf-linux.adb \
diff --git a/debian/patches/ada-mips64.diff b/debian/patches/ada-mips64.diff
index ac89077..a137742 100644
--- a/debian/patches/ada-mips64.diff
+++ b/debian/patches/ada-mips64.diff
@@ -1,6 +1,8 @@
+Index: b/src/gcc/ada/gcc-interface/Makefile.in
+===================================================================
 --- a/src/gcc/ada/gcc-interface/Makefile.in
 +++ b/src/gcc/ada/gcc-interface/Makefile.in
-@@ -1893,7 +1893,7 @@ ifeq ($(strip $(filter-out mips64el linu
+@@ -1830,7 +1830,7 @@ ifeq ($(strip $(filter-out mips64el linu
    LIBGNAT_TARGET_PAIRS_64 = \
    system.ads<system-linux-mips64el.ads
  
diff --git a/debian/patches/ada-ppc64.diff b/debian/patches/ada-ppc64.diff
index 524ecdb..2ec1398 100644
--- a/debian/patches/ada-ppc64.diff
+++ b/debian/patches/ada-ppc64.diff
@@ -6,7 +6,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
 ===================================================================
 --- a/src/gcc/ada/gcc-interface/Makefile.in
 +++ b/src/gcc/ada/gcc-interface/Makefile.in
-@@ -1908,9 +1908,14 @@ ifeq ($(strip $(filter-out powerpc% linu
+@@ -1884,9 +1884,14 @@ ifeq ($(strip $(filter-out powerpc% linu
      LIBGNAT_TARGET_PAIRS_64 = \
      system.ads<system-linux-ppc64.ads
  
diff --git a/debian/patches/arm-multilib-defaults.diff b/debian/patches/arm-multilib-defaults.diff
index caa4439..571d17f 100644
--- a/debian/patches/arm-multilib-defaults.diff
+++ b/debian/patches/arm-multilib-defaults.diff
@@ -4,7 +4,7 @@ Index: b/src/gcc/config.gcc
 ===================================================================
 --- a/src/gcc/config.gcc
 +++ b/src/gcc/config.gcc
-@@ -3607,10 +3607,18 @@ case "${target}" in
+@@ -3619,10 +3619,18 @@ case "${target}" in
  		fi
  
  		case "$with_float" in
@@ -25,7 +25,7 @@ Index: b/src/gcc/config.gcc
  		*)
  			echo "Unknown floating point type used in --with-float=$with_float" 1>&2
  			exit 1
-@@ -3644,6 +3652,9 @@ case "${target}" in
+@@ -3656,6 +3664,9 @@ case "${target}" in
  		"" \
  		| arm | thumb )
  			#OK
diff --git a/debian/patches/gcc-ice-apport.diff b/debian/patches/gcc-ice-apport.diff
index a86db9e..25f0d6a 100644
--- a/debian/patches/gcc-ice-apport.diff
+++ b/debian/patches/gcc-ice-apport.diff
@@ -5,7 +5,7 @@ Index: b/src/gcc/gcc.c
 ===================================================================
 --- a/src/gcc/gcc.c
 +++ b/src/gcc/gcc.c
-@@ -6518,6 +6518,16 @@ do_report_bug (const char **new_argv, co
+@@ -6571,6 +6571,16 @@ do_report_bug (const char **new_argv, co
      {
        fnotice (stderr, "Preprocessed source stored into %s file,"
  	       " please attach this to your bugreport.\n", *out_file);
diff --git a/debian/patches/gcc-multiarch.diff b/debian/patches/gcc-multiarch.diff
index 70e2145..0056c9d 100644
--- a/debian/patches/gcc-multiarch.diff
+++ b/debian/patches/gcc-multiarch.diff
@@ -19,11 +19,15 @@ 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,4 @@
+@@ -1,6 +1,8 @@
  MULTILIB_DIRNAMES= 
  MULTILIB_MATCHES = 
-+
+ 
 +MULTILIB_OSDIRNAMES = sh4-linux-gnu:sh4-linux-gnu sh4_nofpu-linux-gnu:sh4-linux-gnu
++
+ DEFAULT_ENDIAN = $(word 1,$(TM_ENDIAN_CONFIG))
+ ifeq ($(DEFAULT_ENDIAN),ml)
+ MULTILIB_EXCEPTIONS = m2a m2a/ml
 Index: b/src/gcc/config/sparc/t-linux64
 ===================================================================
 --- a/src/gcc/config/sparc/t-linux64
@@ -110,9 +114,9 @@ Index: b/src/gcc/config/mips/t-linux64
 +endif
 Index: b/src/gcc/config.gcc
 ===================================================================
---- a/src/gcc/config.gcc	2015-03-11 01:56:41.641941311 +0800
-+++ b/src/gcc/config.gcc	2015-03-11 01:56:41.621941311 +0800
-@@ -2030,6 +2030,10 @@
+--- a/src/gcc/config.gcc
++++ b/src/gcc/config.gcc
+@@ -2032,6 +2032,10 @@ mips*-*-linux*)				# Linux MIPS, either
  			default_mips_arch=mips64r2
  			enable_mips_multilibs="yes"
  			;;
@@ -123,7 +127,7 @@ Index: b/src/gcc/config.gcc
  		mips64*-*-linux* | mipsisa64*-*-linux*)
  			default_mips_abi=n32
  			enable_mips_multilibs="yes"
-@@ -4221,7 +4225,7 @@
+@@ -4232,7 +4236,7 @@ case ${target} in
  	i[34567]86-*-darwin* | x86_64-*-darwin*)
  		;;
  	i[34567]86-*-linux* | x86_64-*-linux*)
@@ -149,9 +153,9 @@ Index: b/src/gcc/config/aarch64/t-aarch64-linux
 +MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu)
 Index: b/src/gcc/config/mips/mips.h
 ===================================================================
---- a/src/gcc/config/mips/mips.h	2015-03-11 01:40:50.000000000 +0800
-+++ b/src/gcc/config/mips/mips.h	2015-03-11 03:16:53.313941935 +0800
-@@ -3137,13 +3137,3 @@
+--- a/src/gcc/config/mips/mips.h
++++ b/src/gcc/config/mips/mips.h
+@@ -3137,13 +3137,3 @@ extern GTY(()) struct target_globals *mi
     with arguments ARGS.  */
  #define PMODE_INSN(NAME, ARGS) \
    (Pmode == SImode ? NAME ## _si ARGS : NAME ## _di ARGS)
diff --git a/debian/patches/go-use-gold.diff b/debian/patches/go-use-gold.diff
index e887221..3eaee01 100644
--- a/debian/patches/go-use-gold.diff
+++ b/debian/patches/go-use-gold.diff
@@ -71,7 +71,7 @@ Index: b/src/gcc/config.in
 ===================================================================
 --- a/src/gcc/config.in
 +++ b/src/gcc/config.in
-@@ -1259,6 +1259,12 @@
+@@ -1277,6 +1277,12 @@
  #endif
  
  
diff --git a/debian/patches/libffi-ro-eh_frame_sect.diff b/debian/patches/libffi-ro-eh_frame_sect.diff
index d208d33..4da147b 100644
--- a/debian/patches/libffi-ro-eh_frame_sect.diff
+++ b/debian/patches/libffi-ro-eh_frame_sect.diff
@@ -4,7 +4,7 @@ Index: b/src/libffi/configure.ac
 ===================================================================
 --- a/src/libffi/configure.ac
 +++ b/src/libffi/configure.ac
-@@ -294,6 +294,8 @@ if test "x$GCC" = "xyes"; then
+@@ -270,6 +270,8 @@ if test "x$GCC" = "xyes"; then
    		libffi_cv_hidden_visibility_attribute=yes
    	    fi
    	fi
diff --git a/debian/patches/libjava-fixed-symlinks.diff b/debian/patches/libjava-fixed-symlinks.diff
index 6019ce3..107c752 100644
--- a/debian/patches/libjava-fixed-symlinks.diff
+++ b/debian/patches/libjava-fixed-symlinks.diff
@@ -4,7 +4,7 @@ Index: b/src/libjava/Makefile.am
 ===================================================================
 --- a/src/libjava/Makefile.am
 +++ b/src/libjava/Makefile.am
-@@ -836,7 +836,7 @@ if CREATE_JAVA_HOME
+@@ -835,7 +835,7 @@ if CREATE_JAVA_HOME
  	$(mkinstalldirs) $(DESTDIR)$(SDK_INCLUDE_DIR)/$(OS)
  	relative() { \
  	  $(PERL) -e 'use File::Spec; \
@@ -17,7 +17,7 @@ Index: b/src/libjava/Makefile.in
 ===================================================================
 --- a/src/libjava/Makefile.in
 +++ b/src/libjava/Makefile.in
-@@ -12506,7 +12506,7 @@ install-data-local:
+@@ -12504,7 +12504,7 @@ install-data-local:
  @CREATE_JAVA_HOME_TRUE@	$(mkinstalldirs) $(DESTDIR)$(SDK_INCLUDE_DIR)/$(OS)
  @CREATE_JAVA_HOME_TRUE@	relative() { \
  @CREATE_JAVA_HOME_TRUE@	  $(PERL) -e 'use File::Spec; \
diff --git a/debian/patches/sys-auxv-header.diff b/debian/patches/sys-auxv-header.diff
index 3034f29..cce721d 100644
--- a/debian/patches/sys-auxv-header.diff
+++ b/debian/patches/sys-auxv-header.diff
@@ -6,7 +6,7 @@ Index: b/src/gcc/configure.ac
 +++ b/src/gcc/configure.ac
 @@ -1032,6 +1032,7 @@ AC_HEADER_TIOCGWINSZ
  AC_CHECK_HEADERS(limits.h stddef.h string.h strings.h stdlib.h time.h iconv.h \
- 		 fcntl.h unistd.h sys/file.h sys/time.h sys/mman.h \
+ 		 fcntl.h ftw.h unistd.h sys/file.h sys/time.h sys/mman.h \
  		 sys/resource.h sys/param.h sys/times.h sys/stat.h \
 +		 sys/auxv.h \
  		 direct.h malloc.h langinfo.h ldfcn.h locale.h wchar.h)
@@ -16,7 +16,7 @@ Index: b/src/gcc/config.in
 ===================================================================
 --- a/src/gcc/config.in
 +++ b/src/gcc/config.in
-@@ -1610,6 +1610,12 @@
+@@ -1628,6 +1628,12 @@
  #endif