[gcc-6] 99/401: - Refresh patches

Ximin Luo infinity0 at debian.org
Wed Apr 5 15:48:07 UTC 2017


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

infinity0 pushed a commit to branch pu/reproducible_builds
in repository gcc-6.

commit 359b110b1ee3f8d81827f6bd1dd2ca7d8e28b7dc
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Sat Mar 12 09:34:05 2016 +0000

     - Refresh patches
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@8713 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/patches/ada-bootstrap-compare.diff   |  2 +-
 debian/patches/ada-driver-check.diff        |  2 +-
 debian/patches/ada-hurd.diff                |  2 +-
 debian/patches/ada-libgnatprj.diff          | 52 ++++++++---------
 debian/patches/ada-libgnatvsn.diff          | 52 ++++++++---------
 debian/patches/ada-link-lib.diff            | 86 ++++++++++++++---------------
 debian/patches/ada-mips.diff                |  2 +-
 debian/patches/ada-sjlj.diff                | 52 ++++++++---------
 debian/patches/arm-multilib-defaults.diff   |  8 +--
 debian/patches/config-ml.diff               |  2 +-
 debian/patches/g++-multiarch-incdir.diff    |  8 +--
 debian/patches/gcc-auto-build.diff          |  2 +-
 debian/patches/gcc-base-version.diff        | 24 ++++----
 debian/patches/gcc-gfdl-build.diff          |  2 +-
 debian/patches/gcc-hash-style-gnu.diff      |  2 +-
 debian/patches/gcc-ice-apport.diff          |  2 +-
 debian/patches/gcc-ice-dump.diff            |  4 +-
 debian/patches/gcc-multiarch.diff           |  6 +-
 debian/patches/gcc-textdomain.diff          |  2 +-
 debian/patches/gccgo-version.diff           |  2 +-
 debian/patches/gdc-6.diff                   | 14 ++---
 debian/patches/gdc-libphobos-build.diff     | 80 +++++++++++++--------------
 debian/patches/gdc-versym-cpu.diff          |  6 +-
 debian/patches/gdc-versym-os.diff           |  4 +-
 debian/patches/go-testsuite.diff            |  2 +-
 debian/patches/libgnatprj-cross-hack.diff   |  4 +-
 debian/patches/libgo-setcontext-config.diff |  2 +-
 debian/patches/libgo-testsuite.diff         |  8 +--
 debian/patches/libstdc++-man-3cxx.diff      |  4 +-
 debian/patches/pr66368.diff                 |  2 +-
 debian/patches/skip-bootstrap-multilib.diff |  2 +-
 debian/patches/sparc-force-cpu.diff         |  2 +-
 debian/patches/sys-auxv-header.diff         |  4 +-
 33 files changed, 224 insertions(+), 224 deletions(-)

diff --git a/debian/patches/ada-bootstrap-compare.diff b/debian/patches/ada-bootstrap-compare.diff
index 0023a9c..8ee28ed 100644
--- a/debian/patches/ada-bootstrap-compare.diff
+++ b/debian/patches/ada-bootstrap-compare.diff
@@ -5,7 +5,7 @@ Index: b/src/configure.ac
 ===================================================================
 --- a/src/configure.ac
 +++ b/src/configure.ac
-@@ -3595,6 +3595,9 @@ fi
+@@ -3611,6 +3611,9 @@ fi
  
  compare_exclusions="gcc/cc*-checksum\$(objext) | gcc/ada/*tools/*"
  case "$target" in
diff --git a/debian/patches/ada-driver-check.diff b/debian/patches/ada-driver-check.diff
index e7a0e93..e6279b9 100644
--- a/debian/patches/ada-driver-check.diff
+++ b/debian/patches/ada-driver-check.diff
@@ -18,7 +18,7 @@ Index: b/src/configure
 ===================================================================
 --- a/src/configure
 +++ b/src/configure
-@@ -5311,7 +5311,7 @@ acx_cv_cc_gcc_supports_ada=no
+@@ -5355,7 +5355,7 @@ acx_cv_cc_gcc_supports_ada=no
  # Other compilers, like HP Tru64 UNIX cc, exit successfully when
  # given a .adb file, but produce no object file.  So we must check
  # if an object file was really produced to guard against this.
diff --git a/debian/patches/ada-hurd.diff b/debian/patches/ada-hurd.diff
index fa57671..c676a4d 100644
--- a/debian/patches/ada-hurd.diff
+++ b/debian/patches/ada-hurd.diff
@@ -960,7 +960,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
-@@ -1390,6 +1390,35 @@ ifeq ($(strip $(filter-out %86 kfreebsd%
+@@ -1421,6 +1421,35 @@ ifeq ($(strip $(filter-out %86 kfreebsd%
    MISCLIB = -lutil
  endif
  
diff --git a/debian/patches/ada-libgnatprj.diff b/debian/patches/ada-libgnatprj.diff
index 59092d8..b7c2c96 100644
--- a/debian/patches/ada-libgnatprj.diff
+++ b/debian/patches/ada-libgnatprj.diff
@@ -224,7 +224,7 @@ Index: b/src/Makefile.def
 ===================================================================
 --- a/src/Makefile.def
 +++ b/src/Makefile.def
-@@ -189,6 +189,13 @@ target_modules = { module= libgnatvsn; n
+@@ -190,6 +190,13 @@ target_modules = { module= libgnatvsn; n
  		   missing= TAGS;
  		   missing= install-info;
  		   missing= installcheck; };
@@ -238,7 +238,7 @@ Index: b/src/Makefile.def
  target_modules = { module= libgomp; bootstrap= true; lib_path=.libs; };
  target_modules = { module= libitm; lib_path=.libs; };
  target_modules = { module= libatomic; lib_path=.libs; };
-@@ -388,8 +395,12 @@ dependencies = { module=all-fixincludes;
+@@ -389,8 +396,12 @@ dependencies = { module=all-fixincludes;
  dependencies = { module=all-target-libada; on=all-gcc; };
  dependencies = { module=all-gnattools; on=all-target-libada; };
  dependencies = { module=all-gnattools; on=all-target-libgnatvsn; };
@@ -427,7 +427,7 @@ Index: b/src/Makefile.in
 ===================================================================
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -974,6 +974,7 @@ configure-target:  \
+@@ -977,6 +977,7 @@ configure-target:  \
      maybe-configure-target-rda \
      maybe-configure-target-libada \
      maybe-configure-target-libgnatvsn \
@@ -435,7 +435,7 @@ Index: b/src/Makefile.in
      maybe-configure-target-libgomp \
      maybe-configure-target-libitm \
      maybe-configure-target-libatomic
-@@ -1143,6 +1144,7 @@ all-target: maybe-all-target-boehm-gc
+@@ -1146,6 +1147,7 @@ all-target: maybe-all-target-boehm-gc
  all-target: maybe-all-target-rda
  all-target: maybe-all-target-libada
  all-target: maybe-all-target-libgnatvsn
@@ -443,7 +443,7 @@ Index: b/src/Makefile.in
  @if target-libgomp-no-bootstrap
  all-target: maybe-all-target-libgomp
  @endif target-libgomp-no-bootstrap
-@@ -1239,6 +1241,7 @@ info-target: maybe-info-target-boehm-gc
+@@ -1242,6 +1244,7 @@ info-target: maybe-info-target-boehm-gc
  info-target: maybe-info-target-rda
  info-target: maybe-info-target-libada
  info-target: maybe-info-target-libgnatvsn
@@ -451,7 +451,7 @@ Index: b/src/Makefile.in
  info-target: maybe-info-target-libgomp
  info-target: maybe-info-target-libitm
  info-target: maybe-info-target-libatomic
-@@ -1328,6 +1331,7 @@ dvi-target: maybe-dvi-target-boehm-gc
+@@ -1331,6 +1334,7 @@ dvi-target: maybe-dvi-target-boehm-gc
  dvi-target: maybe-dvi-target-rda
  dvi-target: maybe-dvi-target-libada
  dvi-target: maybe-dvi-target-libgnatvsn
@@ -459,7 +459,7 @@ Index: b/src/Makefile.in
  dvi-target: maybe-dvi-target-libgomp
  dvi-target: maybe-dvi-target-libitm
  dvi-target: maybe-dvi-target-libatomic
-@@ -1417,6 +1421,7 @@ pdf-target: maybe-pdf-target-boehm-gc
+@@ -1420,6 +1424,7 @@ pdf-target: maybe-pdf-target-boehm-gc
  pdf-target: maybe-pdf-target-rda
  pdf-target: maybe-pdf-target-libada
  pdf-target: maybe-pdf-target-libgnatvsn
@@ -467,7 +467,7 @@ Index: b/src/Makefile.in
  pdf-target: maybe-pdf-target-libgomp
  pdf-target: maybe-pdf-target-libitm
  pdf-target: maybe-pdf-target-libatomic
-@@ -1506,6 +1511,7 @@ html-target: maybe-html-target-boehm-gc
+@@ -1509,6 +1514,7 @@ html-target: maybe-html-target-boehm-gc
  html-target: maybe-html-target-rda
  html-target: maybe-html-target-libada
  html-target: maybe-html-target-libgnatvsn
@@ -475,7 +475,7 @@ Index: b/src/Makefile.in
  html-target: maybe-html-target-libgomp
  html-target: maybe-html-target-libitm
  html-target: maybe-html-target-libatomic
-@@ -1595,6 +1601,7 @@ TAGS-target: maybe-TAGS-target-boehm-gc
+@@ -1598,6 +1604,7 @@ TAGS-target: maybe-TAGS-target-boehm-gc
  TAGS-target: maybe-TAGS-target-rda
  TAGS-target: maybe-TAGS-target-libada
  TAGS-target: maybe-TAGS-target-libgnatvsn
@@ -483,7 +483,7 @@ Index: b/src/Makefile.in
  TAGS-target: maybe-TAGS-target-libgomp
  TAGS-target: maybe-TAGS-target-libitm
  TAGS-target: maybe-TAGS-target-libatomic
-@@ -1684,6 +1691,7 @@ install-info-target: maybe-install-info-
+@@ -1687,6 +1694,7 @@ install-info-target: maybe-install-info-
  install-info-target: maybe-install-info-target-rda
  install-info-target: maybe-install-info-target-libada
  install-info-target: maybe-install-info-target-libgnatvsn
@@ -491,7 +491,7 @@ Index: b/src/Makefile.in
  install-info-target: maybe-install-info-target-libgomp
  install-info-target: maybe-install-info-target-libitm
  install-info-target: maybe-install-info-target-libatomic
-@@ -1773,6 +1781,7 @@ install-pdf-target: maybe-install-pdf-ta
+@@ -1776,6 +1784,7 @@ install-pdf-target: maybe-install-pdf-ta
  install-pdf-target: maybe-install-pdf-target-rda
  install-pdf-target: maybe-install-pdf-target-libada
  install-pdf-target: maybe-install-pdf-target-libgnatvsn
@@ -499,7 +499,7 @@ Index: b/src/Makefile.in
  install-pdf-target: maybe-install-pdf-target-libgomp
  install-pdf-target: maybe-install-pdf-target-libitm
  install-pdf-target: maybe-install-pdf-target-libatomic
-@@ -1862,6 +1871,7 @@ install-html-target: maybe-install-html-
+@@ -1865,6 +1874,7 @@ install-html-target: maybe-install-html-
  install-html-target: maybe-install-html-target-rda
  install-html-target: maybe-install-html-target-libada
  install-html-target: maybe-install-html-target-libgnatvsn
@@ -507,7 +507,7 @@ Index: b/src/Makefile.in
  install-html-target: maybe-install-html-target-libgomp
  install-html-target: maybe-install-html-target-libitm
  install-html-target: maybe-install-html-target-libatomic
-@@ -1951,6 +1961,7 @@ installcheck-target: maybe-installcheck-
+@@ -1954,6 +1964,7 @@ installcheck-target: maybe-installcheck-
  installcheck-target: maybe-installcheck-target-rda
  installcheck-target: maybe-installcheck-target-libada
  installcheck-target: maybe-installcheck-target-libgnatvsn
@@ -515,7 +515,7 @@ Index: b/src/Makefile.in
  installcheck-target: maybe-installcheck-target-libgomp
  installcheck-target: maybe-installcheck-target-libitm
  installcheck-target: maybe-installcheck-target-libatomic
-@@ -2040,6 +2051,7 @@ mostlyclean-target: maybe-mostlyclean-ta
+@@ -2043,6 +2054,7 @@ mostlyclean-target: maybe-mostlyclean-ta
  mostlyclean-target: maybe-mostlyclean-target-rda
  mostlyclean-target: maybe-mostlyclean-target-libada
  mostlyclean-target: maybe-mostlyclean-target-libgnatvsn
@@ -523,7 +523,7 @@ Index: b/src/Makefile.in
  mostlyclean-target: maybe-mostlyclean-target-libgomp
  mostlyclean-target: maybe-mostlyclean-target-libitm
  mostlyclean-target: maybe-mostlyclean-target-libatomic
-@@ -2129,6 +2141,7 @@ clean-target: maybe-clean-target-boehm-g
+@@ -2132,6 +2144,7 @@ clean-target: maybe-clean-target-boehm-g
  clean-target: maybe-clean-target-rda
  clean-target: maybe-clean-target-libada
  clean-target: maybe-clean-target-libgnatvsn
@@ -531,7 +531,7 @@ Index: b/src/Makefile.in
  clean-target: maybe-clean-target-libgomp
  clean-target: maybe-clean-target-libitm
  clean-target: maybe-clean-target-libatomic
-@@ -2218,6 +2231,7 @@ distclean-target: maybe-distclean-target
+@@ -2221,6 +2234,7 @@ distclean-target: maybe-distclean-target
  distclean-target: maybe-distclean-target-rda
  distclean-target: maybe-distclean-target-libada
  distclean-target: maybe-distclean-target-libgnatvsn
@@ -539,7 +539,7 @@ Index: b/src/Makefile.in
  distclean-target: maybe-distclean-target-libgomp
  distclean-target: maybe-distclean-target-libitm
  distclean-target: maybe-distclean-target-libatomic
-@@ -2307,6 +2321,7 @@ maintainer-clean-target: maybe-maintaine
+@@ -2310,6 +2324,7 @@ maintainer-clean-target: maybe-maintaine
  maintainer-clean-target: maybe-maintainer-clean-target-rda
  maintainer-clean-target: maybe-maintainer-clean-target-libada
  maintainer-clean-target: maybe-maintainer-clean-target-libgnatvsn
@@ -547,7 +547,7 @@ Index: b/src/Makefile.in
  maintainer-clean-target: maybe-maintainer-clean-target-libgomp
  maintainer-clean-target: maybe-maintainer-clean-target-libitm
  maintainer-clean-target: maybe-maintainer-clean-target-libatomic
-@@ -2451,6 +2466,7 @@ check-target:  \
+@@ -2454,6 +2469,7 @@ check-target:  \
      maybe-check-target-rda \
      maybe-check-target-libada \
      maybe-check-target-libgnatvsn \
@@ -555,7 +555,7 @@ Index: b/src/Makefile.in
      maybe-check-target-libgomp \
      maybe-check-target-libitm \
      maybe-check-target-libatomic
-@@ -2636,6 +2652,7 @@ install-target:  \
+@@ -2639,6 +2655,7 @@ install-target:  \
      maybe-install-target-rda \
      maybe-install-target-libada \
      maybe-install-target-libgnatvsn \
@@ -563,7 +563,7 @@ Index: b/src/Makefile.in
      maybe-install-target-libgomp \
      maybe-install-target-libitm \
      maybe-install-target-libatomic
-@@ -2745,6 +2762,7 @@ install-strip-target:  \
+@@ -2748,6 +2765,7 @@ install-strip-target:  \
      maybe-install-strip-target-rda \
      maybe-install-strip-target-libada \
      maybe-install-strip-target-libgnatvsn \
@@ -571,7 +571,7 @@ Index: b/src/Makefile.in
      maybe-install-strip-target-libgomp \
      maybe-install-strip-target-libitm \
      maybe-install-strip-target-libatomic
-@@ -46411,6 +46429,362 @@ maintainer-clean-target-libgnatvsn:
+@@ -46414,6 +46432,362 @@ maintainer-clean-target-libgnatvsn:
  
  
  
@@ -934,7 +934,7 @@ Index: b/src/Makefile.in
  .PHONY: configure-target-libgomp maybe-configure-target-libgomp
  maybe-configure-target-libgomp:
  @if gcc-bootstrap
-@@ -50616,6 +50990,7 @@ configure-target-boehm-gc: stage_last
+@@ -50619,6 +50993,7 @@ configure-target-boehm-gc: stage_last
  configure-target-rda: stage_last
  configure-target-libada: stage_last
  configure-target-libgnatvsn: stage_last
@@ -942,7 +942,7 @@ Index: b/src/Makefile.in
  configure-stage1-target-libgomp: maybe-all-stage1-gcc
  configure-stage2-target-libgomp: maybe-all-stage2-gcc
  configure-stage3-target-libgomp: maybe-all-stage3-gcc
-@@ -50652,6 +51027,7 @@ configure-target-boehm-gc: maybe-all-gcc
+@@ -50655,6 +51030,7 @@ configure-target-boehm-gc: maybe-all-gcc
  configure-target-rda: maybe-all-gcc
  configure-target-libada: maybe-all-gcc
  configure-target-libgnatvsn: maybe-all-gcc
@@ -950,7 +950,7 @@ Index: b/src/Makefile.in
  configure-target-libgomp: maybe-all-gcc
  configure-target-libitm: maybe-all-gcc
  configure-target-libatomic: maybe-all-gcc
-@@ -51026,8 +51402,12 @@ all-stagefeedback-fixincludes: maybe-all
+@@ -51029,8 +51405,12 @@ all-stagefeedback-fixincludes: maybe-all
  all-target-libada: maybe-all-gcc
  all-gnattools: maybe-all-target-libada
  all-gnattools: maybe-all-target-libgnatvsn
@@ -963,7 +963,7 @@ Index: b/src/Makefile.in
  all-lto-plugin: maybe-all-libiberty
  
  all-stage1-lto-plugin: maybe-all-stage1-libiberty
-@@ -51624,6 +52004,7 @@ configure-target-boehm-gc: maybe-all-tar
+@@ -51627,6 +52007,7 @@ configure-target-boehm-gc: maybe-all-tar
  configure-target-rda: maybe-all-target-libgcc
  configure-target-libada: maybe-all-target-libgcc
  configure-target-libgnatvsn: maybe-all-target-libgcc
@@ -971,7 +971,7 @@ Index: b/src/Makefile.in
  configure-target-libgomp: maybe-all-target-libgcc
  configure-target-libitm: maybe-all-target-libgcc
  configure-target-libatomic: maybe-all-target-libgcc
-@@ -51680,6 +52061,8 @@ configure-target-libada: maybe-all-targe
+@@ -51683,6 +52064,8 @@ configure-target-libada: maybe-all-targe
  
  configure-target-libgnatvsn: maybe-all-target-newlib maybe-all-target-libgloss
  
diff --git a/debian/patches/ada-libgnatvsn.diff b/debian/patches/ada-libgnatvsn.diff
index 33de859..8a8223d 100644
--- a/debian/patches/ada-libgnatvsn.diff
+++ b/debian/patches/ada-libgnatvsn.diff
@@ -222,7 +222,7 @@ Index: b/src/Makefile.def
 ===================================================================
 --- a/src/Makefile.def
 +++ b/src/Makefile.def
-@@ -182,6 +182,13 @@ target_modules = { module= libada; no_in
+@@ -183,6 +183,13 @@ target_modules = { module= libada; no_in
  		   missing= TAGS;
  		   missing= install-info;
  		   missing= installcheck; };
@@ -236,7 +236,7 @@ Index: b/src/Makefile.def
  target_modules = { module= libgomp; bootstrap= true; lib_path=.libs; };
  target_modules = { module= libitm; lib_path=.libs; };
  target_modules = { module= libatomic; lib_path=.libs; };
-@@ -380,6 +387,8 @@ dependencies = { module=all-fixincludes;
+@@ -381,6 +388,8 @@ dependencies = { module=all-fixincludes;
  
  dependencies = { module=all-target-libada; on=all-gcc; };
  dependencies = { module=all-gnattools; on=all-target-libada; };
@@ -285,7 +285,7 @@ Index: b/src/Makefile.in
 ===================================================================
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -973,6 +973,7 @@ configure-target:  \
+@@ -976,6 +976,7 @@ configure-target:  \
      maybe-configure-target-boehm-gc \
      maybe-configure-target-rda \
      maybe-configure-target-libada \
@@ -293,7 +293,7 @@ Index: b/src/Makefile.in
      maybe-configure-target-libgomp \
      maybe-configure-target-libitm \
      maybe-configure-target-libatomic
-@@ -1141,6 +1142,7 @@ all-target: maybe-all-target-zlib
+@@ -1144,6 +1145,7 @@ all-target: maybe-all-target-zlib
  all-target: maybe-all-target-boehm-gc
  all-target: maybe-all-target-rda
  all-target: maybe-all-target-libada
@@ -301,7 +301,7 @@ Index: b/src/Makefile.in
  @if target-libgomp-no-bootstrap
  all-target: maybe-all-target-libgomp
  @endif target-libgomp-no-bootstrap
-@@ -1236,6 +1238,7 @@ info-target: maybe-info-target-zlib
+@@ -1239,6 +1241,7 @@ info-target: maybe-info-target-zlib
  info-target: maybe-info-target-boehm-gc
  info-target: maybe-info-target-rda
  info-target: maybe-info-target-libada
@@ -309,7 +309,7 @@ Index: b/src/Makefile.in
  info-target: maybe-info-target-libgomp
  info-target: maybe-info-target-libitm
  info-target: maybe-info-target-libatomic
-@@ -1324,6 +1327,7 @@ dvi-target: maybe-dvi-target-zlib
+@@ -1327,6 +1330,7 @@ dvi-target: maybe-dvi-target-zlib
  dvi-target: maybe-dvi-target-boehm-gc
  dvi-target: maybe-dvi-target-rda
  dvi-target: maybe-dvi-target-libada
@@ -317,7 +317,7 @@ Index: b/src/Makefile.in
  dvi-target: maybe-dvi-target-libgomp
  dvi-target: maybe-dvi-target-libitm
  dvi-target: maybe-dvi-target-libatomic
-@@ -1412,6 +1416,7 @@ pdf-target: maybe-pdf-target-zlib
+@@ -1415,6 +1419,7 @@ pdf-target: maybe-pdf-target-zlib
  pdf-target: maybe-pdf-target-boehm-gc
  pdf-target: maybe-pdf-target-rda
  pdf-target: maybe-pdf-target-libada
@@ -325,7 +325,7 @@ Index: b/src/Makefile.in
  pdf-target: maybe-pdf-target-libgomp
  pdf-target: maybe-pdf-target-libitm
  pdf-target: maybe-pdf-target-libatomic
-@@ -1500,6 +1505,7 @@ html-target: maybe-html-target-zlib
+@@ -1503,6 +1508,7 @@ html-target: maybe-html-target-zlib
  html-target: maybe-html-target-boehm-gc
  html-target: maybe-html-target-rda
  html-target: maybe-html-target-libada
@@ -333,7 +333,7 @@ Index: b/src/Makefile.in
  html-target: maybe-html-target-libgomp
  html-target: maybe-html-target-libitm
  html-target: maybe-html-target-libatomic
-@@ -1588,6 +1594,7 @@ TAGS-target: maybe-TAGS-target-zlib
+@@ -1591,6 +1597,7 @@ TAGS-target: maybe-TAGS-target-zlib
  TAGS-target: maybe-TAGS-target-boehm-gc
  TAGS-target: maybe-TAGS-target-rda
  TAGS-target: maybe-TAGS-target-libada
@@ -341,7 +341,7 @@ Index: b/src/Makefile.in
  TAGS-target: maybe-TAGS-target-libgomp
  TAGS-target: maybe-TAGS-target-libitm
  TAGS-target: maybe-TAGS-target-libatomic
-@@ -1676,6 +1683,7 @@ install-info-target: maybe-install-info-
+@@ -1679,6 +1686,7 @@ install-info-target: maybe-install-info-
  install-info-target: maybe-install-info-target-boehm-gc
  install-info-target: maybe-install-info-target-rda
  install-info-target: maybe-install-info-target-libada
@@ -349,7 +349,7 @@ Index: b/src/Makefile.in
  install-info-target: maybe-install-info-target-libgomp
  install-info-target: maybe-install-info-target-libitm
  install-info-target: maybe-install-info-target-libatomic
-@@ -1764,6 +1772,7 @@ install-pdf-target: maybe-install-pdf-ta
+@@ -1767,6 +1775,7 @@ install-pdf-target: maybe-install-pdf-ta
  install-pdf-target: maybe-install-pdf-target-boehm-gc
  install-pdf-target: maybe-install-pdf-target-rda
  install-pdf-target: maybe-install-pdf-target-libada
@@ -357,7 +357,7 @@ Index: b/src/Makefile.in
  install-pdf-target: maybe-install-pdf-target-libgomp
  install-pdf-target: maybe-install-pdf-target-libitm
  install-pdf-target: maybe-install-pdf-target-libatomic
-@@ -1852,6 +1861,7 @@ install-html-target: maybe-install-html-
+@@ -1855,6 +1864,7 @@ install-html-target: maybe-install-html-
  install-html-target: maybe-install-html-target-boehm-gc
  install-html-target: maybe-install-html-target-rda
  install-html-target: maybe-install-html-target-libada
@@ -365,7 +365,7 @@ Index: b/src/Makefile.in
  install-html-target: maybe-install-html-target-libgomp
  install-html-target: maybe-install-html-target-libitm
  install-html-target: maybe-install-html-target-libatomic
-@@ -1940,6 +1950,7 @@ installcheck-target: maybe-installcheck-
+@@ -1943,6 +1953,7 @@ installcheck-target: maybe-installcheck-
  installcheck-target: maybe-installcheck-target-boehm-gc
  installcheck-target: maybe-installcheck-target-rda
  installcheck-target: maybe-installcheck-target-libada
@@ -373,7 +373,7 @@ Index: b/src/Makefile.in
  installcheck-target: maybe-installcheck-target-libgomp
  installcheck-target: maybe-installcheck-target-libitm
  installcheck-target: maybe-installcheck-target-libatomic
-@@ -2028,6 +2039,7 @@ mostlyclean-target: maybe-mostlyclean-ta
+@@ -2031,6 +2042,7 @@ mostlyclean-target: maybe-mostlyclean-ta
  mostlyclean-target: maybe-mostlyclean-target-boehm-gc
  mostlyclean-target: maybe-mostlyclean-target-rda
  mostlyclean-target: maybe-mostlyclean-target-libada
@@ -381,7 +381,7 @@ Index: b/src/Makefile.in
  mostlyclean-target: maybe-mostlyclean-target-libgomp
  mostlyclean-target: maybe-mostlyclean-target-libitm
  mostlyclean-target: maybe-mostlyclean-target-libatomic
-@@ -2116,6 +2128,7 @@ clean-target: maybe-clean-target-zlib
+@@ -2119,6 +2131,7 @@ clean-target: maybe-clean-target-zlib
  clean-target: maybe-clean-target-boehm-gc
  clean-target: maybe-clean-target-rda
  clean-target: maybe-clean-target-libada
@@ -389,7 +389,7 @@ Index: b/src/Makefile.in
  clean-target: maybe-clean-target-libgomp
  clean-target: maybe-clean-target-libitm
  clean-target: maybe-clean-target-libatomic
-@@ -2204,6 +2217,7 @@ distclean-target: maybe-distclean-target
+@@ -2207,6 +2220,7 @@ distclean-target: maybe-distclean-target
  distclean-target: maybe-distclean-target-boehm-gc
  distclean-target: maybe-distclean-target-rda
  distclean-target: maybe-distclean-target-libada
@@ -397,7 +397,7 @@ Index: b/src/Makefile.in
  distclean-target: maybe-distclean-target-libgomp
  distclean-target: maybe-distclean-target-libitm
  distclean-target: maybe-distclean-target-libatomic
-@@ -2292,6 +2306,7 @@ maintainer-clean-target: maybe-maintaine
+@@ -2295,6 +2309,7 @@ maintainer-clean-target: maybe-maintaine
  maintainer-clean-target: maybe-maintainer-clean-target-boehm-gc
  maintainer-clean-target: maybe-maintainer-clean-target-rda
  maintainer-clean-target: maybe-maintainer-clean-target-libada
@@ -405,7 +405,7 @@ Index: b/src/Makefile.in
  maintainer-clean-target: maybe-maintainer-clean-target-libgomp
  maintainer-clean-target: maybe-maintainer-clean-target-libitm
  maintainer-clean-target: maybe-maintainer-clean-target-libatomic
-@@ -2435,6 +2450,7 @@ check-target:  \
+@@ -2438,6 +2453,7 @@ check-target:  \
      maybe-check-target-boehm-gc \
      maybe-check-target-rda \
      maybe-check-target-libada \
@@ -413,7 +413,7 @@ Index: b/src/Makefile.in
      maybe-check-target-libgomp \
      maybe-check-target-libitm \
      maybe-check-target-libatomic
-@@ -2619,6 +2635,7 @@ install-target:  \
+@@ -2622,6 +2638,7 @@ install-target:  \
      maybe-install-target-boehm-gc \
      maybe-install-target-rda \
      maybe-install-target-libada \
@@ -421,7 +421,7 @@ Index: b/src/Makefile.in
      maybe-install-target-libgomp \
      maybe-install-target-libitm \
      maybe-install-target-libatomic
-@@ -2727,6 +2744,7 @@ install-strip-target:  \
+@@ -2730,6 +2747,7 @@ install-strip-target:  \
      maybe-install-strip-target-boehm-gc \
      maybe-install-strip-target-rda \
      maybe-install-strip-target-libada \
@@ -429,7 +429,7 @@ Index: b/src/Makefile.in
      maybe-install-strip-target-libgomp \
      maybe-install-strip-target-libitm \
      maybe-install-strip-target-libatomic
-@@ -46037,6 +46055,362 @@ maintainer-clean-target-libada:
+@@ -46040,6 +46058,362 @@ maintainer-clean-target-libada:
  
  
  
@@ -792,7 +792,7 @@ Index: b/src/Makefile.in
  .PHONY: configure-target-libgomp maybe-configure-target-libgomp
  maybe-configure-target-libgomp:
  @if gcc-bootstrap
-@@ -50241,6 +50615,7 @@ configure-target-zlib: stage_last
+@@ -50244,6 +50618,7 @@ configure-target-zlib: stage_last
  configure-target-boehm-gc: stage_last
  configure-target-rda: stage_last
  configure-target-libada: stage_last
@@ -800,7 +800,7 @@ Index: b/src/Makefile.in
  configure-stage1-target-libgomp: maybe-all-stage1-gcc
  configure-stage2-target-libgomp: maybe-all-stage2-gcc
  configure-stage3-target-libgomp: maybe-all-stage3-gcc
-@@ -50276,6 +50651,7 @@ configure-target-zlib: maybe-all-gcc
+@@ -50279,6 +50654,7 @@ configure-target-zlib: maybe-all-gcc
  configure-target-boehm-gc: maybe-all-gcc
  configure-target-rda: maybe-all-gcc
  configure-target-libada: maybe-all-gcc
@@ -808,7 +808,7 @@ Index: b/src/Makefile.in
  configure-target-libgomp: maybe-all-gcc
  configure-target-libitm: maybe-all-gcc
  configure-target-libatomic: maybe-all-gcc
-@@ -50649,6 +51025,8 @@ all-stageprofile-fixincludes: maybe-all-
+@@ -50652,6 +51028,8 @@ all-stageprofile-fixincludes: maybe-all-
  all-stagefeedback-fixincludes: maybe-all-stagefeedback-libiberty
  all-target-libada: maybe-all-gcc
  all-gnattools: maybe-all-target-libada
@@ -817,7 +817,7 @@ Index: b/src/Makefile.in
  all-gnattools: maybe-all-target-libstdc++-v3
  all-lto-plugin: maybe-all-libiberty
  
-@@ -51245,6 +51623,7 @@ configure-target-zlib: maybe-all-target-
+@@ -51248,6 +51626,7 @@ configure-target-zlib: maybe-all-target-
  configure-target-boehm-gc: maybe-all-target-libgcc
  configure-target-rda: maybe-all-target-libgcc
  configure-target-libada: maybe-all-target-libgcc
@@ -825,7 +825,7 @@ Index: b/src/Makefile.in
  configure-target-libgomp: maybe-all-target-libgcc
  configure-target-libitm: maybe-all-target-libgcc
  configure-target-libatomic: maybe-all-target-libgcc
-@@ -51299,6 +51678,8 @@ configure-target-rda: maybe-all-target-n
+@@ -51302,6 +51681,8 @@ configure-target-rda: maybe-all-target-n
  
  configure-target-libada: maybe-all-target-newlib maybe-all-target-libgloss
  
diff --git a/debian/patches/ada-link-lib.diff b/debian/patches/ada-link-lib.diff
index dfd4ea8..faaefab 100644
--- a/debian/patches/ada-link-lib.diff
+++ b/debian/patches/ada-link-lib.diff
@@ -71,7 +71,7 @@ Index: b/src/Makefile.def
 ===================================================================
 --- a/src/Makefile.def
 +++ b/src/Makefile.def
-@@ -120,7 +120,13 @@ host_modules= { module= libtermcap; no_c
+@@ -121,7 +121,13 @@ host_modules= { module= libtermcap; no_c
                  missing=distclean;
                  missing=maintainer-clean; };
  host_modules= { module= utils; no_check=true; };
@@ -86,7 +86,7 @@ Index: b/src/Makefile.def
  host_modules= { module= lto-plugin; bootstrap=true;
  		extra_configure_flags='--enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@';
  		extra_make_flags='@extra_linker_plugin_flags@'; };
-@@ -163,12 +169,19 @@ target_modules = { module= libtermcap; n
+@@ -164,12 +170,19 @@ target_modules = { module= libtermcap; n
  target_modules = { module= winsup; };
  target_modules = { module= libgloss; no_check=true; };
  target_modules = { module= libffi; no_install=true; };
@@ -107,7 +107,7 @@ Index: b/src/Makefile.def
  target_modules = { module= libgomp; bootstrap= true; lib_path=.libs; };
  target_modules = { module= libitm; lib_path=.libs; };
  target_modules = { module= libatomic; lib_path=.libs; };
-@@ -365,6 +378,7 @@ dependencies = { module=all-libcpp; on=a
+@@ -366,6 +379,7 @@ dependencies = { module=all-libcpp; on=a
  
  dependencies = { module=all-fixincludes; on=all-libiberty; };
  
@@ -119,7 +119,7 @@ Index: b/src/Makefile.in
 ===================================================================
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -967,6 +967,7 @@ configure-target:  \
+@@ -970,6 +970,7 @@ configure-target:  \
      maybe-configure-target-winsup \
      maybe-configure-target-libgloss \
      maybe-configure-target-libffi \
@@ -127,7 +127,7 @@ Index: b/src/Makefile.in
      maybe-configure-target-libjava \
      maybe-configure-target-zlib \
      maybe-configure-target-boehm-gc \
-@@ -1134,6 +1135,7 @@ all-target: maybe-all-target-libtermcap
+@@ -1137,6 +1138,7 @@ all-target: maybe-all-target-libtermcap
  all-target: maybe-all-target-winsup
  all-target: maybe-all-target-libgloss
  all-target: maybe-all-target-libffi
@@ -135,7 +135,7 @@ Index: b/src/Makefile.in
  all-target: maybe-all-target-libjava
  all-target: maybe-all-target-zlib
  all-target: maybe-all-target-boehm-gc
-@@ -1228,6 +1230,7 @@ info-target: maybe-info-target-libtermca
+@@ -1231,6 +1233,7 @@ info-target: maybe-info-target-libtermca
  info-target: maybe-info-target-winsup
  info-target: maybe-info-target-libgloss
  info-target: maybe-info-target-libffi
@@ -143,7 +143,7 @@ Index: b/src/Makefile.in
  info-target: maybe-info-target-libjava
  info-target: maybe-info-target-zlib
  info-target: maybe-info-target-boehm-gc
-@@ -1315,6 +1318,7 @@ dvi-target: maybe-dvi-target-libtermcap
+@@ -1318,6 +1321,7 @@ dvi-target: maybe-dvi-target-libtermcap
  dvi-target: maybe-dvi-target-winsup
  dvi-target: maybe-dvi-target-libgloss
  dvi-target: maybe-dvi-target-libffi
@@ -151,7 +151,7 @@ Index: b/src/Makefile.in
  dvi-target: maybe-dvi-target-libjava
  dvi-target: maybe-dvi-target-zlib
  dvi-target: maybe-dvi-target-boehm-gc
-@@ -1402,6 +1406,7 @@ pdf-target: maybe-pdf-target-libtermcap
+@@ -1405,6 +1409,7 @@ pdf-target: maybe-pdf-target-libtermcap
  pdf-target: maybe-pdf-target-winsup
  pdf-target: maybe-pdf-target-libgloss
  pdf-target: maybe-pdf-target-libffi
@@ -159,7 +159,7 @@ Index: b/src/Makefile.in
  pdf-target: maybe-pdf-target-libjava
  pdf-target: maybe-pdf-target-zlib
  pdf-target: maybe-pdf-target-boehm-gc
-@@ -1489,6 +1494,7 @@ html-target: maybe-html-target-libtermca
+@@ -1492,6 +1497,7 @@ html-target: maybe-html-target-libtermca
  html-target: maybe-html-target-winsup
  html-target: maybe-html-target-libgloss
  html-target: maybe-html-target-libffi
@@ -167,7 +167,7 @@ Index: b/src/Makefile.in
  html-target: maybe-html-target-libjava
  html-target: maybe-html-target-zlib
  html-target: maybe-html-target-boehm-gc
-@@ -1576,6 +1582,7 @@ TAGS-target: maybe-TAGS-target-libtermca
+@@ -1579,6 +1585,7 @@ TAGS-target: maybe-TAGS-target-libtermca
  TAGS-target: maybe-TAGS-target-winsup
  TAGS-target: maybe-TAGS-target-libgloss
  TAGS-target: maybe-TAGS-target-libffi
@@ -175,7 +175,7 @@ Index: b/src/Makefile.in
  TAGS-target: maybe-TAGS-target-libjava
  TAGS-target: maybe-TAGS-target-zlib
  TAGS-target: maybe-TAGS-target-boehm-gc
-@@ -1663,6 +1670,7 @@ install-info-target: maybe-install-info-
+@@ -1666,6 +1673,7 @@ install-info-target: maybe-install-info-
  install-info-target: maybe-install-info-target-winsup
  install-info-target: maybe-install-info-target-libgloss
  install-info-target: maybe-install-info-target-libffi
@@ -183,7 +183,7 @@ Index: b/src/Makefile.in
  install-info-target: maybe-install-info-target-libjava
  install-info-target: maybe-install-info-target-zlib
  install-info-target: maybe-install-info-target-boehm-gc
-@@ -1750,6 +1758,7 @@ install-pdf-target: maybe-install-pdf-ta
+@@ -1753,6 +1761,7 @@ install-pdf-target: maybe-install-pdf-ta
  install-pdf-target: maybe-install-pdf-target-winsup
  install-pdf-target: maybe-install-pdf-target-libgloss
  install-pdf-target: maybe-install-pdf-target-libffi
@@ -191,7 +191,7 @@ Index: b/src/Makefile.in
  install-pdf-target: maybe-install-pdf-target-libjava
  install-pdf-target: maybe-install-pdf-target-zlib
  install-pdf-target: maybe-install-pdf-target-boehm-gc
-@@ -1837,6 +1846,7 @@ install-html-target: maybe-install-html-
+@@ -1840,6 +1849,7 @@ install-html-target: maybe-install-html-
  install-html-target: maybe-install-html-target-winsup
  install-html-target: maybe-install-html-target-libgloss
  install-html-target: maybe-install-html-target-libffi
@@ -199,7 +199,7 @@ Index: b/src/Makefile.in
  install-html-target: maybe-install-html-target-libjava
  install-html-target: maybe-install-html-target-zlib
  install-html-target: maybe-install-html-target-boehm-gc
-@@ -1924,6 +1934,7 @@ installcheck-target: maybe-installcheck-
+@@ -1927,6 +1937,7 @@ installcheck-target: maybe-installcheck-
  installcheck-target: maybe-installcheck-target-winsup
  installcheck-target: maybe-installcheck-target-libgloss
  installcheck-target: maybe-installcheck-target-libffi
@@ -207,7 +207,7 @@ Index: b/src/Makefile.in
  installcheck-target: maybe-installcheck-target-libjava
  installcheck-target: maybe-installcheck-target-zlib
  installcheck-target: maybe-installcheck-target-boehm-gc
-@@ -2011,6 +2022,7 @@ mostlyclean-target: maybe-mostlyclean-ta
+@@ -2014,6 +2025,7 @@ mostlyclean-target: maybe-mostlyclean-ta
  mostlyclean-target: maybe-mostlyclean-target-winsup
  mostlyclean-target: maybe-mostlyclean-target-libgloss
  mostlyclean-target: maybe-mostlyclean-target-libffi
@@ -215,7 +215,7 @@ Index: b/src/Makefile.in
  mostlyclean-target: maybe-mostlyclean-target-libjava
  mostlyclean-target: maybe-mostlyclean-target-zlib
  mostlyclean-target: maybe-mostlyclean-target-boehm-gc
-@@ -2098,6 +2110,7 @@ clean-target: maybe-clean-target-libterm
+@@ -2101,6 +2113,7 @@ clean-target: maybe-clean-target-libterm
  clean-target: maybe-clean-target-winsup
  clean-target: maybe-clean-target-libgloss
  clean-target: maybe-clean-target-libffi
@@ -223,7 +223,7 @@ Index: b/src/Makefile.in
  clean-target: maybe-clean-target-libjava
  clean-target: maybe-clean-target-zlib
  clean-target: maybe-clean-target-boehm-gc
-@@ -2185,6 +2198,7 @@ distclean-target: maybe-distclean-target
+@@ -2188,6 +2201,7 @@ distclean-target: maybe-distclean-target
  distclean-target: maybe-distclean-target-winsup
  distclean-target: maybe-distclean-target-libgloss
  distclean-target: maybe-distclean-target-libffi
@@ -231,7 +231,7 @@ Index: b/src/Makefile.in
  distclean-target: maybe-distclean-target-libjava
  distclean-target: maybe-distclean-target-zlib
  distclean-target: maybe-distclean-target-boehm-gc
-@@ -2272,6 +2286,7 @@ maintainer-clean-target: maybe-maintaine
+@@ -2275,6 +2289,7 @@ maintainer-clean-target: maybe-maintaine
  maintainer-clean-target: maybe-maintainer-clean-target-winsup
  maintainer-clean-target: maybe-maintainer-clean-target-libgloss
  maintainer-clean-target: maybe-maintainer-clean-target-libffi
@@ -239,7 +239,7 @@ Index: b/src/Makefile.in
  maintainer-clean-target: maybe-maintainer-clean-target-libjava
  maintainer-clean-target: maybe-maintainer-clean-target-zlib
  maintainer-clean-target: maybe-maintainer-clean-target-boehm-gc
-@@ -2414,6 +2429,7 @@ check-target:  \
+@@ -2417,6 +2432,7 @@ check-target:  \
      maybe-check-target-winsup \
      maybe-check-target-libgloss \
      maybe-check-target-libffi \
@@ -247,7 +247,7 @@ Index: b/src/Makefile.in
      maybe-check-target-libjava \
      maybe-check-target-zlib \
      maybe-check-target-boehm-gc \
-@@ -2597,6 +2613,7 @@ install-target:  \
+@@ -2600,6 +2616,7 @@ install-target:  \
      maybe-install-target-winsup \
      maybe-install-target-libgloss \
      maybe-install-target-libffi \
@@ -255,7 +255,7 @@ Index: b/src/Makefile.in
      maybe-install-target-libjava \
      maybe-install-target-zlib \
      maybe-install-target-boehm-gc \
-@@ -2704,6 +2721,7 @@ install-strip-target:  \
+@@ -2707,6 +2724,7 @@ install-strip-target:  \
      maybe-install-strip-target-winsup \
      maybe-install-strip-target-libgloss \
      maybe-install-strip-target-libffi \
@@ -263,7 +263,7 @@ Index: b/src/Makefile.in
      maybe-install-strip-target-libjava \
      maybe-install-strip-target-zlib \
      maybe-install-strip-target-boehm-gc \
-@@ -30603,12 +30621,6 @@ maybe-check-gnattools:
+@@ -30606,12 +30624,6 @@ maybe-check-gnattools:
  maybe-check-gnattools: check-gnattools
  
  check-gnattools:
@@ -276,7 +276,7 @@ Index: b/src/Makefile.in
  
  @endif gnattools
  
-@@ -30649,24 +30661,8 @@ maybe-info-gnattools:
+@@ -30652,24 +30664,8 @@ maybe-info-gnattools:
  @if gnattools
  maybe-info-gnattools: info-gnattools
  
@@ -303,7 +303,7 @@ Index: b/src/Makefile.in
  
  @endif gnattools
  
-@@ -30675,24 +30671,8 @@ maybe-dvi-gnattools:
+@@ -30678,24 +30674,8 @@ maybe-dvi-gnattools:
  @if gnattools
  maybe-dvi-gnattools: dvi-gnattools
  
@@ -330,7 +330,7 @@ Index: b/src/Makefile.in
  
  @endif gnattools
  
-@@ -30727,24 +30707,8 @@ maybe-html-gnattools:
+@@ -30730,24 +30710,8 @@ maybe-html-gnattools:
  @if gnattools
  maybe-html-gnattools: html-gnattools
  
@@ -357,7 +357,7 @@ Index: b/src/Makefile.in
  
  @endif gnattools
  
-@@ -30753,24 +30717,8 @@ maybe-TAGS-gnattools:
+@@ -30756,24 +30720,8 @@ maybe-TAGS-gnattools:
  @if gnattools
  maybe-TAGS-gnattools: TAGS-gnattools
  
@@ -384,7 +384,7 @@ Index: b/src/Makefile.in
  
  @endif gnattools
  
-@@ -30779,25 +30727,8 @@ maybe-install-info-gnattools:
+@@ -30782,25 +30730,8 @@ maybe-install-info-gnattools:
  @if gnattools
  maybe-install-info-gnattools: install-info-gnattools
  
@@ -412,7 +412,7 @@ Index: b/src/Makefile.in
  
  @endif gnattools
  
-@@ -30860,24 +30791,8 @@ maybe-installcheck-gnattools:
+@@ -30863,24 +30794,8 @@ maybe-installcheck-gnattools:
  @if gnattools
  maybe-installcheck-gnattools: installcheck-gnattools
  
@@ -439,7 +439,7 @@ Index: b/src/Makefile.in
  
  @endif gnattools
  
-@@ -43501,6 +43416,449 @@ maintainer-clean-target-libffi:
+@@ -43504,6 +43419,449 @@ maintainer-clean-target-libffi:
  
  
  
@@ -889,7 +889,7 @@ Index: b/src/Makefile.in
  .PHONY: configure-target-libjava maybe-configure-target-libjava
  maybe-configure-target-libjava:
  @if gcc-bootstrap
-@@ -45408,13 +45766,8 @@ maybe-check-target-libada:
+@@ -45411,13 +45769,8 @@ maybe-check-target-libada:
  @if target-libada
  maybe-check-target-libada: check-target-libada
  
@@ -904,7 +904,7 @@ Index: b/src/Makefile.in
  
  @endif target-libada
  
-@@ -45423,13 +45776,8 @@ maybe-install-target-libada:
+@@ -45426,13 +45779,8 @@ maybe-install-target-libada:
  @if target-libada
  maybe-install-target-libada: install-target-libada
  
@@ -920,7 +920,7 @@ Index: b/src/Makefile.in
  
  @endif target-libada
  
-@@ -45438,13 +45786,8 @@ maybe-install-strip-target-libada:
+@@ -45441,13 +45789,8 @@ maybe-install-strip-target-libada:
  @if target-libada
  maybe-install-strip-target-libada: install-strip-target-libada
  
@@ -936,7 +936,7 @@ Index: b/src/Makefile.in
  
  @endif target-libada
  
-@@ -45455,24 +45798,8 @@ maybe-info-target-libada:
+@@ -45458,24 +45801,8 @@ maybe-info-target-libada:
  @if target-libada
  maybe-info-target-libada: info-target-libada
  
@@ -963,7 +963,7 @@ Index: b/src/Makefile.in
  
  @endif target-libada
  
-@@ -45481,24 +45808,8 @@ maybe-dvi-target-libada:
+@@ -45484,24 +45811,8 @@ maybe-dvi-target-libada:
  @if target-libada
  maybe-dvi-target-libada: dvi-target-libada
  
@@ -990,7 +990,7 @@ Index: b/src/Makefile.in
  
  @endif target-libada
  
-@@ -45533,24 +45844,8 @@ maybe-html-target-libada:
+@@ -45536,24 +45847,8 @@ maybe-html-target-libada:
  @if target-libada
  maybe-html-target-libada: html-target-libada
  
@@ -1017,7 +1017,7 @@ Index: b/src/Makefile.in
  
  @endif target-libada
  
-@@ -45559,24 +45854,8 @@ maybe-TAGS-target-libada:
+@@ -45562,24 +45857,8 @@ maybe-TAGS-target-libada:
  @if target-libada
  maybe-TAGS-target-libada: TAGS-target-libada
  
@@ -1044,7 +1044,7 @@ Index: b/src/Makefile.in
  
  @endif target-libada
  
-@@ -45585,25 +45864,8 @@ maybe-install-info-target-libada:
+@@ -45588,25 +45867,8 @@ maybe-install-info-target-libada:
  @if target-libada
  maybe-install-info-target-libada: install-info-target-libada
  
@@ -1072,7 +1072,7 @@ Index: b/src/Makefile.in
  
  @endif target-libada
  
-@@ -45666,24 +45928,8 @@ maybe-installcheck-target-libada:
+@@ -45669,24 +45931,8 @@ maybe-installcheck-target-libada:
  @if target-libada
  maybe-installcheck-target-libada: installcheck-target-libada
  
@@ -1099,7 +1099,7 @@ Index: b/src/Makefile.in
  
  @endif target-libada
  
-@@ -49989,6 +50235,7 @@ configure-target-libtermcap: stage_last
+@@ -49992,6 +50238,7 @@ configure-target-libtermcap: stage_last
  configure-target-winsup: stage_last
  configure-target-libgloss: stage_last
  configure-target-libffi: stage_last
@@ -1107,7 +1107,7 @@ Index: b/src/Makefile.in
  configure-target-libjava: stage_last
  configure-target-zlib: stage_last
  configure-target-boehm-gc: stage_last
-@@ -50023,6 +50270,7 @@ configure-target-libtermcap: maybe-all-g
+@@ -50026,6 +50273,7 @@ configure-target-libtermcap: maybe-all-g
  configure-target-winsup: maybe-all-gcc
  configure-target-libgloss: maybe-all-gcc
  configure-target-libffi: maybe-all-gcc
@@ -1115,7 +1115,7 @@ Index: b/src/Makefile.in
  configure-target-libjava: maybe-all-gcc
  configure-target-zlib: maybe-all-gcc
  configure-target-boehm-gc: maybe-all-gcc
-@@ -50399,6 +50647,7 @@ all-stage3-fixincludes: maybe-all-stage3
+@@ -50402,6 +50650,7 @@ all-stage3-fixincludes: maybe-all-stage3
  all-stage4-fixincludes: maybe-all-stage4-libiberty
  all-stageprofile-fixincludes: maybe-all-stageprofile-libiberty
  all-stagefeedback-fixincludes: maybe-all-stagefeedback-libiberty
@@ -1123,7 +1123,7 @@ Index: b/src/Makefile.in
  all-gnattools: maybe-all-target-libada
  all-gnattools: maybe-all-target-libstdc++-v3
  all-lto-plugin: maybe-all-libiberty
-@@ -50990,6 +51239,7 @@ configure-target-libtermcap: maybe-all-t
+@@ -50993,6 +51242,7 @@ configure-target-libtermcap: maybe-all-t
  configure-target-winsup: maybe-all-target-libgcc
  configure-target-libgloss: maybe-all-target-libgcc
  configure-target-libffi: maybe-all-target-libgcc
@@ -1131,7 +1131,7 @@ Index: b/src/Makefile.in
  configure-target-libjava: maybe-all-target-libgcc
  configure-target-zlib: maybe-all-target-libgcc
  configure-target-boehm-gc: maybe-all-target-libgcc
-@@ -51037,6 +51287,7 @@ configure-target-winsup: maybe-all-targe
+@@ -51040,6 +51290,7 @@ configure-target-winsup: maybe-all-targe
  configure-target-libffi: maybe-all-target-newlib maybe-all-target-libgloss
  configure-target-libffi: maybe-all-target-libstdc++-v3
  
diff --git a/debian/patches/ada-mips.diff b/debian/patches/ada-mips.diff
index a95deb5..0c398dd 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
-@@ -1840,10 +1840,15 @@ ifeq ($(strip $(filter-out mips linux%,$
+@@ -1878,10 +1878,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-sjlj.diff b/debian/patches/ada-sjlj.diff
index 7b99804..c99033f 100644
--- a/debian/patches/ada-sjlj.diff
+++ b/debian/patches/ada-sjlj.diff
@@ -353,7 +353,7 @@ Index: b/src/Makefile.def
 ===================================================================
 --- a/src/Makefile.def
 +++ b/src/Makefile.def
-@@ -182,6 +182,13 @@ target_modules = { module= libada; no_in
+@@ -183,6 +183,13 @@ target_modules = { module= libada; no_in
  		   missing= TAGS;
  		   missing= install-info;
  		   missing= installcheck; };
@@ -367,7 +367,7 @@ Index: b/src/Makefile.def
  target_modules = { module= libgnatvsn; no_check=true;
  		   missing= info;
  		   missing= dvi;
-@@ -393,6 +400,7 @@ dependencies = { module=all-libcpp; on=a
+@@ -394,6 +401,7 @@ dependencies = { module=all-libcpp; on=a
  dependencies = { module=all-fixincludes; on=all-libiberty; };
  
  dependencies = { module=all-target-libada; on=all-gcc; };
@@ -379,7 +379,7 @@ Index: b/src/Makefile.in
 ===================================================================
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -973,6 +973,7 @@ configure-target:  \
+@@ -976,6 +976,7 @@ configure-target:  \
      maybe-configure-target-boehm-gc \
      maybe-configure-target-rda \
      maybe-configure-target-libada \
@@ -387,7 +387,7 @@ Index: b/src/Makefile.in
      maybe-configure-target-libgnatvsn \
      maybe-configure-target-libgnatprj \
      maybe-configure-target-libgomp \
-@@ -1143,6 +1144,7 @@ all-target: maybe-all-target-zlib
+@@ -1146,6 +1147,7 @@ all-target: maybe-all-target-zlib
  all-target: maybe-all-target-boehm-gc
  all-target: maybe-all-target-rda
  all-target: maybe-all-target-libada
@@ -395,7 +395,7 @@ Index: b/src/Makefile.in
  all-target: maybe-all-target-libgnatvsn
  all-target: maybe-all-target-libgnatprj
  @if target-libgomp-no-bootstrap
-@@ -1240,6 +1242,7 @@ info-target: maybe-info-target-zlib
+@@ -1243,6 +1245,7 @@ info-target: maybe-info-target-zlib
  info-target: maybe-info-target-boehm-gc
  info-target: maybe-info-target-rda
  info-target: maybe-info-target-libada
@@ -403,7 +403,7 @@ Index: b/src/Makefile.in
  info-target: maybe-info-target-libgnatvsn
  info-target: maybe-info-target-libgnatprj
  info-target: maybe-info-target-libgomp
-@@ -1330,6 +1333,7 @@ dvi-target: maybe-dvi-target-zlib
+@@ -1333,6 +1336,7 @@ dvi-target: maybe-dvi-target-zlib
  dvi-target: maybe-dvi-target-boehm-gc
  dvi-target: maybe-dvi-target-rda
  dvi-target: maybe-dvi-target-libada
@@ -411,7 +411,7 @@ Index: b/src/Makefile.in
  dvi-target: maybe-dvi-target-libgnatvsn
  dvi-target: maybe-dvi-target-libgnatprj
  dvi-target: maybe-dvi-target-libgomp
-@@ -1420,6 +1424,7 @@ pdf-target: maybe-pdf-target-zlib
+@@ -1423,6 +1427,7 @@ pdf-target: maybe-pdf-target-zlib
  pdf-target: maybe-pdf-target-boehm-gc
  pdf-target: maybe-pdf-target-rda
  pdf-target: maybe-pdf-target-libada
@@ -419,7 +419,7 @@ Index: b/src/Makefile.in
  pdf-target: maybe-pdf-target-libgnatvsn
  pdf-target: maybe-pdf-target-libgnatprj
  pdf-target: maybe-pdf-target-libgomp
-@@ -1510,6 +1515,7 @@ html-target: maybe-html-target-zlib
+@@ -1513,6 +1518,7 @@ html-target: maybe-html-target-zlib
  html-target: maybe-html-target-boehm-gc
  html-target: maybe-html-target-rda
  html-target: maybe-html-target-libada
@@ -427,7 +427,7 @@ Index: b/src/Makefile.in
  html-target: maybe-html-target-libgnatvsn
  html-target: maybe-html-target-libgnatprj
  html-target: maybe-html-target-libgomp
-@@ -1600,6 +1606,7 @@ TAGS-target: maybe-TAGS-target-zlib
+@@ -1603,6 +1609,7 @@ TAGS-target: maybe-TAGS-target-zlib
  TAGS-target: maybe-TAGS-target-boehm-gc
  TAGS-target: maybe-TAGS-target-rda
  TAGS-target: maybe-TAGS-target-libada
@@ -435,7 +435,7 @@ Index: b/src/Makefile.in
  TAGS-target: maybe-TAGS-target-libgnatvsn
  TAGS-target: maybe-TAGS-target-libgnatprj
  TAGS-target: maybe-TAGS-target-libgomp
-@@ -1690,6 +1697,7 @@ install-info-target: maybe-install-info-
+@@ -1693,6 +1700,7 @@ install-info-target: maybe-install-info-
  install-info-target: maybe-install-info-target-boehm-gc
  install-info-target: maybe-install-info-target-rda
  install-info-target: maybe-install-info-target-libada
@@ -443,7 +443,7 @@ Index: b/src/Makefile.in
  install-info-target: maybe-install-info-target-libgnatvsn
  install-info-target: maybe-install-info-target-libgnatprj
  install-info-target: maybe-install-info-target-libgomp
-@@ -1780,6 +1788,7 @@ install-pdf-target: maybe-install-pdf-ta
+@@ -1783,6 +1791,7 @@ install-pdf-target: maybe-install-pdf-ta
  install-pdf-target: maybe-install-pdf-target-boehm-gc
  install-pdf-target: maybe-install-pdf-target-rda
  install-pdf-target: maybe-install-pdf-target-libada
@@ -451,7 +451,7 @@ Index: b/src/Makefile.in
  install-pdf-target: maybe-install-pdf-target-libgnatvsn
  install-pdf-target: maybe-install-pdf-target-libgnatprj
  install-pdf-target: maybe-install-pdf-target-libgomp
-@@ -1870,6 +1879,7 @@ install-html-target: maybe-install-html-
+@@ -1873,6 +1882,7 @@ install-html-target: maybe-install-html-
  install-html-target: maybe-install-html-target-boehm-gc
  install-html-target: maybe-install-html-target-rda
  install-html-target: maybe-install-html-target-libada
@@ -459,7 +459,7 @@ Index: b/src/Makefile.in
  install-html-target: maybe-install-html-target-libgnatvsn
  install-html-target: maybe-install-html-target-libgnatprj
  install-html-target: maybe-install-html-target-libgomp
-@@ -1960,6 +1970,7 @@ installcheck-target: maybe-installcheck-
+@@ -1963,6 +1973,7 @@ installcheck-target: maybe-installcheck-
  installcheck-target: maybe-installcheck-target-boehm-gc
  installcheck-target: maybe-installcheck-target-rda
  installcheck-target: maybe-installcheck-target-libada
@@ -467,7 +467,7 @@ Index: b/src/Makefile.in
  installcheck-target: maybe-installcheck-target-libgnatvsn
  installcheck-target: maybe-installcheck-target-libgnatprj
  installcheck-target: maybe-installcheck-target-libgomp
-@@ -2050,6 +2061,7 @@ mostlyclean-target: maybe-mostlyclean-ta
+@@ -2053,6 +2064,7 @@ mostlyclean-target: maybe-mostlyclean-ta
  mostlyclean-target: maybe-mostlyclean-target-boehm-gc
  mostlyclean-target: maybe-mostlyclean-target-rda
  mostlyclean-target: maybe-mostlyclean-target-libada
@@ -475,7 +475,7 @@ Index: b/src/Makefile.in
  mostlyclean-target: maybe-mostlyclean-target-libgnatvsn
  mostlyclean-target: maybe-mostlyclean-target-libgnatprj
  mostlyclean-target: maybe-mostlyclean-target-libgomp
-@@ -2140,6 +2152,7 @@ clean-target: maybe-clean-target-zlib
+@@ -2143,6 +2155,7 @@ clean-target: maybe-clean-target-zlib
  clean-target: maybe-clean-target-boehm-gc
  clean-target: maybe-clean-target-rda
  clean-target: maybe-clean-target-libada
@@ -483,7 +483,7 @@ Index: b/src/Makefile.in
  clean-target: maybe-clean-target-libgnatvsn
  clean-target: maybe-clean-target-libgnatprj
  clean-target: maybe-clean-target-libgomp
-@@ -2230,6 +2243,7 @@ distclean-target: maybe-distclean-target
+@@ -2233,6 +2246,7 @@ distclean-target: maybe-distclean-target
  distclean-target: maybe-distclean-target-boehm-gc
  distclean-target: maybe-distclean-target-rda
  distclean-target: maybe-distclean-target-libada
@@ -491,7 +491,7 @@ Index: b/src/Makefile.in
  distclean-target: maybe-distclean-target-libgnatvsn
  distclean-target: maybe-distclean-target-libgnatprj
  distclean-target: maybe-distclean-target-libgomp
-@@ -2320,6 +2334,7 @@ maintainer-clean-target: maybe-maintaine
+@@ -2323,6 +2337,7 @@ maintainer-clean-target: maybe-maintaine
  maintainer-clean-target: maybe-maintainer-clean-target-boehm-gc
  maintainer-clean-target: maybe-maintainer-clean-target-rda
  maintainer-clean-target: maybe-maintainer-clean-target-libada
@@ -499,7 +499,7 @@ Index: b/src/Makefile.in
  maintainer-clean-target: maybe-maintainer-clean-target-libgnatvsn
  maintainer-clean-target: maybe-maintainer-clean-target-libgnatprj
  maintainer-clean-target: maybe-maintainer-clean-target-libgomp
-@@ -2465,6 +2480,7 @@ check-target:  \
+@@ -2468,6 +2483,7 @@ check-target:  \
      maybe-check-target-boehm-gc \
      maybe-check-target-rda \
      maybe-check-target-libada \
@@ -507,7 +507,7 @@ Index: b/src/Makefile.in
      maybe-check-target-libgnatvsn \
      maybe-check-target-libgnatprj \
      maybe-check-target-libgomp \
-@@ -2651,6 +2667,7 @@ install-target:  \
+@@ -2654,6 +2670,7 @@ install-target:  \
      maybe-install-target-boehm-gc \
      maybe-install-target-rda \
      maybe-install-target-libada \
@@ -515,7 +515,7 @@ Index: b/src/Makefile.in
      maybe-install-target-libgnatvsn \
      maybe-install-target-libgnatprj \
      maybe-install-target-libgomp \
-@@ -2761,6 +2778,7 @@ install-strip-target:  \
+@@ -2764,6 +2781,7 @@ install-strip-target:  \
      maybe-install-strip-target-boehm-gc \
      maybe-install-strip-target-rda \
      maybe-install-strip-target-libada \
@@ -523,7 +523,7 @@ Index: b/src/Makefile.in
      maybe-install-strip-target-libgnatvsn \
      maybe-install-strip-target-libgnatprj \
      maybe-install-strip-target-libgomp \
-@@ -46073,6 +46091,352 @@ maintainer-clean-target-libada:
+@@ -46076,6 +46094,352 @@ maintainer-clean-target-libada:
  
  
  
@@ -876,7 +876,7 @@ Index: b/src/Makefile.in
  .PHONY: configure-target-libgnatvsn maybe-configure-target-libgnatvsn
  maybe-configure-target-libgnatvsn:
  @if gcc-bootstrap
-@@ -50989,6 +51353,7 @@ configure-target-zlib: stage_last
+@@ -50992,6 +51356,7 @@ configure-target-zlib: stage_last
  configure-target-boehm-gc: stage_last
  configure-target-rda: stage_last
  configure-target-libada: stage_last
@@ -884,7 +884,7 @@ Index: b/src/Makefile.in
  configure-target-libgnatvsn: stage_last
  configure-target-libgnatprj: stage_last
  configure-stage1-target-libgomp: maybe-all-stage1-gcc
-@@ -51026,6 +51391,7 @@ configure-target-zlib: maybe-all-gcc
+@@ -51029,6 +51394,7 @@ configure-target-zlib: maybe-all-gcc
  configure-target-boehm-gc: maybe-all-gcc
  configure-target-rda: maybe-all-gcc
  configure-target-libada: maybe-all-gcc
@@ -892,7 +892,7 @@ Index: b/src/Makefile.in
  configure-target-libgnatvsn: maybe-all-gcc
  configure-target-libgnatprj: maybe-all-gcc
  configure-target-libgomp: maybe-all-gcc
-@@ -51400,6 +51766,7 @@ all-stage4-fixincludes: maybe-all-stage4
+@@ -51403,6 +51769,7 @@ all-stage4-fixincludes: maybe-all-stage4
  all-stageprofile-fixincludes: maybe-all-stageprofile-libiberty
  all-stagefeedback-fixincludes: maybe-all-stagefeedback-libiberty
  all-target-libada: maybe-all-gcc
@@ -900,7 +900,7 @@ Index: b/src/Makefile.in
  all-gnattools: maybe-all-target-libada
  all-gnattools: maybe-all-target-libgnatvsn
  all-gnattools: maybe-all-target-libgnatprj
-@@ -52003,6 +52370,7 @@ configure-target-zlib: maybe-all-target-
+@@ -52006,6 +52373,7 @@ configure-target-zlib: maybe-all-target-
  configure-target-boehm-gc: maybe-all-target-libgcc
  configure-target-rda: maybe-all-target-libgcc
  configure-target-libada: maybe-all-target-libgcc
@@ -908,7 +908,7 @@ Index: b/src/Makefile.in
  configure-target-libgnatvsn: maybe-all-target-libgcc
  configure-target-libgnatprj: maybe-all-target-libgcc
  configure-target-libgomp: maybe-all-target-libgcc
-@@ -52059,6 +52427,8 @@ configure-target-rda: maybe-all-target-n
+@@ -52062,6 +52430,8 @@ configure-target-rda: maybe-all-target-n
  
  configure-target-libada: maybe-all-target-newlib maybe-all-target-libgloss
  
diff --git a/debian/patches/arm-multilib-defaults.diff b/debian/patches/arm-multilib-defaults.diff
index df169c2..b551fcd 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
-@@ -3705,10 +3705,18 @@ case "${target}" in
+@@ -3723,10 +3723,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
-@@ -3742,6 +3750,9 @@ case "${target}" in
+@@ -3760,6 +3768,9 @@ case "${target}" in
  		"" \
  		| 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
-@@ -34,7 +34,21 @@
+@@ -43,7 +43,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.  */
-@@ -94,6 +108,28 @@
+@@ -103,6 +117,28 @@
  #define MUSL_DYNAMIC_LINKER \
    "/lib/ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}.so.1"
  
diff --git a/debian/patches/config-ml.diff b/debian/patches/config-ml.diff
index 1478ea8..5ce6ad6 100644
--- a/debian/patches/config-ml.diff
+++ b/debian/patches/config-ml.diff
@@ -31,7 +31,7 @@ Index: b/src/config-ml.in
  # Remove extraneous blanks from multidirs.
  # Tests like `if [ -n "$multidirs" ]' require it.
  multidirs=`echo "$multidirs" | sed -e 's/^[ ][ ]*//' -e 's/[ ][ ]*$//' -e 's/[ ][ ]*/ /g'`
-@@ -877,9 +896,20 @@ if [ -n "${multidirs}" ] && [ -z "${ml_n
+@@ -891,9 +910,20 @@ if [ -n "${multidirs}" ] && [ -z "${ml_n
  	fi
      fi
  
diff --git a/debian/patches/g++-multiarch-incdir.diff b/debian/patches/g++-multiarch-incdir.diff
index e91a847..9a91953 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
-@@ -906,7 +906,7 @@ endif
+@@ -910,7 +910,7 @@ endif
  
  host_srcdir = ${glibcxx_srcdir}/$(OS_INC_SRCDIR)
  host_builddir = ./${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
-@@ -1188,7 +1188,7 @@ profile_impl_headers = \
+@@ -1192,7 +1192,7 @@ profile_impl_headers = \
  @GLIBCXX_C_HEADERS_COMPATIBILITY_TRUE at c_compatibility_headers_extra = ${c_compatibility_headers}
  host_srcdir = ${glibcxx_srcdir}/$(OS_INC_SRCDIR)
  host_builddir = ./${host_alias}/bits
@@ -39,7 +39,7 @@ Index: b/src/gcc/Makefile.in
  	"build_tooldir=$(build_tooldir)" \
  	"gcc_tooldir=$(gcc_tooldir)" \
  	"bindir=$(bindir)" \
-@@ -1628,6 +1629,14 @@ ifneq ($(xmake_file),)
+@@ -1635,6 +1636,14 @@ ifneq ($(xmake_file),)
  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
-@@ -2664,7 +2673,7 @@ PREPROCESSOR_DEFINES = \
+@@ -2672,7 +2681,7 @@ PREPROCESSOR_DEFINES = \
    -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-auto-build.diff b/debian/patches/gcc-auto-build.diff
index b22fa2d..84bbed4 100644
--- a/debian/patches/gcc-auto-build.diff
+++ b/debian/patches/gcc-auto-build.diff
@@ -4,7 +4,7 @@ Index: b/src/gcc/configure.ac
 ===================================================================
 --- a/src/gcc/configure.ac
 +++ b/src/gcc/configure.ac
-@@ -1658,7 +1658,7 @@ else
+@@ -1679,7 +1679,7 @@ else
  	# Clearing GMPINC is necessary to prevent host headers being
  	# used by the build compiler.  Defining GENERATOR_FILE stops
  	# system.h from including gmp.h.
diff --git a/debian/patches/gcc-base-version.diff b/debian/patches/gcc-base-version.diff
index fe69895..eb93380 100644
--- a/debian/patches/gcc-base-version.diff
+++ b/debian/patches/gcc-base-version.diff
@@ -40,7 +40,7 @@ Index: b/src/gcc/Makefile.in
  DEVPHASE_s  := "\"$(if $(DEVPHASE_c), ($(DEVPHASE_c)))\""
  DATESTAMP_s := \
    "\"$(if $(DEVPHASE_c)$(filter-out 0,$(PATCHLEVEL_c)), $(DATESTAMP_c))\""
-@@ -2007,8 +2010,8 @@ default-c.o: config/default-c.c
+@@ -2014,8 +2017,8 @@ default-c.o: config/default-c.c
  
  # Files used by all variants of C and some other languages.
  
@@ -51,7 +51,7 @@ Index: b/src/gcc/Makefile.in
  
  # Language-independent files.
  
-@@ -2016,7 +2019,8 @@ DRIVER_DEFINES = \
+@@ -2023,7 +2026,8 @@ DRIVER_DEFINES = \
    -DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \
    -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc/\" \
    -DSTANDARD_LIBEXEC_PREFIX=\"$(libexecdir)/gcc/\" \
@@ -61,7 +61,7 @@ Index: b/src/gcc/Makefile.in
    -DDEFAULT_REAL_TARGET_MACHINE=\"$(real_target_noncanonical)\" \
    -DDEFAULT_TARGET_MACHINE=\"$(target_noncanonical)\" \
    -DSTANDARD_BINDIR_PREFIX=\"$(bindir)/\" \
-@@ -2066,20 +2070,20 @@ s-options-h: optionlist $(srcdir)/opt-fu
+@@ -2073,20 +2077,20 @@ s-options-h: optionlist $(srcdir)/opt-fu
  
  dumpvers: dumpvers.c
  
@@ -88,7 +88,7 @@ Index: b/src/gcc/Makefile.in
  	echo "#define BUILDING_GCC_VERSION (BUILDING_GCC_MAJOR * 1000 + BUILDING_GCC_MINOR)" >> bversion.h
  	$(STAMP) s-bversion
  
-@@ -2445,9 +2449,9 @@ build/%.o :  # dependencies provided by
+@@ -2453,9 +2457,9 @@ build/%.o :  # dependencies provided by
  ## 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 \
@@ -100,7 +100,7 @@ Index: b/src/gcc/Makefile.in
  	-DREVISION=$(REVISION_s) \
  	-DDEVPHASE=$(DEVPHASE_s) -DPKGVERSION=$(PKGVERSION_s) \
  	-DBUGURL=$(BUGURL_s) -o $@ $<
-@@ -2670,8 +2674,8 @@ PREPROCESSOR_DEFINES = \
+@@ -2678,8 +2682,8 @@ PREPROCESSOR_DEFINES = \
    -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc/\" \
    @TARGET_SYSTEM_ROOT_DEFINE@
  
@@ -111,7 +111,7 @@ Index: b/src/gcc/Makefile.in
  
  CFLAGS-cppdefault.o += $(PREPROCESSOR_DEFINES)
  
-@@ -2687,8 +2691,8 @@ build/gcov-iov$(build_exeext): build/gco
+@@ -2695,8 +2699,8 @@ build/gcov-iov$(build_exeext): build/gco
  		build/gcov-iov.o -o $@
  
  gcov-iov.h: s-iov
@@ -122,7 +122,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
-@@ -2967,8 +2971,8 @@ TEXI_GCCINSTALL_FILES = install.texi ins
+@@ -2975,8 +2979,8 @@ TEXI_GCCINSTALL_FILES = install.texi ins
  TEXI_CPPINT_FILES = cppinternals.texi gcc-common.texi gcc-vers.texi
  
  # gcc-vers.texi is generated from the version files.
@@ -161,7 +161,7 @@ Index: b/src/gcc/gcc.c
  
  /* The target machine.  */
  
-@@ -4487,7 +4488,7 @@ process_command (unsigned int decoded_op
+@@ -4492,7 +4493,7 @@ process_command (unsigned int decoded_op
       running, or, if that is not available, the configured prefix.  */
    tooldir_prefix
      = concat (gcc_exec_prefix ? gcc_exec_prefix : standard_exec_prefix,
@@ -170,7 +170,7 @@ Index: b/src/gcc/gcc.c
  	      accel_dir_suffix, dir_separator_str, tooldir_prefix2, NULL);
    free (tooldir_prefix2);
  
-@@ -7331,7 +7332,7 @@ driver::set_up_specs () const
+@@ -7366,7 +7367,7 @@ driver::set_up_specs () const
  
    /* Read specs from a file if there is one.  */
  
@@ -179,7 +179,7 @@ Index: b/src/gcc/gcc.c
  			   accel_dir_suffix, dir_separator_str, NULL);
    just_machine_suffix = concat (spec_machine, dir_separator_str, NULL);
  
-@@ -7536,7 +7537,7 @@ driver::set_up_specs () const
+@@ -7571,7 +7572,7 @@ driver::set_up_specs () const
    /* If we have a GCC_EXEC_PREFIX envvar, modify it for cpp's sake.  */
    if (gcc_exec_prefix)
      gcc_exec_prefix = concat (gcc_exec_prefix, spec_host_machine,
@@ -201,7 +201,7 @@ Index: b/src/gcc/configure.ac
      if test x$host != x$target; then
         libstdcxx_incdir="$target_alias/$libstdcxx_incdir"
      fi
-@@ -1718,6 +1718,7 @@ changequote([,])dnl
+@@ -1739,6 +1739,7 @@ changequote([,])dnl
  
  changequote(,)dnl
  gcc_BASEVER=`cat $srcdir/BASE-VER`
@@ -209,7 +209,7 @@ Index: b/src/gcc/configure.ac
  gcc_DEVPHASE=`cat $srcdir/DEV-PHASE`
  gcc_DATESTAMP=`cat $srcdir/DATESTAMP`
  if test -f $srcdir/REVISION ; then
-@@ -1728,12 +1729,12 @@ fi
+@@ -1749,12 +1750,12 @@ fi
  cat > plugin-version.h <<EOF
  #include "configargs.h"
  
diff --git a/debian/patches/gcc-gfdl-build.diff b/debian/patches/gcc-gfdl-build.diff
index 7063851..7451cd5 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
-@@ -2304,30 +2304,8 @@ s-tm-texi: $(srcdir)/doc/../doc/tm.texi
+@@ -2311,30 +2311,8 @@ s-tm-texi: $(srcdir)/doc/../doc/tm.texi
  # \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 d36980f..655adc4 100644
--- a/debian/patches/gcc-hash-style-gnu.diff
+++ b/debian/patches/gcc-hash-style-gnu.diff
@@ -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
-@@ -466,12 +466,12 @@ extern int dot_symbols;
+@@ -469,12 +469,12 @@ extern int dot_symbols;
  					   " -m elf64ppc")
  #endif
  
diff --git a/debian/patches/gcc-ice-apport.diff b/debian/patches/gcc-ice-apport.diff
index 73a692e..c2ef7a7 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
-@@ -6634,6 +6634,16 @@ do_report_bug (const char **new_argv, co
+@@ -6835,6 +6835,16 @@ do_report_bug (const char **new_argv, co
  	  fflush(stderr);
  	  free(cmd);
  	}
diff --git a/debian/patches/gcc-ice-dump.diff b/debian/patches/gcc-ice-dump.diff
index 22aefc1..bd7b651 100644
--- a/debian/patches/gcc-ice-dump.diff
+++ b/debian/patches/gcc-ice-dump.diff
@@ -5,7 +5,7 @@ Index: b/src/gcc/gcc.c
 ===================================================================
 --- a/src/gcc/gcc.c
 +++ b/src/gcc/gcc.c
-@@ -2985,7 +2985,8 @@ execute (void)
+@@ -3140,7 +3140,8 @@ execute (void)
  	    /* For ICEs in cc1, cc1obj, cc1plus see if it is
  	       reproducible or not.  */
  	    const char *p;
@@ -15,7 +15,7 @@ Index: b/src/gcc/gcc.c
  		&& WEXITSTATUS (status) == ICE_EXIT_CODE
  		&& i == 0
  		&& (p = strrchr (commands[0].argv[0], DIR_SEPARATOR))
-@@ -6616,8 +6617,23 @@ do_report_bug (const char **new_argv, co
+@@ -6817,8 +6818,23 @@ do_report_bug (const char **new_argv, co
  
    if (status == ATTEMPT_STATUS_SUCCESS)
      {
diff --git a/debian/patches/gcc-multiarch.diff b/debian/patches/gcc-multiarch.diff
index da74792..977c706 100644
--- a/debian/patches/gcc-multiarch.diff
+++ b/debian/patches/gcc-multiarch.diff
@@ -113,7 +113,7 @@ Index: b/src/gcc/config.gcc
 ===================================================================
 --- a/src/gcc/config.gcc
 +++ b/src/gcc/config.gcc
-@@ -2068,6 +2068,10 @@ mips*-*-linux*)				# Linux MIPS, either
+@@ -2086,6 +2086,10 @@ mips*-*-linux*)				# Linux MIPS, either
  			default_mips_arch=mips64r2
  			enable_mips_multilibs="yes"
  			;;
@@ -124,7 +124,7 @@ Index: b/src/gcc/config.gcc
  		mips64*-*-linux* | mipsisa64*-*-linux*)
  			default_mips_abi=n32
  			enable_mips_multilibs="yes"
-@@ -4391,7 +4395,7 @@ case ${target} in
+@@ -4409,7 +4413,7 @@ case ${target} in
  	i[34567]86-*-darwin* | x86_64-*-darwin*)
  		;;
  	i[34567]86-*-linux* | x86_64-*-linux*)
@@ -152,7 +152,7 @@ Index: b/src/gcc/config/mips/mips.h
 ===================================================================
 --- a/src/gcc/config/mips/mips.h
 +++ b/src/gcc/config/mips/mips.h
-@@ -3326,16 +3326,6 @@ struct GTY(())  machine_function {
+@@ -3375,16 +3375,6 @@ struct GTY(())  machine_function {
  #define PMODE_INSN(NAME, ARGS) \
    (Pmode == SImode ? NAME ## _si ARGS : NAME ## _di ARGS)
  
diff --git a/debian/patches/gcc-textdomain.diff b/debian/patches/gcc-textdomain.diff
index a758f6b..bf93021 100644
--- a/debian/patches/gcc-textdomain.diff
+++ b/debian/patches/gcc-textdomain.diff
@@ -19,7 +19,7 @@ Index: b/src/gcc/Makefile.in
 ===================================================================
 --- a/src/gcc/Makefile.in
 +++ b/src/gcc/Makefile.in
-@@ -3984,8 +3984,8 @@ install-po:
+@@ -3994,8 +3994,8 @@ install-po:
  	  dir=$(localedir)/$$lang/LC_MESSAGES; \
  	  echo $(mkinstalldirs) $(DESTDIR)$$dir; \
  	  $(mkinstalldirs) $(DESTDIR)$$dir || exit 1; \
diff --git a/debian/patches/gccgo-version.diff b/debian/patches/gccgo-version.diff
index 45ed688..f824849 100644
--- a/debian/patches/gccgo-version.diff
+++ b/debian/patches/gccgo-version.diff
@@ -19,7 +19,7 @@ Index: b/src/libgo/Makefile.in
 ===================================================================
 --- a/src/libgo/Makefile.in
 +++ b/src/libgo/Makefile.in
-@@ -497,14 +497,15 @@ SUFFIXES = .c .go .gox .o .obj .lo .a
+@@ -498,14 +498,15 @@ SUFFIXES = .c .go .gox .o .obj .lo .a
  @LIBGO_IS_RTEMS_TRUE at subdirs = testsuite
  SUBDIRS = ${subdirs}
  gcc_version := $(shell $(GOC) -dumpversion)
diff --git a/debian/patches/gdc-6.diff b/debian/patches/gdc-6.diff
index ac3b8fb..67b28bb 100644
--- a/debian/patches/gdc-6.diff
+++ b/debian/patches/gdc-6.diff
@@ -20,7 +20,7 @@ Index: b/src/gcc/config/i386/cygming.h
 ===================================================================
 --- a/src/gcc/config/i386/cygming.h
 +++ b/src/gcc/config/i386/cygming.h
-@@ -170,6 +170,10 @@ along with GCC; see the file COPYING3.
+@@ -175,6 +175,10 @@ along with GCC; see the file COPYING3.
  
  #undef MATH_LIBRARY
  #define MATH_LIBRARY ""
@@ -49,7 +49,7 @@ Index: b/src/gcc/config/rs6000/rs6000.c
 ===================================================================
 --- a/src/gcc/config/rs6000/rs6000.c
 +++ b/src/gcc/config/rs6000/rs6000.c
-@@ -27213,7 +27213,8 @@ rs6000_output_function_epilogue (FILE *f
+@@ -27426,7 +27426,8 @@ rs6000_output_function_epilogue (FILE *f
        if (lang_GNU_C ()
  	  || ! strcmp (language_string, "GNU GIMPLE")
  	  || ! strcmp (language_string, "GNU Go")
@@ -80,7 +80,7 @@ Index: b/src/gcc/dwarf2out.c
  /* Remove the specified attribute if present.  Return TRUE if removal
     was successful.  */
  
-@@ -21672,6 +21682,8 @@ gen_compile_unit_die (const char *filena
+@@ -21845,6 +21855,8 @@ gen_compile_unit_die (const char *filena
  	language = DW_LANG_ObjC;
        else if (strcmp (language_string, "GNU Objective-C++") == 0)
  	language = DW_LANG_ObjC_plus_plus;
@@ -89,7 +89,7 @@ Index: b/src/gcc/dwarf2out.c
        else if (dwarf_version >= 5 || !dwarf_strict)
  	{
  	  if (strcmp (language_string, "GNU Go") == 0)
-@@ -23120,7 +23132,7 @@ declare_in_namespace (tree thing, dw_die
+@@ -23297,7 +23309,7 @@ declare_in_namespace (tree thing, dw_die
  
    if (ns_context != context_die)
      {
@@ -98,7 +98,7 @@ Index: b/src/gcc/dwarf2out.c
  	return ns_context;
        if (DECL_P (thing))
  	gen_decl_die (thing, NULL, NULL, ns_context);
-@@ -23143,7 +23155,7 @@ gen_namespace_die (tree decl, dw_die_ref
+@@ -23320,7 +23332,7 @@ gen_namespace_die (tree decl, dw_die_ref
      {
        /* Output a real namespace or module.  */
        context_die = setup_namespace_context (decl, comp_unit_die ());
@@ -107,7 +107,7 @@ Index: b/src/gcc/dwarf2out.c
  			       ? DW_TAG_module : DW_TAG_namespace,
  			       context_die, decl);
        /* For Fortran modules defined in different CU don't add src coords.  */
-@@ -23210,7 +23222,7 @@ gen_decl_die (tree decl, tree origin, st
+@@ -23387,7 +23399,7 @@ gen_decl_die (tree decl, tree origin, st
        break;
  
      case CONST_DECL:
@@ -116,7 +116,7 @@ Index: b/src/gcc/dwarf2out.c
  	{
  	  /* The individual enumerators of an enum type get output when we output
  	     the Dwarf representation of the relevant enum type itself.  */
-@@ -23731,7 +23743,7 @@ dwarf2out_decl (tree decl)
+@@ -23908,7 +23920,7 @@ dwarf2out_decl (tree decl)
      case CONST_DECL:
        if (debug_info_level <= DINFO_LEVEL_TERSE)
  	return;
diff --git a/debian/patches/gdc-libphobos-build.diff b/debian/patches/gdc-libphobos-build.diff
index 1678778..4cac266 100644
--- a/debian/patches/gdc-libphobos-build.diff
+++ b/debian/patches/gdc-libphobos-build.diff
@@ -116,7 +116,7 @@ Index: b/src/Makefile.def
 ===================================================================
 --- a/src/Makefile.def
 +++ b/src/Makefile.def
-@@ -161,6 +161,7 @@ target_modules = { module= libquadmath;
+@@ -162,6 +162,7 @@ target_modules = { module= libquadmath;
  target_modules = { module= libgfortran; };
  target_modules = { module= libobjc; };
  target_modules = { module= libgo; };
@@ -124,7 +124,7 @@ Index: b/src/Makefile.def
  target_modules = { module= libtermcap; no_check=true;
                     missing=mostlyclean;
                     missing=clean;
-@@ -318,6 +319,7 @@ flags_to_pass = { flag= GCJ_FOR_TARGET ;
+@@ -319,6 +320,7 @@ flags_to_pass = { flag= GCJ_FOR_TARGET ;
  flags_to_pass = { flag= GFORTRAN_FOR_TARGET ; };
  flags_to_pass = { flag= GOC_FOR_TARGET ; };
  flags_to_pass = { flag= GOCFLAGS_FOR_TARGET ; };
@@ -132,7 +132,7 @@ Index: b/src/Makefile.def
  flags_to_pass = { flag= LD_FOR_TARGET ; };
  flags_to_pass = { flag= LIPO_FOR_TARGET ; };
  flags_to_pass = { flag= LDFLAGS_FOR_TARGET ; };
-@@ -595,6 +597,8 @@ dependencies = { module=configure-target
+@@ -596,6 +598,8 @@ dependencies = { module=configure-target
  dependencies = { module=all-target-libgo; on=all-target-libbacktrace; };
  dependencies = { module=all-target-libgo; on=all-target-libffi; };
  dependencies = { module=all-target-libgo; on=all-target-libatomic; };
@@ -141,7 +141,7 @@ Index: b/src/Makefile.def
  dependencies = { module=configure-target-libjava; on=configure-target-zlib; };
  dependencies = { module=configure-target-libjava; on=configure-target-boehm-gc; };
  dependencies = { module=configure-target-libjava; on=configure-target-libffi; };
-@@ -659,6 +663,8 @@ languages = { language=objc;	gcc-check-t
+@@ -660,6 +664,8 @@ languages = { language=objc;	gcc-check-t
  languages = { language=obj-c++;	gcc-check-target=check-obj-c++; };
  languages = { language=go;	gcc-check-target=check-go;
  				lib-check-target=check-target-libgo; };
@@ -170,7 +170,7 @@ Index: b/src/Makefile.tpl
  	AR="$(AR)"; export AR; \
  	AS="$(AS)"; export AS; \
  	CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
-@@ -284,6 +286,7 @@ BASE_TARGET_EXPORTS = \
+@@ -285,6 +287,7 @@ BASE_TARGET_EXPORTS = \
  	GCJ="$(GCJ_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GCJ; \
  	GFORTRAN="$(GFORTRAN_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GFORTRAN; \
  	GOC="$(GOC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GOC; \
@@ -178,7 +178,7 @@ Index: b/src/Makefile.tpl
  	DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
  	LD="$(COMPILER_LD_FOR_TARGET)"; export LD; \
  	LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
-@@ -351,6 +354,7 @@ DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@
+@@ -353,6 +356,7 @@ DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@
  GCJ_FOR_BUILD = @GCJ_FOR_BUILD@
  GFORTRAN_FOR_BUILD = @GFORTRAN_FOR_BUILD@
  GOC_FOR_BUILD = @GOC_FOR_BUILD@
@@ -186,7 +186,7 @@ Index: b/src/Makefile.tpl
  LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
  LD_FOR_BUILD = @LD_FOR_BUILD@
  NM_FOR_BUILD = @NM_FOR_BUILD@
-@@ -481,6 +485,7 @@ RAW_CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @
+@@ -483,6 +487,7 @@ RAW_CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @
  GCJ_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCJ_FOR_TARGET@
  GFORTRAN_FOR_TARGET=$(STAGE_CC_WRAPPER) @GFORTRAN_FOR_TARGET@
  GOC_FOR_TARGET=$(STAGE_CC_WRAPPER) @GOC_FOR_TARGET@
@@ -194,7 +194,7 @@ Index: b/src/Makefile.tpl
  DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@
  LD_FOR_TARGET=@LD_FOR_TARGET@
  
-@@ -606,6 +611,7 @@ EXTRA_HOST_FLAGS = \
+@@ -609,6 +614,7 @@ EXTRA_HOST_FLAGS = \
  	'GCJ=$(GCJ)' \
  	'GFORTRAN=$(GFORTRAN)' \
  	'GOC=$(GOC)' \
@@ -202,7 +202,7 @@ Index: b/src/Makefile.tpl
  	'LD=$(LD)' \
  	'LIPO=$(LIPO)' \
  	'NM=$(NM)' \
-@@ -662,6 +668,7 @@ EXTRA_TARGET_FLAGS = \
+@@ -665,6 +671,7 @@ EXTRA_TARGET_FLAGS = \
  	'GFORTRAN=$$(GFORTRAN_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
  	'GOC=$$(GOC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
  	'GOCFLAGS=$$(GOCFLAGS_FOR_TARGET)' \
@@ -230,7 +230,7 @@ Index: b/src/Makefile.in
  	AR="$(AR)"; export AR; \
  	AS="$(AS)"; export AS; \
  	CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
-@@ -281,6 +283,7 @@ BASE_TARGET_EXPORTS = \
+@@ -282,6 +284,7 @@ BASE_TARGET_EXPORTS = \
  	GCJ="$(GCJ_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GCJ; \
  	GFORTRAN="$(GFORTRAN_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GFORTRAN; \
  	GOC="$(GOC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GOC; \
@@ -238,7 +238,7 @@ Index: b/src/Makefile.in
  	DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
  	LD="$(COMPILER_LD_FOR_TARGET)"; export LD; \
  	LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
-@@ -348,6 +351,7 @@ DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@
+@@ -350,6 +353,7 @@ DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@
  GCJ_FOR_BUILD = @GCJ_FOR_BUILD@
  GFORTRAN_FOR_BUILD = @GFORTRAN_FOR_BUILD@
  GOC_FOR_BUILD = @GOC_FOR_BUILD@
@@ -246,7 +246,7 @@ Index: b/src/Makefile.in
  LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
  LD_FOR_BUILD = @LD_FOR_BUILD@
  NM_FOR_BUILD = @NM_FOR_BUILD@
-@@ -528,6 +532,7 @@ RAW_CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @
+@@ -530,6 +534,7 @@ RAW_CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @
  GCJ_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCJ_FOR_TARGET@
  GFORTRAN_FOR_TARGET=$(STAGE_CC_WRAPPER) @GFORTRAN_FOR_TARGET@
  GOC_FOR_TARGET=$(STAGE_CC_WRAPPER) @GOC_FOR_TARGET@
@@ -254,7 +254,7 @@ Index: b/src/Makefile.in
  DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@
  LD_FOR_TARGET=@LD_FOR_TARGET@
  
-@@ -752,6 +757,7 @@ BASE_FLAGS_TO_PASS = \
+@@ -754,6 +759,7 @@ BASE_FLAGS_TO_PASS = \
  	"GFORTRAN_FOR_TARGET=$(GFORTRAN_FOR_TARGET)" \
  	"GOC_FOR_TARGET=$(GOC_FOR_TARGET)" \
  	"GOCFLAGS_FOR_TARGET=$(GOCFLAGS_FOR_TARGET)" \
@@ -262,7 +262,7 @@ Index: b/src/Makefile.in
  	"LD_FOR_TARGET=$(LD_FOR_TARGET)" \
  	"LIPO_FOR_TARGET=$(LIPO_FOR_TARGET)" \
  	"LDFLAGS_FOR_TARGET=$(LDFLAGS_FOR_TARGET)" \
-@@ -805,6 +811,7 @@ EXTRA_HOST_FLAGS = \
+@@ -808,6 +814,7 @@ EXTRA_HOST_FLAGS = \
  	'GCJ=$(GCJ)' \
  	'GFORTRAN=$(GFORTRAN)' \
  	'GOC=$(GOC)' \
@@ -270,7 +270,7 @@ Index: b/src/Makefile.in
  	'LD=$(LD)' \
  	'LIPO=$(LIPO)' \
  	'NM=$(NM)' \
-@@ -861,6 +868,7 @@ EXTRA_TARGET_FLAGS = \
+@@ -864,6 +871,7 @@ EXTRA_TARGET_FLAGS = \
  	'GFORTRAN=$$(GFORTRAN_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
  	'GOC=$$(GOC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
  	'GOCFLAGS=$$(GOCFLAGS_FOR_TARGET)' \
@@ -278,7 +278,7 @@ Index: b/src/Makefile.in
  	'LD=$(COMPILER_LD_FOR_TARGET)' \
  	'LDFLAGS=$$(LDFLAGS_FOR_TARGET)' \
  	'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \
-@@ -963,6 +971,7 @@ configure-target:  \
+@@ -966,6 +974,7 @@ configure-target:  \
      maybe-configure-target-libgfortran \
      maybe-configure-target-libobjc \
      maybe-configure-target-libgo \
@@ -286,7 +286,7 @@ Index: b/src/Makefile.in
      maybe-configure-target-libtermcap \
      maybe-configure-target-winsup \
      maybe-configure-target-libgloss \
-@@ -1134,6 +1143,7 @@ all-target: maybe-all-target-libquadmath
+@@ -1137,6 +1146,7 @@ all-target: maybe-all-target-libquadmath
  all-target: maybe-all-target-libgfortran
  all-target: maybe-all-target-libobjc
  all-target: maybe-all-target-libgo
@@ -294,7 +294,7 @@ Index: b/src/Makefile.in
  all-target: maybe-all-target-libtermcap
  all-target: maybe-all-target-winsup
  all-target: maybe-all-target-libgloss
-@@ -1232,6 +1242,7 @@ info-target: maybe-info-target-libquadma
+@@ -1235,6 +1245,7 @@ info-target: maybe-info-target-libquadma
  info-target: maybe-info-target-libgfortran
  info-target: maybe-info-target-libobjc
  info-target: maybe-info-target-libgo
@@ -302,7 +302,7 @@ Index: b/src/Makefile.in
  info-target: maybe-info-target-libtermcap
  info-target: maybe-info-target-winsup
  info-target: maybe-info-target-libgloss
-@@ -1323,6 +1334,7 @@ dvi-target: maybe-dvi-target-libquadmath
+@@ -1326,6 +1337,7 @@ dvi-target: maybe-dvi-target-libquadmath
  dvi-target: maybe-dvi-target-libgfortran
  dvi-target: maybe-dvi-target-libobjc
  dvi-target: maybe-dvi-target-libgo
@@ -310,7 +310,7 @@ Index: b/src/Makefile.in
  dvi-target: maybe-dvi-target-libtermcap
  dvi-target: maybe-dvi-target-winsup
  dvi-target: maybe-dvi-target-libgloss
-@@ -1414,6 +1426,7 @@ pdf-target: maybe-pdf-target-libquadmath
+@@ -1417,6 +1429,7 @@ pdf-target: maybe-pdf-target-libquadmath
  pdf-target: maybe-pdf-target-libgfortran
  pdf-target: maybe-pdf-target-libobjc
  pdf-target: maybe-pdf-target-libgo
@@ -318,7 +318,7 @@ Index: b/src/Makefile.in
  pdf-target: maybe-pdf-target-libtermcap
  pdf-target: maybe-pdf-target-winsup
  pdf-target: maybe-pdf-target-libgloss
-@@ -1505,6 +1518,7 @@ html-target: maybe-html-target-libquadma
+@@ -1508,6 +1521,7 @@ html-target: maybe-html-target-libquadma
  html-target: maybe-html-target-libgfortran
  html-target: maybe-html-target-libobjc
  html-target: maybe-html-target-libgo
@@ -326,7 +326,7 @@ Index: b/src/Makefile.in
  html-target: maybe-html-target-libtermcap
  html-target: maybe-html-target-winsup
  html-target: maybe-html-target-libgloss
-@@ -1596,6 +1610,7 @@ TAGS-target: maybe-TAGS-target-libquadma
+@@ -1599,6 +1613,7 @@ TAGS-target: maybe-TAGS-target-libquadma
  TAGS-target: maybe-TAGS-target-libgfortran
  TAGS-target: maybe-TAGS-target-libobjc
  TAGS-target: maybe-TAGS-target-libgo
@@ -334,7 +334,7 @@ Index: b/src/Makefile.in
  TAGS-target: maybe-TAGS-target-libtermcap
  TAGS-target: maybe-TAGS-target-winsup
  TAGS-target: maybe-TAGS-target-libgloss
-@@ -1687,6 +1702,7 @@ install-info-target: maybe-install-info-
+@@ -1690,6 +1705,7 @@ install-info-target: maybe-install-info-
  install-info-target: maybe-install-info-target-libgfortran
  install-info-target: maybe-install-info-target-libobjc
  install-info-target: maybe-install-info-target-libgo
@@ -342,7 +342,7 @@ Index: b/src/Makefile.in
  install-info-target: maybe-install-info-target-libtermcap
  install-info-target: maybe-install-info-target-winsup
  install-info-target: maybe-install-info-target-libgloss
-@@ -1778,6 +1794,7 @@ install-pdf-target: maybe-install-pdf-ta
+@@ -1781,6 +1797,7 @@ install-pdf-target: maybe-install-pdf-ta
  install-pdf-target: maybe-install-pdf-target-libgfortran
  install-pdf-target: maybe-install-pdf-target-libobjc
  install-pdf-target: maybe-install-pdf-target-libgo
@@ -350,7 +350,7 @@ Index: b/src/Makefile.in
  install-pdf-target: maybe-install-pdf-target-libtermcap
  install-pdf-target: maybe-install-pdf-target-winsup
  install-pdf-target: maybe-install-pdf-target-libgloss
-@@ -1869,6 +1886,7 @@ install-html-target: maybe-install-html-
+@@ -1872,6 +1889,7 @@ install-html-target: maybe-install-html-
  install-html-target: maybe-install-html-target-libgfortran
  install-html-target: maybe-install-html-target-libobjc
  install-html-target: maybe-install-html-target-libgo
@@ -358,7 +358,7 @@ Index: b/src/Makefile.in
  install-html-target: maybe-install-html-target-libtermcap
  install-html-target: maybe-install-html-target-winsup
  install-html-target: maybe-install-html-target-libgloss
-@@ -1960,6 +1978,7 @@ installcheck-target: maybe-installcheck-
+@@ -1963,6 +1981,7 @@ installcheck-target: maybe-installcheck-
  installcheck-target: maybe-installcheck-target-libgfortran
  installcheck-target: maybe-installcheck-target-libobjc
  installcheck-target: maybe-installcheck-target-libgo
@@ -366,7 +366,7 @@ Index: b/src/Makefile.in
  installcheck-target: maybe-installcheck-target-libtermcap
  installcheck-target: maybe-installcheck-target-winsup
  installcheck-target: maybe-installcheck-target-libgloss
-@@ -2051,6 +2070,7 @@ mostlyclean-target: maybe-mostlyclean-ta
+@@ -2054,6 +2073,7 @@ mostlyclean-target: maybe-mostlyclean-ta
  mostlyclean-target: maybe-mostlyclean-target-libgfortran
  mostlyclean-target: maybe-mostlyclean-target-libobjc
  mostlyclean-target: maybe-mostlyclean-target-libgo
@@ -374,7 +374,7 @@ Index: b/src/Makefile.in
  mostlyclean-target: maybe-mostlyclean-target-libtermcap
  mostlyclean-target: maybe-mostlyclean-target-winsup
  mostlyclean-target: maybe-mostlyclean-target-libgloss
-@@ -2142,6 +2162,7 @@ clean-target: maybe-clean-target-libquad
+@@ -2145,6 +2165,7 @@ clean-target: maybe-clean-target-libquad
  clean-target: maybe-clean-target-libgfortran
  clean-target: maybe-clean-target-libobjc
  clean-target: maybe-clean-target-libgo
@@ -382,7 +382,7 @@ Index: b/src/Makefile.in
  clean-target: maybe-clean-target-libtermcap
  clean-target: maybe-clean-target-winsup
  clean-target: maybe-clean-target-libgloss
-@@ -2233,6 +2254,7 @@ distclean-target: maybe-distclean-target
+@@ -2236,6 +2257,7 @@ distclean-target: maybe-distclean-target
  distclean-target: maybe-distclean-target-libgfortran
  distclean-target: maybe-distclean-target-libobjc
  distclean-target: maybe-distclean-target-libgo
@@ -390,7 +390,7 @@ Index: b/src/Makefile.in
  distclean-target: maybe-distclean-target-libtermcap
  distclean-target: maybe-distclean-target-winsup
  distclean-target: maybe-distclean-target-libgloss
-@@ -2324,6 +2346,7 @@ maintainer-clean-target: maybe-maintaine
+@@ -2327,6 +2349,7 @@ maintainer-clean-target: maybe-maintaine
  maintainer-clean-target: maybe-maintainer-clean-target-libgfortran
  maintainer-clean-target: maybe-maintainer-clean-target-libobjc
  maintainer-clean-target: maybe-maintainer-clean-target-libgo
@@ -398,7 +398,7 @@ Index: b/src/Makefile.in
  maintainer-clean-target: maybe-maintainer-clean-target-libtermcap
  maintainer-clean-target: maybe-maintainer-clean-target-winsup
  maintainer-clean-target: maybe-maintainer-clean-target-libgloss
-@@ -2470,6 +2493,7 @@ check-target:  \
+@@ -2473,6 +2496,7 @@ check-target:  \
      maybe-check-target-libgfortran \
      maybe-check-target-libobjc \
      maybe-check-target-libgo \
@@ -406,7 +406,7 @@ Index: b/src/Makefile.in
      maybe-check-target-libtermcap \
      maybe-check-target-winsup \
      maybe-check-target-libgloss \
-@@ -2657,6 +2681,7 @@ install-target:  \
+@@ -2660,6 +2684,7 @@ install-target:  \
      maybe-install-target-libgfortran \
      maybe-install-target-libobjc \
      maybe-install-target-libgo \
@@ -414,7 +414,7 @@ Index: b/src/Makefile.in
      maybe-install-target-libtermcap \
      maybe-install-target-winsup \
      maybe-install-target-libgloss \
-@@ -2768,6 +2793,7 @@ install-strip-target:  \
+@@ -2771,6 +2796,7 @@ install-strip-target:  \
      maybe-install-strip-target-libgfortran \
      maybe-install-strip-target-libobjc \
      maybe-install-strip-target-libgo \
@@ -422,7 +422,7 @@ Index: b/src/Makefile.in
      maybe-install-strip-target-libtermcap \
      maybe-install-strip-target-winsup \
      maybe-install-strip-target-libgloss \
-@@ -41718,6 +41744,464 @@ maintainer-clean-target-libgo:
+@@ -41721,6 +41747,464 @@ maintainer-clean-target-libgo:
  
  
  
@@ -887,7 +887,7 @@ Index: b/src/Makefile.in
  .PHONY: configure-target-libtermcap maybe-configure-target-libtermcap
  maybe-configure-target-libtermcap:
  @if gcc-bootstrap
-@@ -49137,6 +49621,14 @@ check-gcc-go:
+@@ -49140,6 +49624,14 @@ check-gcc-go:
  	(cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-go);
  check-go: check-gcc-go check-target-libgo
  
@@ -902,7 +902,7 @@ Index: b/src/Makefile.in
  
  # The gcc part of install-no-fixedincludes, which relies on an intimate
  # knowledge of how a number of gcc internal targets (inter)operate.  Delegate.
-@@ -51343,6 +51835,7 @@ configure-target-libquadmath: stage_last
+@@ -51346,6 +51838,7 @@ configure-target-libquadmath: stage_last
  configure-target-libgfortran: stage_last
  configure-target-libobjc: stage_last
  configure-target-libgo: stage_last
@@ -910,7 +910,7 @@ Index: b/src/Makefile.in
  configure-target-libtermcap: stage_last
  configure-target-winsup: stage_last
  configure-target-libgloss: stage_last
-@@ -51381,6 +51874,7 @@ configure-target-libquadmath: maybe-all-
+@@ -51384,6 +51877,7 @@ configure-target-libquadmath: maybe-all-
  configure-target-libgfortran: maybe-all-gcc
  configure-target-libobjc: maybe-all-gcc
  configure-target-libgo: maybe-all-gcc
@@ -918,7 +918,7 @@ Index: b/src/Makefile.in
  configure-target-libtermcap: maybe-all-gcc
  configure-target-winsup: maybe-all-gcc
  configure-target-libgloss: maybe-all-gcc
-@@ -52242,6 +52736,8 @@ configure-target-libgo: maybe-all-target
+@@ -52245,6 +52739,8 @@ configure-target-libgo: maybe-all-target
  all-target-libgo: maybe-all-target-libbacktrace
  all-target-libgo: maybe-all-target-libffi
  all-target-libgo: maybe-all-target-libatomic
@@ -927,7 +927,7 @@ Index: b/src/Makefile.in
  configure-target-libjava: maybe-configure-target-zlib
  configure-target-libjava: maybe-configure-target-boehm-gc
  configure-target-libjava: maybe-configure-target-libffi
-@@ -52360,6 +52856,7 @@ configure-target-libquadmath: maybe-all-
+@@ -52363,6 +52859,7 @@ configure-target-libquadmath: maybe-all-
  configure-target-libgfortran: maybe-all-target-libgcc
  configure-target-libobjc: maybe-all-target-libgcc
  configure-target-libgo: maybe-all-target-libgcc
@@ -935,7 +935,7 @@ Index: b/src/Makefile.in
  configure-target-libtermcap: maybe-all-target-libgcc
  configure-target-winsup: maybe-all-target-libgcc
  configure-target-libgloss: maybe-all-target-libgcc
-@@ -52407,6 +52904,8 @@ configure-target-libobjc: maybe-all-targ
+@@ -52410,6 +52907,8 @@ configure-target-libobjc: maybe-all-targ
  
  configure-target-libgo: maybe-all-target-newlib maybe-all-target-libgloss
  
diff --git a/debian/patches/gdc-versym-cpu.diff b/debian/patches/gdc-versym-cpu.diff
index 2008633..b2a721f 100644
--- a/debian/patches/gdc-versym-cpu.diff
+++ b/debian/patches/gdc-versym-cpu.diff
@@ -130,7 +130,7 @@ Index: b/src/gcc/config/i386/i386.h
 ===================================================================
 --- a/src/gcc/config/i386/i386.h
 +++ b/src/gcc/config/i386/i386.h
-@@ -657,6 +657,24 @@ extern const char *host_detect_local_cpu
+@@ -662,6 +662,24 @@ extern const char *host_detect_local_cpu
  /* Target CPU builtins.  */
  #define TARGET_CPU_CPP_BUILTINS() ix86_target_macros ()
  
@@ -261,7 +261,7 @@ Index: b/src/gcc/config/rs6000/rs6000.h
 ===================================================================
 --- a/src/gcc/config/rs6000/rs6000.h
 +++ b/src/gcc/config/rs6000/rs6000.h
-@@ -763,6 +763,28 @@ extern unsigned char rs6000_recip_bits[]
+@@ -764,6 +764,28 @@ extern unsigned char rs6000_recip_bits[]
  #define TARGET_CPU_CPP_BUILTINS() \
    rs6000_cpu_cpp_builtins (pfile)
  
@@ -294,7 +294,7 @@ Index: b/src/gcc/config/s390/s390.h
 ===================================================================
 --- a/src/gcc/config/s390/s390.h
 +++ b/src/gcc/config/s390/s390.h
-@@ -175,6 +175,22 @@ enum processor_flags
+@@ -177,6 +177,22 @@ enum processor_flags
  /* Target CPU builtins.  */
  #define TARGET_CPU_CPP_BUILTINS() s390_cpu_cpp_builtins (pfile)
  
diff --git a/debian/patches/gdc-versym-os.diff b/debian/patches/gdc-versym-os.diff
index 6ac6fe4..2c3b297 100644
--- a/debian/patches/gdc-versym-os.diff
+++ b/debian/patches/gdc-versym-os.diff
@@ -77,7 +77,7 @@ Index: b/src/gcc/config/darwin.h
 ===================================================================
 --- a/src/gcc/config/darwin.h
 +++ b/src/gcc/config/darwin.h
-@@ -932,4 +932,10 @@ extern void darwin_driver_init (unsigned
+@@ -933,4 +933,10 @@ extern void darwin_driver_init (unsigned
     fall-back default.  */
  #define DEF_MIN_OSX_VERSION "10.5"
  
@@ -410,7 +410,7 @@ Index: b/src/gcc/config/rs6000/linux64.h
 ===================================================================
 --- a/src/gcc/config/rs6000/linux64.h
 +++ b/src/gcc/config/rs6000/linux64.h
-@@ -388,6 +388,17 @@ extern int dot_symbols;
+@@ -391,6 +391,17 @@ extern int dot_symbols;
      }							\
    while (0)
  
diff --git a/debian/patches/go-testsuite.diff b/debian/patches/go-testsuite.diff
index 6a8eba8..4f486c9 100644
--- a/debian/patches/go-testsuite.diff
+++ b/debian/patches/go-testsuite.diff
@@ -4,7 +4,7 @@ Index: b/src/gcc/testsuite/go.test/go-test.exp
 ===================================================================
 --- a/src/gcc/testsuite/go.test/go-test.exp
 +++ b/src/gcc/testsuite/go.test/go-test.exp
-@@ -403,6 +403,14 @@ proc go-gc-tests { } {
+@@ -404,6 +404,14 @@ proc go-gc-tests { } {
  	    continue
  	}
  
diff --git a/debian/patches/libgnatprj-cross-hack.diff b/debian/patches/libgnatprj-cross-hack.diff
index fe72ab6..b47440a 100644
--- a/debian/patches/libgnatprj-cross-hack.diff
+++ b/debian/patches/libgnatprj-cross-hack.diff
@@ -7,7 +7,7 @@ Index: b/src/gcc/wide-int.h
 ===================================================================
 --- a/src/gcc/wide-int.h
 +++ b/src/gcc/wide-int.h
-@@ -3104,8 +3104,10 @@ namespace wi
+@@ -3106,8 +3106,10 @@ namespace wi
    wide_int from_buffer (const unsigned char *, unsigned int);
  
  #ifndef GENERATOR_FILE
@@ -22,7 +22,7 @@ Index: b/src/gcc/system.h
 ===================================================================
 --- a/src/gcc/system.h
 +++ b/src/gcc/system.h
-@@ -661,8 +661,10 @@ extern int vsnprintf (char *, size_t, co
+@@ -666,8 +666,10 @@ extern int vsnprintf (char *, size_t, co
  
  /* Do not introduce a gmp.h dependency on the build system.  */
  #ifndef GENERATOR_FILE
diff --git a/debian/patches/libgo-setcontext-config.diff b/debian/patches/libgo-setcontext-config.diff
index 4ace34d..e9430cd 100644
--- a/debian/patches/libgo-setcontext-config.diff
+++ b/debian/patches/libgo-setcontext-config.diff
@@ -4,7 +4,7 @@ Index: b/src/libgo/configure.ac
 ===================================================================
 --- a/src/libgo/configure.ac
 +++ b/src/libgo/configure.ac
-@@ -784,6 +784,14 @@ main ()
+@@ -785,6 +785,14 @@ main ()
  CFLAGS="$CFLAGS_hold"
  LIBS="$LIBS_hold"
  ])
diff --git a/debian/patches/libgo-testsuite.diff b/debian/patches/libgo-testsuite.diff
index 08c9125..34977ce 100644
--- a/debian/patches/libgo-testsuite.diff
+++ b/debian/patches/libgo-testsuite.diff
@@ -4,7 +4,7 @@ Index: b/src/libgo/Makefile.am
 ===================================================================
 --- a/src/libgo/Makefile.am
 +++ b/src/libgo/Makefile.am
-@@ -2354,6 +2354,12 @@ CHECK = \
+@@ -2387,6 +2387,12 @@ CHECK = \
  	export LD_LIBRARY_PATH; \
  	$(MKDIR_P) $(@D); \
  	rm -f $@-testsum $@-testlog; \
@@ -17,7 +17,7 @@ Index: b/src/libgo/Makefile.am
  	if test "$(USE_DEJAGNU)" = "yes"; then \
  	  $(SHELL) $(srcdir)/testsuite/gotest --goarch=$(GOARCH) --goos=$(GOOS) --dejagnu=yes --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --pkgpath="$(@D)" --pkgfiles="$(go_$(subst /,_,$(@D))_files)" --testname="$(@D)" $(GOTESTFLAGS) $(go_$(subst /,_,$(@D))_test_files); \
  	elif test "$(GOBENCH)" != ""; then \
-@@ -2369,6 +2375,7 @@ CHECK = \
+@@ -2402,6 +2408,7 @@ CHECK = \
  	    echo "FAIL: $(@D)" > $@-testsum; \
  	    exit 1; \
  	  fi; \
@@ -29,7 +29,7 @@ Index: b/src/libgo/Makefile.in
 ===================================================================
 --- a/src/libgo/Makefile.in
 +++ b/src/libgo/Makefile.in
-@@ -2374,6 +2374,12 @@ CHECK = \
+@@ -2394,6 +2394,12 @@ CHECK = \
  	export LD_LIBRARY_PATH; \
  	$(MKDIR_P) $(@D); \
  	rm -f $@-testsum $@-testlog; \
@@ -42,7 +42,7 @@ Index: b/src/libgo/Makefile.in
  	if test "$(USE_DEJAGNU)" = "yes"; then \
  	  $(SHELL) $(srcdir)/testsuite/gotest --goarch=$(GOARCH) --goos=$(GOOS) --dejagnu=yes --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --pkgpath="$(@D)" --pkgfiles="$(go_$(subst /,_,$(@D))_files)" --testname="$(@D)" $(GOTESTFLAGS) $(go_$(subst /,_,$(@D))_test_files); \
  	elif test "$(GOBENCH)" != ""; then \
-@@ -2389,6 +2395,7 @@ CHECK = \
+@@ -2409,6 +2415,7 @@ CHECK = \
  	    echo "FAIL: $(@D)" > $@-testsum; \
  	    exit 1; \
  	  fi; \
diff --git a/debian/patches/libstdc++-man-3cxx.diff b/debian/patches/libstdc++-man-3cxx.diff
index 0109e5c..de2e36b 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
-@@ -1936,7 +1936,7 @@ MAN_OUTPUT             = man
+@@ -1968,7 +1968,7 @@ MAN_OUTPUT             = man
  # The default value is: .3.
  # This tag requires that the tag GENERATE_MAN is set to YES.
  
@@ -54,7 +54,7 @@ Index: b/src/libstdc++-v3/scripts/run_doxygen
  for f in $problematic; do
      sed 's/Definition at line/\
  .PP\
-@@ -391,8 +394,8 @@ for f in ios streambuf istream ostream i
+@@ -408,8 +411,8 @@ for f in ios streambuf istream ostream i
  	 istringstream ostringstream stringstream filebuf ifstream \
  	 ofstream fstream string;
  do
diff --git a/debian/patches/pr66368.diff b/debian/patches/pr66368.diff
index f8dfe0b..8493272 100644
--- a/debian/patches/pr66368.diff
+++ b/debian/patches/pr66368.diff
@@ -16,7 +16,7 @@ Index: b/src/libgo/Makefile.in
 ===================================================================
 --- a/src/libgo/Makefile.in
 +++ b/src/libgo/Makefile.in
-@@ -512,6 +512,7 @@ WARN_CFLAGS = $(WARN_FLAGS) $(WERROR)
+@@ -513,6 +513,7 @@ WARN_CFLAGS = $(WARN_FLAGS) $(WERROR)
  AM_CPPFLAGS = -I $(srcdir)/runtime $(LIBFFIINCS) $(PTHREAD_CFLAGS)
  ACLOCAL_AMFLAGS = -I ./config -I ../config
  AM_CFLAGS = -fexceptions -fnon-call-exceptions -fplan9-extensions \
diff --git a/debian/patches/skip-bootstrap-multilib.diff b/debian/patches/skip-bootstrap-multilib.diff
index 1be643e..364125e 100644
--- a/debian/patches/skip-bootstrap-multilib.diff
+++ b/debian/patches/skip-bootstrap-multilib.diff
@@ -26,7 +26,7 @@ Index: b/src/libstdc++-v3/acinclude.m4
 ===================================================================
 --- a/src/libstdc++-v3/acinclude.m4
 +++ b/src/libstdc++-v3/acinclude.m4
-@@ -2762,7 +2762,20 @@ dnl
+@@ -2843,7 +2843,20 @@ dnl
  AC_DEFUN([GLIBCXX_ENABLE_DEBUG], [
    AC_MSG_CHECKING([for additional debug build])
    GLIBCXX_ENABLE(libstdcxx-debug,$1,,[build extra debug library])
diff --git a/debian/patches/sparc-force-cpu.diff b/debian/patches/sparc-force-cpu.diff
index 944decb..4f5b7f1 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
-@@ -4516,6 +4516,20 @@ do
+@@ -4537,6 +4537,20 @@ do
  			;;
  		esac
  
diff --git a/debian/patches/sys-auxv-header.diff b/debian/patches/sys-auxv-header.diff
index 6d6127b..d013f54 100644
--- a/debian/patches/sys-auxv-header.diff
+++ b/debian/patches/sys-auxv-header.diff
@@ -4,7 +4,7 @@ Index: b/src/gcc/configure.ac
 ===================================================================
 --- a/src/gcc/configure.ac
 +++ b/src/gcc/configure.ac
-@@ -1065,6 +1065,7 @@ AC_HEADER_TIOCGWINSZ
+@@ -1086,6 +1086,7 @@ AC_HEADER_TIOCGWINSZ
  AC_CHECK_HEADERS(limits.h stddef.h string.h strings.h stdlib.h time.h iconv.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 \
@@ -16,7 +16,7 @@ Index: b/src/gcc/config.in
 ===================================================================
 --- a/src/gcc/config.in
 +++ b/src/gcc/config.in
-@@ -1711,6 +1711,12 @@
+@@ -1717,6 +1717,12 @@
  #endif
  
  

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



More information about the Reproducible-commits mailing list