gcc-4.8 (4.8-20130308-1) experimental; urgency=low

  * GCC snapshot 20130308, taken from the trunk.

 -- Matthias Klose <doko@debian.org>  Fri, 08 Mar 2013 12:08:12 +0800


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

38 files changed, 226 insertions, 185 deletions

diff --git a/debian/patches/ada-mips.diff b/debian/patches/ada-mips.diff
index de47fb8..3b38d59 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
-@@ -1711,10 +1711,15 @@
+@@ -1723,10 +1723,15 @@
    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/alpha-no-ev4-directive.diff b/debian/patches/alpha-no-ev4-directive.diff
index fe607bd..77e1ba1 100644
--- a/debian/patches/alpha-no-ev4-directive.diff
+++ b/debian/patches/alpha-no-ev4-directive.diff
@@ -8,7 +8,7 @@ Index: b/src/gcc/config/alpha/alpha.c
 ===================================================================
 --- a/src/gcc/config/alpha/alpha.c
 +++ b/src/gcc/config/alpha/alpha.c
-@@ -9364,7 +9364,7 @@
+@@ -9365,7 +9365,7 @@
      fputs ("\t.set nomacro\n", asm_out_file);
    if (TARGET_SUPPORT_ARCH | TARGET_BWX | TARGET_MAX | TARGET_FIX | TARGET_CIX)
      {
@@ -17,7 +17,7 @@ Index: b/src/gcc/config/alpha/alpha.c
  
        if (alpha_cpu == PROCESSOR_EV6 || TARGET_FIX || TARGET_CIX)
  	arch = "ev6";
-@@ -9374,10 +9374,9 @@
+@@ -9375,10 +9375,9 @@
  	arch = "ev56";
        else if (alpha_cpu == PROCESSOR_EV5)
  	arch = "ev5";
diff --git a/debian/patches/arm-multilib-defaults.diff b/debian/patches/arm-multilib-defaults.diff
index 45387a2..696a626 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
-@@ -3192,10 +3192,18 @@
+@@ -3229,10 +3229,18 @@
  		esac
  
  		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
-@@ -3232,6 +3240,9 @@
+@@ -3269,6 +3277,9 @@
  		"" \
  		| arm | thumb )
  			#OK
@@ -39,7 +39,7 @@ Index: b/src/gcc/config/arm/linux-eabi.h
 ===================================================================
 --- a/src/gcc/config/arm/linux-eabi.h
 +++ b/src/gcc/config/arm/linux-eabi.h
-@@ -35,7 +35,21 @@
+@@ -34,7 +34,21 @@
     target hardware.  If you override this to use the hard-float ABI then
     change the setting of GLIBC_DYNAMIC_LINKER_DEFAULT as well.  */
  #undef  TARGET_DEFAULT_FLOAT_ABI
@@ -61,7 +61,7 @@ Index: b/src/gcc/config/arm/linux-eabi.h
  
  /* We default to the "aapcs-linux" ABI so that enums are int-sized by
     default.  */
-@@ -78,6 +92,28 @@
+@@ -77,6 +91,28 @@
      %{mfloat-abi=soft*:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "} \
      %{!mfloat-abi=*:" GLIBC_DYNAMIC_LINKER_DEFAULT "}"
  
diff --git a/debian/patches/config-ml.diff b/debian/patches/config-ml.diff
index 0d11dea..7dbd17a 100644
--- a/debian/patches/config-ml.diff
+++ b/debian/patches/config-ml.diff
@@ -93,7 +93,7 @@ Index: b/src/libstdc++-v3/include/Makefile.am
 ===================================================================
 --- a/src/libstdc++-v3/include/Makefile.am
 +++ b/src/libstdc++-v3/include/Makefile.am
-@@ -829,8 +829,9 @@
+@@ -826,8 +826,9 @@
  endif
  
  host_srcdir = ${glibcxx_srcdir}/$(OS_INC_SRCDIR)
@@ -105,7 +105,7 @@ Index: b/src/libstdc++-v3/include/Makefile.am
  host_headers = \
  	${host_srcdir}/ctype_base.h \
  	${host_srcdir}/ctype_inline.h \
-@@ -1050,6 +1051,7 @@
+@@ -1047,6 +1048,7 @@
  
  stamp-${host_alias}:
  	@-mkdir -p ${host_builddir}
@@ -117,7 +117,7 @@ Index: b/src/libstdc++-v3/include/Makefile.in
 ===================================================================
 --- a/src/libstdc++-v3/include/Makefile.in
 +++ b/src/libstdc++-v3/include/Makefile.in
-@@ -1082,8 +1082,9 @@
+@@ -1103,8 +1103,9 @@
  # For --enable-cheaders=c_std
  @GLIBCXX_C_HEADERS_COMPATIBILITY_TRUE@c_compatibility_headers_extra = ${c_compatibility_headers}
  host_srcdir = ${glibcxx_srcdir}/$(OS_INC_SRCDIR)
@@ -129,7 +129,7 @@ Index: b/src/libstdc++-v3/include/Makefile.in
  host_headers = \
  	${host_srcdir}/ctype_base.h \
  	${host_srcdir}/ctype_inline.h \
-@@ -1461,6 +1462,7 @@
+@@ -1488,6 +1489,7 @@
  
  stamp-${host_alias}:
  	@-mkdir -p ${host_builddir}
@@ -141,7 +141,7 @@ Index: b/src/libstdc++-v3/configure.ac
 ===================================================================
 --- a/src/libstdc++-v3/configure.ac
 +++ b/src/libstdc++-v3/configure.ac
-@@ -458,6 +458,16 @@
+@@ -460,6 +460,16 @@
    multilib_arg=
  fi
  
diff --git a/debian/patches/g++-multiarch-incdir.diff b/debian/patches/g++-multiarch-incdir.diff
index ce8b399..3040ed9 100644
--- a/debian/patches/g++-multiarch-incdir.diff
+++ b/debian/patches/g++-multiarch-incdir.diff
@@ -5,7 +5,7 @@ Index: b/src/libstdc++-v3/include/Makefile.am
 ===================================================================
 --- a/src/libstdc++-v3/include/Makefile.am
 +++ b/src/libstdc++-v3/include/Makefile.am
-@@ -827,7 +827,7 @@
+@@ -828,7 +828,7 @@
  host_srcdir = ${glibcxx_srcdir}/$(OS_INC_SRCDIR)
  default_host_alias = @default_host_alias@
  host_builddir = ./${default_host_alias}/bits
@@ -18,7 +18,7 @@ Index: b/src/libstdc++-v3/include/Makefile.in
 ===================================================================
 --- a/src/libstdc++-v3/include/Makefile.in
 +++ b/src/libstdc++-v3/include/Makefile.in
-@@ -1082,7 +1082,7 @@
+@@ -1105,7 +1105,7 @@
  host_srcdir = ${glibcxx_srcdir}/$(OS_INC_SRCDIR)
  default_host_alias = @default_host_alias@
  host_builddir = ./${default_host_alias}/bits
@@ -31,7 +31,7 @@ Index: b/src/gcc/Makefile.in
 ===================================================================
 --- a/src/gcc/Makefile.in
 +++ b/src/gcc/Makefile.in
-@@ -1103,6 +1103,7 @@
+@@ -1106,6 +1106,7 @@
  	"prefix=$(prefix)" \
  	"local_prefix=$(local_prefix)" \
  	"gxx_include_dir=$(gcc_gxx_include_dir)" \
@@ -39,7 +39,7 @@ Index: b/src/gcc/Makefile.in
  	"build_tooldir=$(build_tooldir)" \
  	"gcc_tooldir=$(gcc_tooldir)" \
  	"bindir=$(bindir)" \
-@@ -1539,6 +1540,14 @@
+@@ -1542,6 +1543,14 @@
  include $(xmake_file)
  endif
  
@@ -54,7 +54,7 @@ Index: b/src/gcc/Makefile.in
  # all-tree.def includes all the tree.def files.
  all-tree.def: s-alltree; @true
  s-alltree: Makefile
-@@ -3983,7 +3992,7 @@
+@@ -3986,7 +3995,7 @@
    -DFIXED_INCLUDE_DIR=\"$(libsubdir)/include-fixed\" \
    -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \
    -DGPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT=$(gcc_gxx_include_dir_add_sysroot) \
diff --git a/debian/patches/gcc-as-needed.diff b/debian/patches/gcc-as-needed.diff
index aecdee4..eace6eb 100644
--- a/debian/patches/gcc-as-needed.diff
+++ b/debian/patches/gcc-as-needed.diff
@@ -16,7 +16,7 @@ Index: b/src/gcc/config/ia64/linux.h
 ===================================================================
 --- a/src/gcc/config/ia64/linux.h
 +++ b/src/gcc/config/ia64/linux.h
-@@ -59,7 +59,7 @@
+@@ -58,7 +58,7 @@
  #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
  
  #undef LINK_SPEC
@@ -29,7 +29,7 @@ Index: b/src/gcc/config/sparc/linux.h
 ===================================================================
 --- a/src/gcc/config/sparc/linux.h
 +++ b/src/gcc/config/sparc/linux.h
-@@ -87,7 +87,7 @@
+@@ -86,7 +86,7 @@
  #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
  
  #undef  LINK_SPEC
@@ -42,7 +42,7 @@ Index: b/src/gcc/config/s390/linux.h
 ===================================================================
 --- a/src/gcc/config/s390/linux.h
 +++ b/src/gcc/config/s390/linux.h
-@@ -66,7 +66,7 @@
+@@ -65,7 +65,7 @@
  
  #undef  LINK_SPEC
  #define LINK_SPEC \
@@ -55,7 +55,7 @@ Index: b/src/gcc/config/rs6000/linux64.h
 ===================================================================
 --- a/src/gcc/config/rs6000/linux64.h
 +++ b/src/gcc/config/rs6000/linux64.h
-@@ -378,11 +378,11 @@
+@@ -377,11 +377,11 @@
    CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
  
  
@@ -86,7 +86,7 @@ Index: b/src/gcc/config/i386/gnu-user64.h
 ===================================================================
 --- a/src/gcc/config/i386/gnu-user64.h
 +++ b/src/gcc/config/i386/gnu-user64.h
-@@ -58,6 +58,7 @@
+@@ -57,6 +57,7 @@
                     %{" SPEC_32 ":-m " GNU_USER_LINK_EMULATION32 "} \
                     %{" SPEC_X32 ":-m " GNU_USER_LINK_EMULATIONX32 "} \
    --hash-style=gnu \
@@ -98,7 +98,7 @@ Index: b/src/gcc/config/i386/gnu-user.h
 ===================================================================
 --- a/src/gcc/config/i386/gnu-user.h
 +++ b/src/gcc/config/i386/gnu-user.h
-@@ -75,7 +75,7 @@
+@@ -74,7 +74,7 @@
    { "link_emulation", GNU_USER_LINK_EMULATION },\
    { "dynamic_linker", GNU_USER_DYNAMIC_LINKER }
  
@@ -111,7 +111,7 @@ Index: b/src/gcc/config/alpha/linux-elf.h
 ===================================================================
 --- a/src/gcc/config/alpha/linux-elf.h
 +++ b/src/gcc/config/alpha/linux-elf.h
-@@ -38,7 +38,7 @@
+@@ -37,7 +37,7 @@
  
  #define ELF_DYNAMIC_LINKER	GNU_USER_DYNAMIC_LINKER
  
@@ -124,7 +124,7 @@ Index: b/src/gcc/config/arm/linux-elf.h
 ===================================================================
 --- a/src/gcc/config/arm/linux-elf.h
 +++ b/src/gcc/config/arm/linux-elf.h
-@@ -70,6 +70,7 @@
+@@ -68,6 +68,7 @@
       -dynamic-linker " GNU_USER_DYNAMIC_LINKER "} \
     -X \
     --hash-style=gnu \
diff --git a/debian/patches/gcc-base-version.diff b/debian/patches/gcc-base-version.diff
index dbd99e8..f52635b 100644
--- a/debian/patches/gcc-base-version.diff
+++ b/debian/patches/gcc-base-version.diff
@@ -17,7 +17,7 @@ Index: b/src/gcc/Makefile.in
 ===================================================================
 --- a/src/gcc/Makefile.in
 +++ b/src/gcc/Makefile.in
-@@ -797,11 +797,13 @@
+@@ -795,11 +795,13 @@
  TM_H      = $(GTM_H) insn-flags.h $(OPTIONS_H)
  
  # Variables for version information.
@@ -32,7 +32,7 @@ Index: b/src/gcc/Makefile.in
  BASEVER_c   := $(shell cat $(BASEVER))
  DEVPHASE_c  := $(shell cat $(DEVPHASE))
  DATESTAMP_c := $(shell cat $(DATESTAMP))
-@@ -820,7 +822,7 @@
+@@ -818,7 +820,7 @@
  # development phase collapsed to the empty string in release mode
  # (i.e. if DEVPHASE_c is empty).  The space immediately after the
  # comma in the $(if ...) constructs is significant - do not remove it.
@@ -41,7 +41,7 @@ Index: b/src/gcc/Makefile.in
  DEVPHASE_s  := "\"$(if $(DEVPHASE_c), ($(DEVPHASE_c)))\""
  DATESTAMP_s := "\"$(if $(DEVPHASE_c), $(DATESTAMP_c))\""
  PKGVERSION_s:= "\"@PKGVERSION@\""
-@@ -2016,9 +2018,9 @@
+@@ -2020,9 +2022,9 @@
  		intl.h prefix.h coretypes.h $(TM_H) cppdefault.h $(TARGET_H) \
  		$(MACHMODE_H)
  
@@ -53,7 +53,7 @@ Index: b/src/gcc/Makefile.in
  
  # Language-independent files.
  
-@@ -2086,11 +2088,11 @@
+@@ -2090,11 +2092,11 @@
  
  dumpvers: dumpvers.c
  
@@ -67,7 +67,7 @@ Index: b/src/gcc/Makefile.in
  
  gtype-desc.o: gtype-desc.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
  	$(HASHTAB_H) $(SPLAY_TREE_H) $(OBSTACK_H) $(BITMAP_H) \
-@@ -2678,10 +2680,10 @@
+@@ -2679,10 +2681,10 @@
     coretypes.h $(INPUT_H) $(TM_H) $(COMMON_TARGET_H) common/common-targhooks.h
  
  bversion.h: s-bversion; @true
@@ -82,7 +82,7 @@ Index: b/src/gcc/Makefile.in
  	echo "#define BUILDING_GCC_VERSION (BUILDING_GCC_MAJOR * 1000 + BUILDING_GCC_MINOR)" >> bversion.h
  	$(STAMP) s-bversion
  
-@@ -3797,9 +3799,9 @@
+@@ -3798,9 +3800,9 @@
  ## build/version.o is compiled by the $(COMPILER_FOR_BUILD) but needs
  ## several C macro definitions, just like version.o
  build/version.o:  version.c version.h \
@@ -94,7 +94,7 @@ Index: b/src/gcc/Makefile.in
  	-DREVISION=$(REVISION_s) \
  	-DDEVPHASE=$(DEVPHASE_s) -DPKGVERSION=$(PKGVERSION_s) \
  	-DBUGURL=$(BUGURL_s) -o $@ $<
-@@ -3993,7 +3995,7 @@
+@@ -3994,7 +3996,7 @@
    -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc/\" \
    @TARGET_SYSTEM_ROOT_DEFINE@
  
@@ -103,7 +103,7 @@ Index: b/src/gcc/Makefile.in
  cppbuiltin.o: cppbuiltin.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
  	$(TARGET_H) $(TARGET_DEF) $(TREE_H) $(CPP_ID_DATA_H) \
  	cppbuiltin.h version.h Makefile
-@@ -4014,8 +4016,8 @@
+@@ -4015,8 +4017,8 @@
  		build/gcov-iov.o -o $@
  
  gcov-iov.h: s-iov
@@ -114,7 +114,7 @@ Index: b/src/gcc/Makefile.in
  	    > tmp-gcov-iov.h
  	$(SHELL) $(srcdir)/../move-if-change tmp-gcov-iov.h gcov-iov.h
  	$(STAMP) s-iov
-@@ -4280,8 +4282,8 @@
+@@ -4302,8 +4304,8 @@
  TEXI_CPPINT_FILES = cppinternals.texi gcc-common.texi gcc-vers.texi
  
  # gcc-vers.texi is generated from the version files.
@@ -125,7 +125,7 @@ Index: b/src/gcc/Makefile.in
  	 if [ "$(DEVPHASE_c)" = "experimental" ]; \
  	 then echo "@set DEVELOPMENT"; \
  	 else echo "@clear DEVELOPMENT"; \
-@@ -4660,9 +4662,11 @@
+@@ -4701,9 +4703,11 @@
  install-driver: installdirs xgcc$(exeext)
  	-rm -f $(DESTDIR)$(bindir)/$(GCC_INSTALL_NAME)$(exeext)
  	-$(INSTALL_PROGRAM) xgcc$(exeext) $(DESTDIR)$(bindir)/$(GCC_INSTALL_NAME)$(exeext)
@@ -154,7 +154,7 @@ Index: b/src/libjava/Makefile.in
 ===================================================================
 --- a/src/libjava/Makefile.in
 +++ b/src/libjava/Makefile.in
-@@ -12424,7 +12424,7 @@
+@@ -12426,7 +12426,7 @@
  @BUILD_ECJ1_TRUE@	mv $(DESTDIR)$(libexecsubdir)/`echo ecjx | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(libexecsubdir)/ecj1$(host_exeext)
  install-data-local:
  	$(PRE_INSTALL)
diff --git a/debian/patches/gcc-default-fortify-source.diff b/debian/patches/gcc-default-fortify-source.diff
index 1628a49..1d6437a 100644
--- a/debian/patches/gcc-default-fortify-source.diff
+++ b/debian/patches/gcc-default-fortify-source.diff
@@ -10,7 +10,7 @@ Index: b/src/gcc/doc/invoke.texi
 ===================================================================
 --- a/src/gcc/doc/invoke.texi
 +++ b/src/gcc/doc/invoke.texi
-@@ -6543,6 +6543,12 @@
+@@ -6561,6 +6561,12 @@
  Please note the warning under @option{-fgcse} about
  invoking @option{-O2} on programs that use computed gotos.
  
@@ -27,7 +27,7 @@ Index: b/src/gcc/c-family/c-cppbuiltin.c
 ===================================================================
 --- a/src/gcc/c-family/c-cppbuiltin.c
 +++ b/src/gcc/c-family/c-cppbuiltin.c
-@@ -854,6 +854,10 @@
+@@ -853,6 +853,10 @@
    builtin_define_with_value ("__REGISTER_PREFIX__", REGISTER_PREFIX, 0);
    builtin_define_with_value ("__USER_LABEL_PREFIX__", user_label_prefix, 0);
  
diff --git a/debian/patches/gcc-default-relro.diff b/debian/patches/gcc-default-relro.diff
index 8d1a7c3..da75e92 100644
--- a/debian/patches/gcc-default-relro.diff
+++ b/debian/patches/gcc-default-relro.diff
@@ -9,7 +9,7 @@ Index: b/src/gcc/doc/invoke.texi
 ===================================================================
 --- a/src/gcc/doc/invoke.texi
 +++ b/src/gcc/doc/invoke.texi
-@@ -10025,6 +10025,9 @@
+@@ -10049,6 +10049,9 @@
  linker.  When using the GNU linker, you can also get the same effect with
  @option{-Wl,-Map=output.map}.
  
@@ -23,11 +23,11 @@ Index: b/src/gcc/gcc.c
 ===================================================================
 --- a/src/gcc/gcc.c
 +++ b/src/gcc/gcc.c
-@@ -706,6 +706,7 @@
-     "%{flto|flto=*:%<fcompare-debug*} \
+@@ -741,6 +741,7 @@
+    "%{flto|flto=*:%<fcompare-debug*} \
      %{flto} %{flto=*} %l " LINK_PIE_SPEC \
     "%{fuse-ld=*:-fuse-ld=%*}\
 +   -z relro\
      %X %{o*} %{e*} %{N} %{n} %{r}\
      %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!nostartfiles:%S}}\
-     %{static:} %{L*} %(mfwrap) %(link_libgcc) %o\
+     %{static:} %{L*} %(mfwrap) %(link_libgcc) " SANITIZER_EARLY_SPEC " %o\
diff --git a/debian/patches/gcc-default-ssp.diff b/debian/patches/gcc-default-ssp.diff
index 48fb676..338eee5 100644
--- a/debian/patches/gcc-default-ssp.diff
+++ b/debian/patches/gcc-default-ssp.diff
@@ -14,7 +14,7 @@ Index: b/src/gcc/gcc.c
 ===================================================================
 --- a/src/gcc/gcc.c
 +++ b/src/gcc/gcc.c
-@@ -621,6 +621,14 @@
+@@ -654,6 +654,14 @@
  #define LINK_GCC_C_SEQUENCE_SPEC "%G %L %G"
  #endif
  
@@ -29,7 +29,7 @@ Index: b/src/gcc/gcc.c
  #ifndef LINK_SSP_SPEC
  #ifdef TARGET_LIBC_PROVIDES_SSP
  #define LINK_SSP_SPEC "%{fstack-protector:}"
-@@ -732,6 +740,7 @@
+@@ -780,6 +788,7 @@
  static const char *cc1plus_spec = CC1PLUS_SPEC;
  static const char *link_gcc_c_sequence_spec = LINK_GCC_C_SEQUENCE_SPEC;
  static const char *link_ssp_spec = LINK_SSP_SPEC;
@@ -37,7 +37,7 @@ Index: b/src/gcc/gcc.c
  static const char *asm_spec = ASM_SPEC;
  static const char *asm_final_spec = ASM_FINAL_SPEC;
  static const char *link_spec = LINK_SPEC;
-@@ -790,7 +799,7 @@
+@@ -838,7 +847,7 @@
  static const char *cpp_options =
  "%(cpp_unique_options) %1 %{m*} %{std*&ansi&trigraphs} %{W*&pedantic*} %{w}\
   %{f*} %{g*:%{!g0:%{g*} %{!fno-working-directory:-fworking-directory}}} %{O*}\
@@ -46,7 +46,7 @@ Index: b/src/gcc/gcc.c
  
  /* This contains cpp options which are not passed when the preprocessor
     output will be used by another program.  */
-@@ -969,9 +978,9 @@
+@@ -1018,9 +1027,9 @@
        %{save-temps*|traditional-cpp|no-integrated-cpp:%(trad_capable_cpp) \
  	  %(cpp_options) -o %{save-temps*:%b.i} %{!save-temps*:%g.i} \n\
  	    cc1 -fpreprocessed %{save-temps*:%b.i} %{!save-temps*:%g.i} \
@@ -58,7 +58,7 @@ Index: b/src/gcc/gcc.c
        %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 1},
    {"-",
     "%{!E:%e-E or -x required when input is from standard input}\
-@@ -994,7 +1003,7 @@
+@@ -1043,7 +1052,7 @@
                      %W{o*:--output-pch=%*}}%V}}}}}}", 0, 0, 0},
    {".i", "@cpp-output", 0, 0, 0},
    {"@cpp-output",
@@ -67,7 +67,7 @@ Index: b/src/gcc/gcc.c
    {".s", "@assembler", 0, 0, 0},
    {"@assembler",
     "%{!M:%{!MM:%{!E:%{!S:as %(asm_debug) %(asm_options) %i %A }}}}", 0, 0, 0},
-@@ -1221,6 +1230,7 @@
+@@ -1270,6 +1279,7 @@
    INIT_STATIC_SPEC ("cc1plus",			&cc1plus_spec),
    INIT_STATIC_SPEC ("link_gcc_c_sequence",	&link_gcc_c_sequence_spec),
    INIT_STATIC_SPEC ("link_ssp",			&link_ssp_spec),
@@ -79,7 +79,7 @@ Index: b/src/gcc/cp/lang-specs.h
 ===================================================================
 --- a/src/gcc/cp/lang-specs.h
 +++ b/src/gcc/cp/lang-specs.h
-@@ -47,7 +47,7 @@
+@@ -46,7 +46,7 @@
  		%(cpp_options) %2 -o %{save-temps*:%b.ii} %{!save-temps*:%g.ii} \n}\
        cc1plus %{save-temps*|no-integrated-cpp:-fpreprocessed %{save-temps*:%b.ii} %{!save-temps*:%g.ii}}\
  	      %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}\
@@ -88,7 +88,7 @@ Index: b/src/gcc/cp/lang-specs.h
  	%{!fsyntax-only:%{!fdump-ada-spec*:-o %g.s %{!o*:--output-pch=%i.gch}\
          %W{o*:--output-pch=%*}}%V}}}}",
       CPLUSPLUS_CPP_SPEC, 0, 0},
-@@ -58,11 +58,11 @@
+@@ -57,11 +57,11 @@
  		%(cpp_options) %2 -o %{save-temps*:%b.ii} %{!save-temps*:%g.ii} \n}\
        cc1plus %{save-temps*|no-integrated-cpp:-fpreprocessed %{save-temps*:%b.ii} %{!save-temps*:%g.ii}}\
  	      %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}\
@@ -106,7 +106,7 @@ Index: b/src/gcc/params.def
 ===================================================================
 --- a/src/gcc/params.def
 +++ b/src/gcc/params.def
-@@ -663,7 +663,7 @@
+@@ -662,7 +662,7 @@
  DEFPARAM (PARAM_SSP_BUFFER_SIZE,
  	  "ssp-buffer-size",
  	  "The lower bound for a buffer to be considered for stack smashing protection",
@@ -119,7 +119,7 @@ Index: b/src/gcc/objc/lang-specs.h
 ===================================================================
 --- a/src/gcc/objc/lang-specs.h
 +++ b/src/gcc/objc/lang-specs.h
-@@ -30,9 +30,9 @@
+@@ -29,9 +29,9 @@
  	%{traditional|traditional-cpp:\
  %eGNU Objective C no longer supports traditional compilation}\
  	%{save-temps*|no-integrated-cpp:cc1obj -E %(cpp_options) -o %{save-temps*:%b.mi} %{!save-temps*:%g.mi} \n\
@@ -131,7 +131,7 @@ Index: b/src/gcc/objc/lang-specs.h
          %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
    {"@objective-c-header",
       "%{E|M|MM:cc1obj -E %{traditional|traditional-cpp:-traditional-cpp}\
-@@ -41,18 +41,18 @@
+@@ -40,18 +40,18 @@
  	%{traditional|traditional-cpp:\
  %eGNU Objective C no longer supports traditional compilation}\
  	%{save-temps*|no-integrated-cpp:cc1obj -E %(cpp_options) -o %{save-temps*:%b.mi} %{!save-temps*:%g.mi} \n\
@@ -191,7 +191,7 @@ Index: b/src/gcc/doc/invoke.texi
 ===================================================================
 --- a/src/gcc/doc/invoke.texi
 +++ b/src/gcc/doc/invoke.texi
-@@ -8849,6 +8849,10 @@
+@@ -8877,6 +8877,10 @@
  when a function is entered and then checked when the function exits.
  If a guard check fails, an error message is printed and the program exits.
  
@@ -202,7 +202,7 @@ Index: b/src/gcc/doc/invoke.texi
  @item -fstack-protector-all
  @opindex fstack-protector-all
  Like @option{-fstack-protector} except that all functions are protected.
-@@ -9433,6 +9437,9 @@
+@@ -9461,6 +9465,9 @@
  The minimum size of buffers (i.e.@: arrays) that receive stack smashing
  protection when @option{-fstack-protection} is used.
  
diff --git a/debian/patches/gcc-driver-extra-langs.diff b/debian/patches/gcc-driver-extra-langs.diff
index 824ae3e..4cf1d59 100644
--- a/debian/patches/gcc-driver-extra-langs.diff
+++ b/debian/patches/gcc-driver-extra-langs.diff
@@ -9,10 +9,10 @@ Index: b/src/gcc/Makefile.in
 ===================================================================
 --- a/src/gcc/Makefile.in
 +++ b/src/gcc/Makefile.in
-@@ -521,8 +521,8 @@
- 		      dg-torture.exp,ieee.exp \
- 		      vect.exp,guality.exp,unsorted.exp \
- 		      struct-layout-1.exp,stackalign.exp,$(dg_target_exps)
+@@ -522,8 +522,8 @@
+ 		      guality.exp \
+ 		      struct-layout-1.exp,stackalign.exp \
+ 		      $(dg_target_exps)
 -lang_opt_files=@lang_opt_files@ $(srcdir)/c-family/c.opt $(srcdir)/common.opt
 -lang_specs_files=@lang_specs_files@
 +lang_opt_files=$(sort @lang_opt_files@ $(srcdir)/c-family/c.opt $(srcdir)/common.opt $(foreach lang,$(subst ada,ada/gcc-interface,$(debian_extra_langs)),$(srcdir)/$(lang)/lang.opt))
diff --git a/debian/patches/gcc-gfdl-build.diff b/debian/patches/gcc-gfdl-build.diff
index 2819864..13cf834 100644
--- a/debian/patches/gcc-gfdl-build.diff
+++ b/debian/patches/gcc-gfdl-build.diff
@@ -4,7 +4,7 @@ Index: b/src/gcc/Makefile.in
 ===================================================================
 --- a/src/gcc/Makefile.in
 +++ b/src/gcc/Makefile.in
-@@ -3677,30 +3677,8 @@
+@@ -3678,30 +3678,8 @@
  # \r is not portable to Solaris tr, therefore we have a special
  # case for ASCII.  We use \r for other encodings like EBCDIC.
  s-tm-texi: build/genhooks$(build_exeext) $(srcdir)/doc/tm.texi.in
diff --git a/debian/patches/gcc-hash-style-gnu.diff b/debian/patches/gcc-hash-style-gnu.diff
index 0819496..b7f656f 100644
--- a/debian/patches/gcc-hash-style-gnu.diff
+++ b/debian/patches/gcc-hash-style-gnu.diff
@@ -38,7 +38,7 @@ Index: b/src/gcc/config/alpha/linux-elf.h
 ===================================================================
 --- a/src/gcc/config/alpha/linux-elf.h
 +++ b/src/gcc/config/alpha/linux-elf.h
-@@ -38,7 +38,7 @@
+@@ -37,7 +37,7 @@
  
  #define ELF_DYNAMIC_LINKER	GNU_USER_DYNAMIC_LINKER
  
@@ -51,7 +51,7 @@ Index: b/src/gcc/config/ia64/linux.h
 ===================================================================
 --- a/src/gcc/config/ia64/linux.h
 +++ b/src/gcc/config/ia64/linux.h
-@@ -59,7 +59,7 @@
+@@ -58,7 +58,7 @@
  #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
  
  #undef LINK_SPEC
@@ -64,7 +64,7 @@ Index: b/src/gcc/config/rs6000/linux64.h
 ===================================================================
 --- a/src/gcc/config/rs6000/linux64.h
 +++ b/src/gcc/config/rs6000/linux64.h
-@@ -378,11 +378,11 @@
+@@ -377,11 +377,11 @@
    CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
  
  
@@ -95,7 +95,7 @@ Index: b/src/gcc/config/s390/linux.h
 ===================================================================
 --- a/src/gcc/config/s390/linux.h
 +++ b/src/gcc/config/s390/linux.h
-@@ -66,7 +66,7 @@
+@@ -65,7 +65,7 @@
  
  #undef  LINK_SPEC
  #define LINK_SPEC \
@@ -108,7 +108,7 @@ Index: b/src/gcc/config/sparc/linux.h
 ===================================================================
 --- a/src/gcc/config/sparc/linux.h
 +++ b/src/gcc/config/sparc/linux.h
-@@ -87,7 +87,7 @@
+@@ -86,7 +86,7 @@
  #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
  
  #undef  LINK_SPEC
@@ -121,7 +121,7 @@ Index: b/src/gcc/config/arm/linux-elf.h
 ===================================================================
 --- a/src/gcc/config/arm/linux-elf.h
 +++ b/src/gcc/config/arm/linux-elf.h
-@@ -69,6 +69,7 @@
+@@ -67,6 +67,7 @@
       %{rdynamic:-export-dynamic} \
       -dynamic-linker " GNU_USER_DYNAMIC_LINKER "} \
     -X \
@@ -133,7 +133,7 @@ Index: b/src/gcc/config/i386/gnu-user.h
 ===================================================================
 --- a/src/gcc/config/i386/gnu-user.h
 +++ b/src/gcc/config/i386/gnu-user.h
-@@ -75,7 +75,7 @@
+@@ -74,7 +74,7 @@
    { "link_emulation", GNU_USER_LINK_EMULATION },\
    { "dynamic_linker", GNU_USER_DYNAMIC_LINKER }
  
@@ -146,7 +146,7 @@ Index: b/src/gcc/config/i386/gnu-user64.h
 ===================================================================
 --- a/src/gcc/config/i386/gnu-user64.h
 +++ b/src/gcc/config/i386/gnu-user64.h
-@@ -57,6 +57,7 @@
+@@ -56,6 +56,7 @@
                    "%{" SPEC_64 ":-m " GNU_USER_LINK_EMULATION64 "} \
                     %{" SPEC_32 ":-m " GNU_USER_LINK_EMULATION32 "} \
                     %{" SPEC_X32 ":-m " GNU_USER_LINK_EMULATIONX32 "} \
@@ -158,7 +158,7 @@ Index: b/src/gcc/config/aarch64/aarch64-linux.h
 ===================================================================
 --- a/src/gcc/config/aarch64/aarch64-linux.h
 +++ b/src/gcc/config/aarch64/aarch64-linux.h
-@@ -32,6 +32,7 @@
+@@ -24,6 +24,7 @@
  #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64.so.1"
  
  #define LINUX_TARGET_LINK_SPEC  "%{h*}		\
diff --git a/debian/patches/gcc-ice-apport.diff b/debian/patches/gcc-ice-apport.diff
index 5631ca5..22a4fc9 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
-@@ -6119,6 +6119,16 @@
+@@ -6254,6 +6254,16 @@
  	      fnotice (stderr, "Preprocessed source stored into %s file,"
  			       " please attach this to your bugreport.\n",
  		       temp_filenames[attempt * 2]);
diff --git a/debian/patches/gcc-ice-hack.diff b/debian/patches/gcc-ice-hack.diff
index 1d7e495..4bb2f12 100644
--- a/debian/patches/gcc-ice-hack.diff
+++ b/debian/patches/gcc-ice-hack.diff
@@ -26,7 +26,7 @@ Index: b/src/gcc/gcc.c
 ===================================================================
 --- a/src/gcc/gcc.c
 +++ b/src/gcc/gcc.c
-@@ -252,6 +252,9 @@
+@@ -249,6 +249,9 @@
  #if defined(HAVE_TARGET_OBJECT_SUFFIX) || defined(HAVE_TARGET_EXECUTABLE_SUFFIX)
  static const char *convert_filename (const char *, int, int);
  #endif
@@ -36,7 +36,7 @@ Index: b/src/gcc/gcc.c
  
  static const char *getenv_spec_function (int, const char **);
  static const char *if_exists_spec_function (int, const char **);
-@@ -2726,7 +2729,7 @@
+@@ -2771,7 +2774,7 @@
  	    }
  	}
  
@@ -45,7 +45,7 @@ Index: b/src/gcc/gcc.c
  	free (CONST_CAST (char *, string));
      }
  
-@@ -2779,6 +2782,16 @@
+@@ -2824,6 +2827,16 @@
  	else if (WIFEXITED (status)
  		 && WEXITSTATUS (status) >= MIN_FATAL_STATUS)
  	  {
@@ -62,7 +62,7 @@ Index: b/src/gcc/gcc.c
  	    if (WEXITSTATUS (status) > greatest_status)
  	      greatest_status = WEXITSTATUS (status);
  	    ret_code = -1;
-@@ -2836,6 +2849,9 @@
+@@ -2881,6 +2894,9 @@
  	  }
        }
  
@@ -72,7 +72,7 @@ Index: b/src/gcc/gcc.c
      return ret_code;
    }
  }
-@@ -6001,6 +6017,227 @@
+@@ -6034,6 +6050,227 @@
    switches[switchnum].validated = true;
  }
  
@@ -304,7 +304,7 @@ Index: b/src/gcc/diagnostic.c
 ===================================================================
 --- a/src/gcc/diagnostic.c
 +++ b/src/gcc/diagnostic.c
-@@ -456,7 +456,7 @@
+@@ -455,7 +455,7 @@
  	real_abort ();
        diagnostic_finish (context);
        fnotice (stderr, "compilation terminated.\n");
diff --git a/debian/patches/gcc-multiarch.diff b/debian/patches/gcc-multiarch.diff
index 2161af2..ecade58 100644
--- a/debian/patches/gcc-multiarch.diff
+++ b/debian/patches/gcc-multiarch.diff
@@ -11,12 +11,11 @@ Index: b/src/gcc/config/sh/t-linux
  MULTILIB_MATCHES = 
 +
 +MULTILIB_OSDIRNAMES = sh4-linux-gnu:sh4-linux-gnu sh4_nofpu-linux-gnu:sh4-linux-gnu
-
 Index: b/src/gcc/config/sparc/t-linux64
 ===================================================================
 --- a/src/gcc/config/sparc/t-linux64
 +++ b/src/gcc/config/sparc/t-linux64
-@@ -28,3 +28,5 @@
+@@ -27,3 +27,5 @@
  MULTILIB_DIRNAMES = 64 32
  MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:sparc64-linux-gnu)
  MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:sparc-linux-gnu)
@@ -36,7 +35,7 @@ Index: b/src/gcc/config/rs6000/t-linux64
 ===================================================================
 --- a/src/gcc/config/rs6000/t-linux64
 +++ b/src/gcc/config/rs6000/t-linux64
-@@ -31,3 +31,5 @@
+@@ -30,3 +30,5 @@
  MULTILIB_EXTRA_OPTS     = fPIC
  MULTILIB_OSDIRNAMES	= ../lib64$(call if_multiarch,:powerpc64-linux-gnu)
  MULTILIB_OSDIRNAMES    += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu)
@@ -46,7 +45,7 @@ Index: b/src/gcc/config/i386/t-linux64
 ===================================================================
 --- a/src/gcc/config/i386/t-linux64
 +++ b/src/gcc/config/i386/t-linux64
-@@ -37,3 +37,13 @@
+@@ -36,3 +36,13 @@
  MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu)
  MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu)
  MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
@@ -92,7 +91,7 @@ Index: b/src/gcc/config.gcc
 ===================================================================
 --- a/src/gcc/config.gcc
 +++ b/src/gcc/config.gcc
-@@ -3668,7 +3668,7 @@
+@@ -3703,7 +3703,7 @@
  	i[34567]86-*-darwin* | x86_64-*-darwin*)
  		;;
  	i[34567]86-*-linux* | x86_64-*-linux*)
diff --git a/debian/patches/gcc-sysroot.diff b/debian/patches/gcc-sysroot.diff
index 82a9c28..f337509 100644
--- a/debian/patches/gcc-sysroot.diff
+++ b/debian/patches/gcc-sysroot.diff
@@ -4,7 +4,7 @@ Index: b/src/gcc/configure.ac
 ===================================================================
 --- a/src/gcc/configure.ac
 +++ b/src/gcc/configure.ac
-@@ -118,6 +118,69 @@
+@@ -117,6 +117,69 @@
  	local_prefix=/usr/local
  fi
  
@@ -74,7 +74,7 @@ Index: b/src/gcc/configure.ac
  # Don't set gcc_gxx_include_dir to gxx_include_dir since that's only
  # passed in by the toplevel make and thus we'd get different behavior
  # depending on where we built the sources.
-@@ -149,7 +212,9 @@
+@@ -148,7 +211,9 @@
  if test "${with_sysroot+set}" = set; then
    gcc_gxx_without_sysroot=`expr "${gcc_gxx_include_dir}" : "${with_sysroot}"'\(.*\)'`
    if test "${gcc_gxx_without_sysroot}"; then
@@ -85,7 +85,7 @@ Index: b/src/gcc/configure.ac
      gcc_gxx_include_dir_add_sysroot=1
    fi
  fi
-@@ -740,69 +805,6 @@
+@@ -742,69 +807,6 @@
  ], [enable_shared=yes])
  AC_SUBST(enable_shared)
  
diff --git a/debian/patches/gcc-target-include-asm.diff b/debian/patches/gcc-target-include-asm.diff
index dd53ec6..b68d3ff 100644
--- a/debian/patches/gcc-target-include-asm.diff
+++ b/debian/patches/gcc-target-include-asm.diff
@@ -1,8 +1,10 @@
 # DP: Search $(builddir)/sys-include for the asm header files
 
+Index: b/src/configure.ac
+===================================================================
 --- a/src/configure.ac
 +++ b/src/configure.ac
-@@ -2936,7 +2936,7 @@
+@@ -2964,7 +2964,7 @@
  # being built; programs in there won't even run.
  if test "${build}" = "${host}" && test -d ${srcdir}/gcc; then
    # Search for pre-installed headers if nothing else fits.
diff --git a/debian/patches/gcc-textdomain.diff b/debian/patches/gcc-textdomain.diff
index be497f4..06fce4a 100644
--- a/debian/patches/gcc-textdomain.diff
+++ b/debian/patches/gcc-textdomain.diff
@@ -4,7 +4,7 @@ Index: b/src/gcc/intl.c
 ===================================================================
 --- a/src/gcc/intl.c
 +++ b/src/gcc/intl.c
-@@ -56,8 +56,8 @@
+@@ -55,8 +55,8 @@
    setlocale (LC_ALL, "");
  #endif
  
@@ -19,7 +19,7 @@ Index: b/src/gcc/Makefile.in
 ===================================================================
 --- a/src/gcc/Makefile.in
 +++ b/src/gcc/Makefile.in
-@@ -5244,8 +5244,8 @@
+@@ -5304,8 +5304,8 @@
  	  dir=$(localedir)/$$lang/LC_MESSAGES; \
  	  echo $(mkinstalldirs) $(DESTDIR)$$dir; \
  	  $(mkinstalldirs) $(DESTDIR)$$dir || exit 1; \
@@ -34,7 +34,7 @@ Index: b/src/libcpp/init.c
 ===================================================================
 --- a/src/libcpp/init.c
 +++ b/src/libcpp/init.c
-@@ -146,7 +146,7 @@
+@@ -144,7 +144,7 @@
        init_trigraph_map ();
  
  #ifdef ENABLE_NLS
@@ -47,7 +47,7 @@ Index: b/src/libcpp/system.h
 ===================================================================
 --- a/src/libcpp/system.h
 +++ b/src/libcpp/system.h
-@@ -281,7 +281,7 @@
+@@ -280,7 +280,7 @@
  #endif
  
  #ifndef _
diff --git a/debian/patches/gccgo-version.diff b/debian/patches/gccgo-version.diff
index 8662eb9..6946679 100644
--- a/debian/patches/gccgo-version.diff
+++ b/debian/patches/gccgo-version.diff
@@ -4,7 +4,7 @@ Index: b/src/gcc/go/Make-lang.in
 ===================================================================
 --- a/src/gcc/go/Make-lang.in
 +++ b/src/gcc/go/Make-lang.in
-@@ -243,7 +243,9 @@
+@@ -244,7 +244,9 @@
  	$(TM_H) $(RTL_H) $(TREE_H) $(TM_P_H) output.h $(TARGET_H) \
  	$(COMMON_TARGET_H)
  
@@ -19,7 +19,7 @@ Index: b/src/libgo/Makefile.in
 ===================================================================
 --- a/src/libgo/Makefile.in
 +++ b/src/libgo/Makefile.in
-@@ -427,14 +427,14 @@
+@@ -431,14 +431,14 @@
  SUFFIXES = .c .go .gox .o .obj .lo .a
  @LIBGO_IS_RTEMS_TRUE@subdirs = testsuite
  SUBDIRS = ${subdirs}
diff --git a/debian/patches/libgo-testsuite.diff b/debian/patches/libgo-testsuite.diff
index 4722ec0..c2a9156 100644
--- a/debian/patches/libgo-testsuite.diff
+++ b/debian/patches/libgo-testsuite.diff
@@ -1,8 +1,10 @@
 # DP: Only run the libgo testsuite for flags configured in RUNTESTFLAGS
 
+Index: b/src/libgo/Makefile.am
+===================================================================
 --- a/src/libgo/Makefile.am
 +++ b/src/libgo/Makefile.am
-@@ -2009,6 +2009,12 @@
+@@ -2024,6 +2024,12 @@
  	export LD_LIBRARY_PATH; \
  	$(MKDIR_P) $(@D); \
  	rm -f $@-testsum $@-testlog; \
@@ -15,7 +17,7 @@
  	if test "$(USE_DEJAGNU)" = "yes"; then \
  	  $(SHELL) $(srcdir)/testsuite/gotest --dejagnu=yes --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --pkgpath="$(@D)" --pkgfiles="$(go_$(subst /,_,$(@D))_files)" --testname="$(@D)" --goarch="$(GOARCH)" $(GOTESTFLAGS) $(go_$(subst /,_,$(@D))_test_files); \
  	else \
-@@ -2022,6 +2028,7 @@
+@@ -2037,6 +2043,7 @@
  	    echo "FAIL: $(@D)" > $@-testsum; \
  	    exit 1; \
  	  fi; \
@@ -23,9 +25,11 @@
  	fi
  
  # Build all packages before checking any.
+Index: b/src/libgo/Makefile.in
+===================================================================
 --- a/src/libgo/Makefile.in
 +++ b/src/libgo/Makefile.in
-@@ -2126,6 +2126,12 @@
+@@ -2131,6 +2131,12 @@
  	export LD_LIBRARY_PATH; \
  	$(MKDIR_P) $(@D); \
  	rm -f $@-testsum $@-testlog; \
@@ -38,7 +42,7 @@
  	if test "$(USE_DEJAGNU)" = "yes"; then \
  	  $(SHELL) $(srcdir)/testsuite/gotest --dejagnu=yes --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --pkgpath="$(@D)" --pkgfiles="$(go_$(subst /,_,$(@D))_files)" --testname="$(@D)" --goarch="$(GOARCH)" $(GOTESTFLAGS) $(go_$(subst /,_,$(@D))_test_files); \
  	else \
-@@ -2139,6 +2145,7 @@
+@@ -2144,6 +2150,7 @@
  	    echo "FAIL: $(@D)" > $@-testsum; \
  	    exit 1; \
  	  fi; \
diff --git a/debian/patches/libjava-disable-plugin.diff b/debian/patches/libjava-disable-plugin.diff
index 7dbcaa6..75f189a 100644
--- a/debian/patches/libjava-disable-plugin.diff
+++ b/debian/patches/libjava-disable-plugin.diff
@@ -1,8 +1,10 @@
 # DP: Don't build the gcjwebplugin, even when configured with --enable-plugin
 
+Index: b/src/libjava/configure.ac
+===================================================================
 --- a/src/libjava/configure.ac
 +++ b/src/libjava/configure.ac
-@@ -65,6 +65,8 @@
+@@ -67,6 +67,8 @@
       esac],
      [browser_plugin_enabled=no]
  )
diff --git a/debian/patches/libjava-fixed-symlinks.diff b/debian/patches/libjava-fixed-symlinks.diff
index 21a4e1a..879692e 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
-@@ -831,7 +831,7 @@
+@@ -828,7 +828,7 @@
  	$(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
-@@ -12472,7 +12472,7 @@
+@@ -12475,7 +12475,7 @@
  @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/libjava-jnipath.diff b/debian/patches/libjava-jnipath.diff
index eacf905..37f0360 100644
--- a/debian/patches/libjava-jnipath.diff
+++ b/debian/patches/libjava-jnipath.diff
@@ -6,7 +6,7 @@ Index: b/src/libjava/configure.ac
 ===================================================================
 --- a/src/libjava/configure.ac
 +++ b/src/libjava/configure.ac
-@@ -1523,6 +1523,9 @@
+@@ -1525,6 +1525,9 @@
  
  AC_C_BIGENDIAN
  
@@ -32,7 +32,7 @@ Index: b/src/libjava/Makefile.in
 ===================================================================
 --- a/src/libjava/Makefile.in
 +++ b/src/libjava/Makefile.in
-@@ -628,6 +628,7 @@
+@@ -631,6 +631,7 @@
  MAKE = @MAKE@
  MAKEINFO = @MAKEINFO@
  MKDIR_P = @MKDIR_P@
@@ -40,7 +40,7 @@ Index: b/src/libjava/Makefile.in
  NM = nm
  NMEDIT = @NMEDIT@
  OBJDUMP = @OBJDUMP@
-@@ -1010,6 +1011,7 @@
+@@ -1013,6 +1014,7 @@
  	$(WARNINGS) \
  	-D_GNU_SOURCE \
  	-DPREFIX="\"$(prefix)\"" \
diff --git a/debian/patches/libjava-multiarch.diff b/debian/patches/libjava-multiarch.diff
index cee02b2..54db5df 100644
--- a/debian/patches/libjava-multiarch.diff
+++ b/debian/patches/libjava-multiarch.diff
@@ -4,7 +4,7 @@ Index: b/src/libjava/configure.ac
 ===================================================================
 --- a/src/libjava/configure.ac
 +++ b/src/libjava/configure.ac
-@@ -1583,6 +1583,10 @@
+@@ -1585,6 +1585,10 @@
        .) toolexeclibdir=$toolexecmainlibdir ;; # Avoid trailing /.
        *) toolexeclibdir=$toolexecmainlibdir/$multi_os_directory ;;
      esac
@@ -15,7 +15,7 @@ Index: b/src/libjava/configure.ac
      ;;
  esac
  AC_SUBST(toolexecdir)
-@@ -1608,6 +1612,10 @@
+@@ -1610,6 +1614,10 @@
     dbexecdir='$(libdir)/'$multi_os_directory/$gcjsubdir
     ;;
  esac
@@ -43,7 +43,7 @@ Index: b/src/libjava/Makefile.in
 ===================================================================
 --- a/src/libjava/Makefile.in
 +++ b/src/libjava/Makefile.in
-@@ -1020,7 +1020,7 @@
+@@ -1023,7 +1023,7 @@
  	-DGCJ_VERSIONED_LIBDIR="\"$(dbexecdir)\"" \
  	-DPATH_SEPARATOR="\"$(CLASSPATH_SEPARATOR)\"" \
  	-DECJ_JAR_FILE="\"$(ECJ_JAR)\"" \
@@ -56,7 +56,7 @@ Index: b/src/libjava/classpath/m4/acinclude.m4
 ===================================================================
 --- a/src/libjava/classpath/m4/acinclude.m4
 +++ b/src/libjava/classpath/m4/acinclude.m4
-@@ -252,6 +252,10 @@
+@@ -254,6 +254,10 @@
      .) toolexeclibdir=${libdir} ;; # Avoid trailing /.
      *) toolexeclibdir=${libdir}/${multi_os_directory} ;;
    esac
diff --git a/debian/patches/libmudflap-x32.diff b/debian/patches/libmudflap-x32.diff
index 6f2b82b..cadbefa 100644
--- a/debian/patches/libmudflap-x32.diff
+++ b/debian/patches/libmudflap-x32.diff
@@ -1,8 +1,10 @@
 # DP: Fix libmudflap build failure for x32 multilibs
 
+Index: b/src/libmudflap/mf-runtime.c
+===================================================================
 --- a/src/libmudflap/mf-runtime.c
 +++ b/src/libmudflap/mf-runtime.c
-@@ -165,7 +165,7 @@
+@@ -164,7 +164,7 @@
  #define LOOKUP_CACHE_SHIFT_DFL 2
  
  struct __mf_cache __mf_lookup_cache [LOOKUP_CACHE_SIZE_MAX];
diff --git a/debian/patches/libstdc++-arm-wno-abi.diff b/debian/patches/libstdc++-arm-wno-abi.diff
index 50556b6..c46c900 100644
--- a/debian/patches/libstdc++-arm-wno-abi.diff
+++ b/debian/patches/libstdc++-arm-wno-abi.diff
@@ -5,7 +5,7 @@ Index: b/src/libstdc++-v3/testsuite/lib/libstdc++.exp
 ===================================================================
 --- a/src/libstdc++-v3/testsuite/lib/libstdc++.exp
 +++ b/src/libstdc++-v3/testsuite/lib/libstdc++.exp
-@@ -290,6 +290,10 @@
+@@ -288,6 +288,10 @@
      }
      append cxxflags " "
      append cxxflags [getenv CXXFLAGS]
diff --git a/debian/patches/libstdc++-doclink.diff b/debian/patches/libstdc++-doclink.diff
index 0467e17..f626fad 100644
--- a/debian/patches/libstdc++-doclink.diff
+++ b/debian/patches/libstdc++-doclink.diff
@@ -36,14 +36,14 @@ Index: b/src/libstdc++-v3/doc/html/api.html
 ===================================================================
 --- a/src/libstdc++-v3/doc/html/api.html
 +++ b/src/libstdc++-v3/doc/html/api.html
-@@ -19,6 +19,8 @@
+@@ -18,6 +18,8 @@
    member functions for the library classes, finding out what is in a
    particular include file, looking at inheritance diagrams, etc.
  </p><p>
 +<a class="ulink" href="index.html"The API documentation, rendered into HTML, can be viewed offline.</a>
 +</p><p>
    The API documentation, rendered into HTML, can be viewed online:
- </p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>
+ </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>
        <a class="link" href="http://gcc.gnu.org/onlinedocs/libstdc++/libstdc++-html-USERS-3.4/index.html" target="_top">for the 3.4 release
 Index: b/src/libstdc++-v3/doc/xml/api.xml
 ===================================================================
diff --git a/debian/patches/libstdc++-man-3cxx.diff b/debian/patches/libstdc++-man-3cxx.diff
index 4549652..57bb8a6 100644
--- a/debian/patches/libstdc++-man-3cxx.diff
+++ b/debian/patches/libstdc++-man-3cxx.diff
@@ -4,7 +4,7 @@ Index: b/src/libstdc++-v3/doc/doxygen/user.cfg.in
 ===================================================================
 --- a/src/libstdc++-v3/doc/doxygen/user.cfg.in
 +++ b/src/libstdc++-v3/doc/doxygen/user.cfg.in
-@@ -1557,7 +1557,7 @@
+@@ -1618,7 +1618,7 @@
  # The MAN_EXTENSION tag determines the extension that is added to
  # the generated man pages (default is the subroutine's section .3)
  
@@ -17,7 +17,7 @@ Index: b/src/libstdc++-v3/scripts/run_doxygen
 ===================================================================
 --- a/src/libstdc++-v3/scripts/run_doxygen
 +++ b/src/libstdc++-v3/scripts/run_doxygen
-@@ -235,6 +235,9 @@
+@@ -236,6 +236,9 @@
  if $do_man; then
  echo ::
  echo :: Fixing up the man pages...
@@ -27,7 +27,7 @@ Index: b/src/libstdc++-v3/scripts/run_doxygen
  cd $outdir/man/man3
  
  # File names with embedded spaces (EVIL!) need to be....?  renamed or removed?
-@@ -256,7 +259,7 @@
+@@ -257,7 +260,7 @@
  # and I'm off getting coffee then anyhow, so I didn't care enough to make
  # this super-fast.
  g++ ${srcdir}/doc/doxygen/stdheader.cc -o ./stdheader
@@ -36,7 +36,7 @@ Index: b/src/libstdc++-v3/scripts/run_doxygen
  for f in $problematic; do
      # this is also slow, but safe and easy to debug
      oldh=`sed -n '/fC#include </s/.*<\(.*\)>.*/\1/p' $f`
-@@ -269,7 +272,7 @@
+@@ -270,7 +273,7 @@
  # Some of the pages for generated modules have text that confuses certain
  # implementations of man(1), e.g. on GNU/Linux.  We need to have another
  # top-level *roff tag to /stop/ the .SH NAME entry.
@@ -45,7 +45,7 @@ Index: b/src/libstdc++-v3/scripts/run_doxygen
  #problematic='Containers.3 Sequences.3 Assoc_containers.3 Iterator_types.3'
  
  for f in $problematic; do
-@@ -283,7 +286,7 @@
+@@ -284,7 +287,7 @@
  done
  
  # Also, break this (generated) line up.  It's ugly as sin.
@@ -54,7 +54,7 @@ Index: b/src/libstdc++-v3/scripts/run_doxygen
  for f in $problematic; do
      sed 's/Definition at line/\
  .PP\
-@@ -383,8 +386,8 @@
+@@ -384,8 +387,8 @@
  	 istringstream ostringstream stringstream filebuf ifstream \
  	 ofstream fstream string;
  do
diff --git a/debian/patches/libstdc++-pic.diff b/debian/patches/libstdc++-pic.diff
index 9b104d6..f94cfbb 100644
--- a/debian/patches/libstdc++-pic.diff
+++ b/debian/patches/libstdc++-pic.diff
@@ -4,7 +4,7 @@ Index: b/src/libstdc++-v3/src/Makefile.am
 ===================================================================
 --- a/src/libstdc++-v3/src/Makefile.am
 +++ b/src/libstdc++-v3/src/Makefile.am
-@@ -269,10 +269,12 @@
+@@ -267,10 +267,12 @@
  STAMP_DEBUG = build-debug
  STAMP_INSTALL_DEBUG = install-debug
  CLEAN_DEBUG = debug
@@ -17,7 +17,7 @@ Index: b/src/libstdc++-v3/src/Makefile.am
  endif
  
  # Build a debug variant.
-@@ -307,6 +309,7 @@
+@@ -305,6 +307,7 @@
  	  mv Makefile Makefile.tmp; \
  	  sed -e 's,all-local: all-once,all-local:,' \
  	      -e 's,install-data-local: install-data-once,install-data-local:,' \
@@ -25,7 +25,7 @@ Index: b/src/libstdc++-v3/src/Makefile.am
  	      -e '/vpath/!s,src/c,src/debug/c,' \
  	  < Makefile.tmp > Makefile ; \
  	  rm -f Makefile.tmp ; \
-@@ -317,3 +320,8 @@
+@@ -315,3 +318,8 @@
  install-debug: build-debug
  	(cd ${debugdir} && $(MAKE) CXXFLAGS='$(DEBUG_FLAGS)' \
  	toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install) ;
diff --git a/debian/patches/libstdc++-test-installed.diff b/debian/patches/libstdc++-test-installed.diff
index 7784cfc..69bfbe2 100644
--- a/debian/patches/libstdc++-test-installed.diff
+++ b/debian/patches/libstdc++-test-installed.diff
@@ -5,7 +5,7 @@ Index: b/src/libstdc++-v3/testsuite/lib/libstdc++.exp
 ===================================================================
 --- a/src/libstdc++-v3/testsuite/lib/libstdc++.exp
 +++ b/src/libstdc++-v3/testsuite/lib/libstdc++.exp
-@@ -39,6 +39,12 @@
+@@ -37,6 +37,12 @@
  # the last thing before testing begins.  This can be defined in, e.g.,
  # ~/.dejagnurc or $DEJAGNU.
  
@@ -18,7 +18,7 @@ Index: b/src/libstdc++-v3/testsuite/lib/libstdc++.exp
  proc load_gcc_lib { filename } {
      global srcdir
      load_file $srcdir/../../gcc/testsuite/lib/$filename
-@@ -95,6 +101,7 @@
+@@ -93,6 +99,7 @@
      global tool_timeout
      global DEFAULT_CXXFLAGS
      global STATIC_LIBCXXFLAGS
@@ -26,7 +26,7 @@ Index: b/src/libstdc++-v3/testsuite/lib/libstdc++.exp
  
      # We set LC_ALL and LANG to C so that we get the same error
      # messages as expected.
-@@ -110,6 +117,9 @@
+@@ -108,6 +115,9 @@
  
      set blddir [lookfor_file [get_multilibs] libstdc++-v3]
      set flags_file "${blddir}/scripts/testsuite_flags"
@@ -36,7 +36,7 @@ Index: b/src/libstdc++-v3/testsuite/lib/libstdc++.exp
      set shlib_ext [get_shlib_extension]
      v3track flags_file 2
  
-@@ -141,7 +151,11 @@
+@@ -139,7 +149,11 @@
  
      # Locate libgcc.a so we don't need to account for different values of
      # SHLIB_EXT on different platforms
@@ -49,7 +49,7 @@ Index: b/src/libstdc++-v3/testsuite/lib/libstdc++.exp
      if {$gccdir != ""} {
          set gccdir [file dirname $gccdir]
  	append ld_library_path_tmp ":${gccdir}"
-@@ -150,7 +164,11 @@
+@@ -148,7 +162,11 @@
  
      # Locate libgomp. This is only required for parallel mode.
      set v3-libgomp 0
@@ -62,7 +62,7 @@ Index: b/src/libstdc++-v3/testsuite/lib/libstdc++.exp
      if {$libgompdir != ""} {
  	set v3-libgomp 1
          set libgompdir [file dirname $libgompdir]
-@@ -161,7 +179,12 @@
+@@ -159,7 +177,12 @@
  
      # Locate libstdc++ shared library. (ie libstdc++.so.)
      set v3-sharedlib 0
diff --git a/debian/patches/mips-fix-loongson2f-nop.diff b/debian/patches/mips-fix-loongson2f-nop.diff
index 5c53896..a15ca38 100644
--- a/debian/patches/mips-fix-loongson2f-nop.diff
+++ b/debian/patches/mips-fix-loongson2f-nop.diff
@@ -5,7 +5,7 @@ Index: b/src/gcc/config/mips/mips.h
 ===================================================================
 --- a/src/gcc/config/mips/mips.h
 +++ b/src/gcc/config/mips/mips.h
-@@ -1143,6 +1143,7 @@
+@@ -1140,6 +1140,7 @@
  %{mshared} %{mno-shared} \
  %{msym32} %{mno-sym32} \
  %{mtune=*} \
diff --git a/debian/patches/mudflapth-link.diff b/debian/patches/mudflapth-link.diff
index 733c1c1..d68799e 100644
--- a/debian/patches/mudflapth-link.diff
+++ b/debian/patches/mudflapth-link.diff
@@ -1,8 +1,10 @@
 # DP: Link libmudflapth.so with -lpthread
 
+Index: b/src/libmudflap/Makefile.am
+===================================================================
 --- a/src/libmudflap/Makefile.am
 +++ b/src/libmudflap/Makefile.am
-@@ -44,7 +44,7 @@
+@@ -43,7 +43,7 @@
  	mf-hooks2.c \
  	mf-hooks3.c
  libmudflapth_la_CFLAGS = -DLIBMUDFLAPTH
@@ -11,6 +13,8 @@
  libmudflapth_la_DEPENDENCIES = $(libmudflapth_la_LIBADD)
  libmudflapth_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version`
  
+Index: b/src/libmudflap/Makefile.in
+===================================================================
 --- a/src/libmudflap/Makefile.in
 +++ b/src/libmudflap/Makefile.in
 @@ -288,7 +288,7 @@
diff --git a/debian/patches/pr45078.diff b/debian/patches/pr45078.diff
index 0b7a770..cc7def2 100644
--- a/debian/patches/pr45078.diff
+++ b/debian/patches/pr45078.diff
@@ -1,36 +1,58 @@
 # DP: Proposed patch for PR plugin/45078
 
-2011-06-24  Matthias Klose  <doko@ubuntu.com>
+2013-03-06  Jakub Jelinek  <jakub@redhat.com>
 
-	PR plugin/45078
-	* Makefile.in (PLUGIN_HEADERS): Add config/arm/arm-cores.def.
-	(install-plugin): Install c-family headers into a c-family subdir.
-	* config.gcc: Add vxworks-dummy.h to tm_file for arm, mips, sh and
-	sparc targets.
+	PR plugins/45078
+	* config.gcc: On arm, mips, sh and sparc add vxworks-dummy.h to
+	tm_file.
 
-Index: b/src/gcc/Makefile.in
-===================================================================
---- a/src/gcc/Makefile.in
-+++ b/src/gcc/Makefile.in
-@@ -4563,6 +4563,7 @@
-   $(C_PRAGMA_H)  $(CPPLIB_H)  $(FUNCTION_H) \
-   cppdefault.h flags.h $(MD5_H) params.def params.h prefix.h tree-inline.h \
-   $(GIMPLE_PRETTY_PRINT_H) realmpfr.h \
-+  config/arm/arm-cores.def \
-   $(IPA_PROP_H) $(RTL_H) $(TM_P_H) $(CFGLOOP_H) $(EMIT_RTL_H) version.h
- 
- # generate the 'build fragment' b-header-vars
-Index: b/src/gcc/config.gcc
-===================================================================
---- a/src/gcc/config.gcc
-+++ b/src/gcc/config.gcc
-@@ -537,6 +537,9 @@
+--- a/src/gcc/config.gcc.jj	2013-02-22 17:04:41.000000000 +0100
++++ b/src/gcc/config.gcc	2013-03-06 13:38:19.711201446 +0100
+@@ -536,6 +536,9 @@ x86_64-*-*)
  	fi
  	tm_file="vxworks-dummy.h ${tm_file}"
  	;;
-+arm*-*-*|mips*-*-*|sh*-*-*|sparc*-*-*)
++arm*-*-* | mips*-*-* | sh*-*-* | sparc*-*-*)
 +	tm_file="vxworks-dummy.h ${tm_file}"
 +	;;
  esac
  
  # On a.out targets, we need to use collect2.
+@@ -861,7 +864,7 @@ arm-wrs-vxworks)
+ 	tmake_file="${tmake_file} arm/t-arm arm/t-vxworks"
+ 	;;
+ arm*-*-netbsdelf*)
+-	tm_file="dbxelf.h elfos.h netbsd.h netbsd-elf.h arm/elf.h arm/aout.h arm/arm.h arm/netbsd-elf.h"
++	tm_file="dbxelf.h elfos.h netbsd.h netbsd-elf.h arm/elf.h arm/aout.h ${tm_file} arm/netbsd-elf.h"
+ 	extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
+ 	tmake_file="${tmake_file} arm/t-arm"
+ 	;;
+@@ -873,7 +876,7 @@ arm*-*-linux-*)			# ARM GNU/Linux with E
+ 	    ;;
+ 	esac
+ 	tmake_file="${tmake_file} arm/t-arm arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi"
+-	tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h arm/aout.h arm/arm.h"
++	tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h arm/aout.h vxworks-dummy.h arm/arm.h"
+ 	# Define multilib configuration for arm-linux-androideabi.
+ 	case ${target} in
+ 	*-androideabi)
+@@ -891,7 +894,7 @@ arm*-*-linux-*)			# ARM GNU/Linux with E
+ arm*-*-uclinux*eabi*)		# ARM ucLinux
+ 	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/linux-gas.h arm/uclinux-elf.h glibc-stdint.h"
+ 	tmake_file="arm/t-arm arm/t-arm-elf arm/t-bpabi"
+-	tm_file="$tm_file arm/bpabi.h arm/uclinux-eabi.h arm/aout.h arm/arm.h"
++	tm_file="$tm_file arm/bpabi.h arm/uclinux-eabi.h arm/aout.h vxworks-dummy.h arm/arm.h"
+ 	# The BPABI long long divmod functions return a 128-bit value in
+ 	# registers r0-r3.  Correctly modeling that requires the use of
+ 	# TImode.
+@@ -928,7 +931,7 @@ arm*-*-eabi* | arm*-*-symbianelf* | arm*
+ 	  tmake_file="${tmake_file} arm/t-symbian"
+ 	  ;;
+ 	esac
+-	tm_file="${tm_file} arm/aout.h arm/arm.h"
++	tm_file="${tm_file} arm/aout.h vxworks-dummy.h arm/arm.h"
+ 	;;
+ avr-*-rtems*)
+ 	tm_file="elfos.h avr/elf.h avr/avr-arch.h avr/avr.h dbxelf.h avr/rtems.h rtems.h newlib-stdint.h"
+
+
diff --git a/debian/patches/pr47818.diff b/debian/patches/pr47818.diff
index 3f70783..d4fd6d2 100644
--- a/debian/patches/pr47818.diff
+++ b/debian/patches/pr47818.diff
@@ -4,7 +4,7 @@ Index: b/src/gcc/ada/sem_prag.adb
 ===================================================================
 --- a/src/gcc/ada/sem_prag.adb
 +++ b/src/gcc/ada/sem_prag.adb
-@@ -7321,7 +7321,16 @@
+@@ -7831,7 +7831,16 @@
              --  Set True if category of assertions referenced by Name enabled
  
           begin
diff --git a/debian/patches/pr49944.diff b/debian/patches/pr49944.diff
index 3eb176c..ad728da 100644
--- a/debian/patches/pr49944.diff
+++ b/debian/patches/pr49944.diff
@@ -174,7 +174,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
-@@ -1213,9 +1213,7 @@
+@@ -1224,9 +1224,7 @@
    s-osinte.adb<s-osinte-posix.adb \
    s-osinte.ads<s-osinte-kfreebsd-gnu.ads \
    s-osprim.adb<s-osprim-posix.adb \
@@ -185,7 +185,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
    s-taspri.ads<s-taspri-posix.ads \
    s-tpopsp.adb<s-tpopsp-posix-foreign.adb \
    $(ATOMICS_TARGET_PAIRS) \
-@@ -1246,9 +1244,7 @@
+@@ -1257,9 +1255,7 @@
    s-osinte.adb<s-osinte-posix.adb \
    s-osinte.ads<s-osinte-kfreebsd-gnu.ads \
    s-osprim.adb<s-osprim-posix.adb \
diff --git a/debian/patches/rename-info-files.diff b/debian/patches/rename-info-files.diff
index 6415496..9518269 100644
--- a/debian/patches/rename-info-files.diff
+++ b/debian/patches/rename-info-files.diff
@@ -48,7 +48,7 @@ Index: b/src/gcc/fortran/Make-lang.in
 ===================================================================
 --- a/src/gcc/fortran/Make-lang.in
 +++ b/src/gcc/fortran/Make-lang.in
-@@ -119,7 +119,8 @@
+@@ -117,7 +117,8 @@
  	cd $(srcdir)/fortran; etags -o TAGS.sub *.c *.h; \
  	etags --include TAGS.sub --include ../TAGS.sub
  
@@ -58,7 +58,7 @@ Index: b/src/gcc/fortran/Make-lang.in
  fortran.dvi: doc/gfortran.dvi doc/gfc-internals.dvi
  
  F95_HTMLFILES = $(build_htmldir)/gfortran
-@@ -191,10 +192,10 @@
+@@ -189,10 +190,10 @@
    $(srcdir)/doc/include/gcc-common.texi \
    gcc-vers.texi
  
@@ -71,7 +71,7 @@ Index: b/src/gcc/fortran/Make-lang.in
  	    -o $@ $<; \
  	else true; fi
  
-@@ -262,7 +263,7 @@
+@@ -260,7 +261,7 @@
  
  fortran.install-plugin:
  
@@ -80,7 +80,7 @@ Index: b/src/gcc/fortran/Make-lang.in
  
  fortran.install-man: $(DESTDIR)$(man1dir)/$(GFORTRAN_INSTALL_NAME)$(man1ext)
  
-@@ -280,7 +281,7 @@
+@@ -278,7 +279,7 @@
  	rm -rf $(DESTDIR)$(bindir)/$(GFORTRAN_INSTALL_NAME)$(exeext); \
  	rm -rf $(DESTDIR)$(man1dir)/$(GFORTRAN_INSTALL_NAME)$(man1ext); \
  	rm -rf $(DESTDIR)$(bindir)/$(GFORTRAN_TARGET_INSTALL_NAME)$(exeext); \
@@ -93,7 +93,7 @@ Index: b/src/gcc/Makefile.in
 ===================================================================
 --- a/src/gcc/Makefile.in
 +++ b/src/gcc/Makefile.in
-@@ -4242,8 +4242,29 @@
+@@ -4266,8 +4266,29 @@
  
  doc: $(BUILD_INFO) $(GENERATED_MANPAGES)
  
@@ -125,7 +125,7 @@ Index: b/src/gcc/Makefile.in
  
  info: $(INFOFILES) lang.info @GENINSRC@ srcinfo lang.srcinfo
  
-@@ -4302,21 +4321,41 @@
+@@ -4321,21 +4342,41 @@
  # patterns.  To use them, put each of the specific targets with its
  # specific dependencies but no build commands.
  
@@ -174,7 +174,7 @@ Index: b/src/gcc/Makefile.in
  			-I $(gcc_docdir)/include -o $@ $<; \
  	fi
  
-@@ -4682,11 +4721,11 @@
+@@ -4701,11 +4742,11 @@
  # $(INSTALL_DATA) might be a relative pathname, so we can't cd into srcdir
  # to do the install.
  install-info:: doc installdirs \
@@ -191,7 +191,7 @@ Index: b/src/gcc/Makefile.in
  	lang.install-info
  
  $(DESTDIR)$(infodir)/%.info: doc/%.info installdirs
-@@ -4893,8 +4932,11 @@
+@@ -4912,8 +4953,11 @@
  	-rm -rf $(DESTDIR)$(bindir)/$(GCOV_INSTALL_NAME)$(exeext)
  	-rm -rf $(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext)
  	-rm -rf $(DESTDIR)$(man1dir)/cpp$(man1ext)
@@ -257,7 +257,7 @@ Index: b/src/gcc/java/Make-lang.in
 ===================================================================
 --- a/src/gcc/java/Make-lang.in
 +++ b/src/gcc/java/Make-lang.in
-@@ -127,9 +127,10 @@
+@@ -126,9 +126,10 @@
  	etags --include TAGS.sub --include ../TAGS.sub
  
  
@@ -270,7 +270,7 @@ Index: b/src/gcc/java/Make-lang.in
  	-cp -p $^ $(srcdir)/doc
  
  java.dvi: doc/gcj.dvi
-@@ -195,7 +196,7 @@
+@@ -194,7 +195,7 @@
  	-rm -rf $(DESTDIR)$(man1dir)/aot-compile$(man1ext)
  	-rm -rf $(DESTDIR)$(man1dir)/rebuild-gcj-db$(man1ext)
  
@@ -279,7 +279,7 @@ Index: b/src/gcc/java/Make-lang.in
  
  java.install-pdf: $(JAVA_PDFFILES)
  	@$(NORMAL_INSTALL)
-@@ -340,10 +341,10 @@
+@@ -339,10 +340,10 @@
  	 gcc-vers.texi
  
  # Documentation
@@ -323,7 +323,7 @@ Index: b/src/gcc/doc/invoke.texi
 ===================================================================
 --- a/src/gcc/doc/invoke.texi
 +++ b/src/gcc/doc/invoke.texi
-@@ -9851,7 +9851,7 @@
+@@ -9884,7 +9884,7 @@
  @option{-nodefaultlibs} is @file{libgcc.a}, a library of internal subroutines
  which GCC uses to overcome shortcomings of particular machines, or special
  needs for some languages.
@@ -332,7 +332,7 @@ Index: b/src/gcc/doc/invoke.texi
  Collection (GCC) Internals},
  for more discussion of @file{libgcc.a}.)
  In most cases, you need @file{libgcc.a} even when you want to avoid
-@@ -9860,7 +9860,7 @@
+@@ -9893,7 +9893,7 @@
  This ensures that you have no unresolved references to internal GCC
  library subroutines.
  (An example of such an internal subroutine is @samp{__main}, used to ensure C++
@@ -341,7 +341,7 @@ Index: b/src/gcc/doc/invoke.texi
  GNU Compiler Collection (GCC) Internals}.)
  
  @item -pie
-@@ -20527,7 +20527,7 @@
+@@ -20720,7 +20720,7 @@
  @option{-B}, @option{-I} and @option{-L} (@pxref{Directory Options}).  These
  take precedence over places specified using environment variables, which
  in turn take precedence over those specified by the configuration of GCC@.
@@ -350,7 +350,7 @@ Index: b/src/gcc/doc/invoke.texi
  GNU Compiler Collection (GCC) Internals}.
  
  @table @env
-@@ -20687,7 +20687,7 @@
+@@ -20880,7 +20880,7 @@
  
  A precompiled header file is searched for when @code{#include} is
  seen in the compilation.  As it searches for the included file
@@ -363,7 +363,7 @@ Index: b/src/gcc/doc/extend.texi
 ===================================================================
 --- a/src/gcc/doc/extend.texi
 +++ b/src/gcc/doc/extend.texi
-@@ -15129,7 +15129,7 @@
+@@ -15212,7 +15212,7 @@
  test for the GNU compiler the same way as for C programs: check for a
  predefined macro @code{__GNUC__}.  You can also use @code{__GNUG__} to
  test specifically for GNU C++ (@pxref{Common Predefined Macros,,
@@ -376,7 +376,7 @@ Index: b/src/gcc/doc/standards.texi
 ===================================================================
 --- a/src/gcc/doc/standards.texi
 +++ b/src/gcc/doc/standards.texi
-@@ -295,8 +295,8 @@
+@@ -294,8 +294,8 @@
  GNAT Reference Manual}, for information on standard
  conformance and compatibility of the Ada compiler.
  
@@ -391,7 +391,7 @@ Index: b/src/gcc/doc/libgcc.texi
 ===================================================================
 --- a/src/gcc/doc/libgcc.texi
 +++ b/src/gcc/doc/libgcc.texi
-@@ -25,7 +25,7 @@
+@@ -24,7 +24,7 @@
  GCC will also generate calls to C library routines, such as
  @code{memcpy} and @code{memset}, in some cases.  The set of routines
  that GCC may possibly use is documented in @ref{Other
@@ -404,7 +404,7 @@ Index: b/src/gcc/doc/gccint.texi
 ===================================================================
 --- a/src/gcc/doc/gccint.texi
 +++ b/src/gcc/doc/gccint.texi
-@@ -51,7 +51,7 @@
+@@ -49,7 +49,7 @@
  @ifnottex
  @dircategory Software development
  @direntry
@@ -413,7 +413,7 @@ Index: b/src/gcc/doc/gccint.texi
  @end direntry
  This file documents the internals of the GNU compilers.
  @sp 1
-@@ -83,7 +83,7 @@
+@@ -81,7 +81,7 @@
  @value{VERSION_PACKAGE}
  @end ifset
  version @value{version-GCC}.  The use of the GNU compilers is documented in a
@@ -426,7 +426,7 @@ Index: b/src/gcc/doc/cpp.texi
 ===================================================================
 --- a/src/gcc/doc/cpp.texi
 +++ b/src/gcc/doc/cpp.texi
-@@ -53,7 +53,7 @@
+@@ -50,7 +50,7 @@
  @ifinfo
  @dircategory Software development
  @direntry
@@ -439,7 +439,7 @@ Index: b/src/gcc/doc/passes.texi
 ===================================================================
 --- a/src/gcc/doc/passes.texi
 +++ b/src/gcc/doc/passes.texi
-@@ -199,7 +199,7 @@
+@@ -197,7 +197,7 @@
  @item Mudflap declaration registration
  
  If mudflap (@pxref{Optimize Options,,-fmudflap -fmudflapth
@@ -452,7 +452,7 @@ Index: b/src/gcc/doc/gcc.texi
 ===================================================================
 --- a/src/gcc/doc/gcc.texi
 +++ b/src/gcc/doc/gcc.texi
-@@ -65,9 +65,9 @@
+@@ -63,9 +63,9 @@
  @ifnottex
  @dircategory Software development
  @direntry
@@ -465,7 +465,7 @@ Index: b/src/gcc/doc/gcc.texi
  @end direntry
  This file documents the use of the GNU compilers.
  @sp 1
-@@ -127,7 +127,7 @@
+@@ -125,7 +125,7 @@
  The internals of the GNU compilers, including how to port them to new
  targets and some information about how to write front ends for new
  languages, are documented in a separate manual.  @xref{Top,,
@@ -478,7 +478,7 @@ Index: b/src/gcc/doc/makefile.texi
 ===================================================================
 --- a/src/gcc/doc/makefile.texi
 +++ b/src/gcc/doc/makefile.texi
-@@ -140,7 +140,7 @@
+@@ -139,7 +139,7 @@
  Builds a compiler with profiling feedback information.  In this case,
  the second and third stages are named @samp{profile} and @samp{feedback},
  respectively.  For more information, see
@@ -491,7 +491,7 @@ Index: b/src/gcc/doc/install.texi
 ===================================================================
 --- a/src/gcc/doc/install.texi
 +++ b/src/gcc/doc/install.texi
-@@ -98,7 +98,7 @@
+@@ -94,7 +94,7 @@
  @end ifinfo
  @dircategory Software development
  @direntry
@@ -675,7 +675,7 @@ Index: b/src/gcc/go/Make-lang.in
  		-I $(gcc_docdir)/include -o $@ $<; \
  	else true; fi
  
-@@ -118,7 +118,7 @@
+@@ -117,7 +118,7 @@
  go.all.cross: gccgo-cross$(exeext)
  go.start.encap: gccgo$(exeext)
  go.rest.encap:
@@ -724,6 +724,8 @@ Index: b/src/gcc/go/gccgo.texi
  only documents the options specific to @command{gccgo}.
  
  The @command{gccgo} command may be used to compile Go source code into
+Index: b/src/libquadmath/libquadmath.texi
+===================================================================
 --- a/src/libquadmath/libquadmath.texi
 +++ b/src/libquadmath/libquadmath.texi
 @@ -25,7 +25,7 @@
@@ -735,9 +737,11 @@ Index: b/src/gcc/go/gccgo.texi
  @end direntry
  
  This manual documents the GCC Quad-Precision Math Library API.
+Index: b/src/libquadmath/Makefile.am
+===================================================================
 --- a/src/libquadmath/Makefile.am
 +++ b/src/libquadmath/Makefile.am
-@@ -129,22 +129,24 @@
+@@ -132,22 +132,24 @@
  
  all-local: $(STAMP_GENINSRC)
  
@@ -768,9 +772,11 @@ Index: b/src/gcc/go/gccgo.texi
  
  
  # Automake Documentation:
+Index: b/src/libquadmath/Makefile.in
+===================================================================
 --- a/src/libquadmath/Makefile.in
 +++ b/src/libquadmath/Makefile.in
-@@ -164,7 +164,8 @@
+@@ -169,7 +169,8 @@
  MULTISUBDIR = 
  MULTIDO = true
  MULTICLEAN = true
@@ -780,7 +786,7 @@ Index: b/src/gcc/go/gccgo.texi
  am__TEXINFO_TEX_DIR = $(srcdir)/../gcc/doc/include
  DVIS = libquadmath.dvi
  PDFS = libquadmath.pdf
-@@ -397,8 +398,8 @@
+@@ -405,8 +406,8 @@
  
  # AM_CONDITIONAL on configure check ACX_CHECK_PROG_VER([MAKEINFO])
  @BUILD_INFO_TRUE@@BUILD_LIBQUADMATH_TRUE@STAMP_BUILD_INFO = stamp-build-info
@@ -791,7 +797,7 @@ Index: b/src/gcc/go/gccgo.texi
  
  # Automake Documentation:
  # If your package has Texinfo files in many directories, you can use the
-@@ -1412,17 +1413,17 @@
+@@ -1464,17 +1465,17 @@
  
  @BUILD_LIBQUADMATH_TRUE@all-local: $(STAMP_GENINSRC)
  
diff --git a/debian/patches/sparc-force-cpu.diff b/debian/patches/sparc-force-cpu.diff
index cbbb1d2..a63c11f 100644
--- a/debian/patches/sparc-force-cpu.diff
+++ b/debian/patches/sparc-force-cpu.diff
@@ -4,7 +4,7 @@ Index: b/src/gcc/config.gcc
 ===================================================================
 --- a/src/gcc/config.gcc
 +++ b/src/gcc/config.gcc
-@@ -3754,6 +3754,13 @@
+@@ -3791,6 +3791,13 @@
  			;;
  		esac