[gcc-7] 163/354: - Refresh patches for 7.1.0 release

Ximin Luo infinity0 at debian.org
Thu Nov 23 15:50:46 UTC 2017


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

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

commit 2d3614688ec7ff56a384d054ba4d0544b5ffa05a
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Tue May 2 14:20:12 2017 +0000

     - Refresh patches for 7.1.0 release
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9420 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/patches/ada-arm.diff                       |   2 +-
 debian/patches/ada-changes-in-autogen-output.diff | 102 +++++++++++-----------
 debian/patches/ada-gnattools-cross.diff           |  18 ++--
 debian/patches/ada-sjlj.diff                      |  38 +++++---
 debian/patches/g++-multiarch-incdir.diff          |   6 +-
 debian/patches/gcc-driver-extra-langs.diff        |   2 +-
 debian/patches/gcc-fuse-ld-lld.diff               |  32 +++----
 debian/patches/gcc-gfdl-build.diff                |   2 +-
 debian/patches/gcc-textdomain.diff                |   2 +-
 debian/patches/gdc-7.diff                         |  12 +--
 debian/patches/gdc-libphobos-build.diff           |  68 ++++++++-------
 debian/patches/gdc-profiledbuild.diff             |   4 +-
 debian/patches/gdc-updates.diff                   |   2 +-
 debian/patches/gdc-versym-cpu.diff                |   4 +-
 debian/patches/skip-bootstrap-multilib.diff       |   2 +-
 15 files changed, 158 insertions(+), 138 deletions(-)

diff --git a/debian/patches/ada-arm.diff b/debian/patches/ada-arm.diff
index 1a43eaa..565a080 100644
--- a/debian/patches/ada-arm.diff
+++ b/debian/patches/ada-arm.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
-@@ -1958,7 +1958,10 @@ ifeq ($(strip $(filter-out arm% linux-gn
+@@ -1957,7 +1957,10 @@ ifeq ($(strip $(filter-out arm% linux-gn
    ifeq ($(strip $(filter-out arm%b,$(target_cpu))),)
      EH_MECHANISM=
    else
diff --git a/debian/patches/ada-changes-in-autogen-output.diff b/debian/patches/ada-changes-in-autogen-output.diff
index 635ba90..79249dc 100644
--- a/debian/patches/ada-changes-in-autogen-output.diff
+++ b/debian/patches/ada-changes-in-autogen-output.diff
@@ -13,9 +13,11 @@ Please update it when necessary.
 # quilt refresh --no-timestamps --no-index -pab
 # quilt push -a
 
+Index: b/src/Makefile.in
+===================================================================
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -999,6 +999,8 @@ configure-target:  \
+@@ -1008,6 +1008,8 @@ configure-target:  \
      maybe-configure-target-zlib \
      maybe-configure-target-rda \
      maybe-configure-target-libada \
@@ -24,7 +26,7 @@ Please update it when necessary.
      maybe-configure-target-libgomp \
      maybe-configure-target-libitm \
      maybe-configure-target-libatomic
-@@ -1165,6 +1167,8 @@ all-target: maybe-all-target-libffi
+@@ -1175,6 +1177,8 @@ all-target: maybe-all-target-libffi
  all-target: maybe-all-target-zlib
  all-target: maybe-all-target-rda
  all-target: maybe-all-target-libada
@@ -33,7 +35,7 @@ Please update it when necessary.
  @if target-libgomp-no-bootstrap
  all-target: maybe-all-target-libgomp
  @endif target-libgomp-no-bootstrap
-@@ -1258,6 +1262,8 @@ info-target: maybe-info-target-libffi
+@@ -1269,6 +1273,8 @@ info-target: maybe-info-target-libffi
  info-target: maybe-info-target-zlib
  info-target: maybe-info-target-rda
  info-target: maybe-info-target-libada
@@ -42,7 +44,7 @@ Please update it when necessary.
  info-target: maybe-info-target-libgomp
  info-target: maybe-info-target-libitm
  info-target: maybe-info-target-libatomic
-@@ -1344,6 +1350,8 @@ dvi-target: maybe-dvi-target-libffi
+@@ -1356,6 +1362,8 @@ dvi-target: maybe-dvi-target-libffi
  dvi-target: maybe-dvi-target-zlib
  dvi-target: maybe-dvi-target-rda
  dvi-target: maybe-dvi-target-libada
@@ -51,7 +53,7 @@ Please update it when necessary.
  dvi-target: maybe-dvi-target-libgomp
  dvi-target: maybe-dvi-target-libitm
  dvi-target: maybe-dvi-target-libatomic
-@@ -1430,6 +1438,8 @@ pdf-target: maybe-pdf-target-libffi
+@@ -1443,6 +1451,8 @@ pdf-target: maybe-pdf-target-libffi
  pdf-target: maybe-pdf-target-zlib
  pdf-target: maybe-pdf-target-rda
  pdf-target: maybe-pdf-target-libada
@@ -60,7 +62,7 @@ Please update it when necessary.
  pdf-target: maybe-pdf-target-libgomp
  pdf-target: maybe-pdf-target-libitm
  pdf-target: maybe-pdf-target-libatomic
-@@ -1516,6 +1526,8 @@ html-target: maybe-html-target-libffi
+@@ -1530,6 +1540,8 @@ html-target: maybe-html-target-libffi
  html-target: maybe-html-target-zlib
  html-target: maybe-html-target-rda
  html-target: maybe-html-target-libada
@@ -69,7 +71,7 @@ Please update it when necessary.
  html-target: maybe-html-target-libgomp
  html-target: maybe-html-target-libitm
  html-target: maybe-html-target-libatomic
-@@ -1602,6 +1614,8 @@ TAGS-target: maybe-TAGS-target-libffi
+@@ -1617,6 +1629,8 @@ TAGS-target: maybe-TAGS-target-libffi
  TAGS-target: maybe-TAGS-target-zlib
  TAGS-target: maybe-TAGS-target-rda
  TAGS-target: maybe-TAGS-target-libada
@@ -78,7 +80,7 @@ Please update it when necessary.
  TAGS-target: maybe-TAGS-target-libgomp
  TAGS-target: maybe-TAGS-target-libitm
  TAGS-target: maybe-TAGS-target-libatomic
-@@ -1688,6 +1702,8 @@ install-info-target: maybe-install-info-
+@@ -1704,6 +1718,8 @@ install-info-target: maybe-install-info-
  install-info-target: maybe-install-info-target-zlib
  install-info-target: maybe-install-info-target-rda
  install-info-target: maybe-install-info-target-libada
@@ -87,7 +89,7 @@ Please update it when necessary.
  install-info-target: maybe-install-info-target-libgomp
  install-info-target: maybe-install-info-target-libitm
  install-info-target: maybe-install-info-target-libatomic
-@@ -1774,6 +1790,8 @@ install-pdf-target: maybe-install-pdf-ta
+@@ -1791,6 +1807,8 @@ install-pdf-target: maybe-install-pdf-ta
  install-pdf-target: maybe-install-pdf-target-zlib
  install-pdf-target: maybe-install-pdf-target-rda
  install-pdf-target: maybe-install-pdf-target-libada
@@ -96,7 +98,7 @@ Please update it when necessary.
  install-pdf-target: maybe-install-pdf-target-libgomp
  install-pdf-target: maybe-install-pdf-target-libitm
  install-pdf-target: maybe-install-pdf-target-libatomic
-@@ -1860,6 +1878,8 @@ install-html-target: maybe-install-html-
+@@ -1878,6 +1896,8 @@ install-html-target: maybe-install-html-
  install-html-target: maybe-install-html-target-zlib
  install-html-target: maybe-install-html-target-rda
  install-html-target: maybe-install-html-target-libada
@@ -105,7 +107,7 @@ Please update it when necessary.
  install-html-target: maybe-install-html-target-libgomp
  install-html-target: maybe-install-html-target-libitm
  install-html-target: maybe-install-html-target-libatomic
-@@ -1946,6 +1966,8 @@ installcheck-target: maybe-installcheck-
+@@ -1965,6 +1985,8 @@ installcheck-target: maybe-installcheck-
  installcheck-target: maybe-installcheck-target-zlib
  installcheck-target: maybe-installcheck-target-rda
  installcheck-target: maybe-installcheck-target-libada
@@ -114,7 +116,7 @@ Please update it when necessary.
  installcheck-target: maybe-installcheck-target-libgomp
  installcheck-target: maybe-installcheck-target-libitm
  installcheck-target: maybe-installcheck-target-libatomic
-@@ -2032,6 +2054,8 @@ mostlyclean-target: maybe-mostlyclean-ta
+@@ -2052,6 +2074,8 @@ mostlyclean-target: maybe-mostlyclean-ta
  mostlyclean-target: maybe-mostlyclean-target-zlib
  mostlyclean-target: maybe-mostlyclean-target-rda
  mostlyclean-target: maybe-mostlyclean-target-libada
@@ -123,7 +125,7 @@ Please update it when necessary.
  mostlyclean-target: maybe-mostlyclean-target-libgomp
  mostlyclean-target: maybe-mostlyclean-target-libitm
  mostlyclean-target: maybe-mostlyclean-target-libatomic
-@@ -2118,6 +2142,8 @@ clean-target: maybe-clean-target-libffi
+@@ -2139,6 +2163,8 @@ clean-target: maybe-clean-target-libffi
  clean-target: maybe-clean-target-zlib
  clean-target: maybe-clean-target-rda
  clean-target: maybe-clean-target-libada
@@ -132,7 +134,7 @@ Please update it when necessary.
  clean-target: maybe-clean-target-libgomp
  clean-target: maybe-clean-target-libitm
  clean-target: maybe-clean-target-libatomic
-@@ -2204,6 +2230,8 @@ distclean-target: maybe-distclean-target
+@@ -2226,6 +2252,8 @@ distclean-target: maybe-distclean-target
  distclean-target: maybe-distclean-target-zlib
  distclean-target: maybe-distclean-target-rda
  distclean-target: maybe-distclean-target-libada
@@ -141,7 +143,7 @@ Please update it when necessary.
  distclean-target: maybe-distclean-target-libgomp
  distclean-target: maybe-distclean-target-libitm
  distclean-target: maybe-distclean-target-libatomic
-@@ -2290,6 +2318,8 @@ maintainer-clean-target: maybe-maintaine
+@@ -2313,6 +2341,8 @@ maintainer-clean-target: maybe-maintaine
  maintainer-clean-target: maybe-maintainer-clean-target-zlib
  maintainer-clean-target: maybe-maintainer-clean-target-rda
  maintainer-clean-target: maybe-maintainer-clean-target-libada
@@ -150,7 +152,7 @@ Please update it when necessary.
  maintainer-clean-target: maybe-maintainer-clean-target-libgomp
  maintainer-clean-target: maybe-maintainer-clean-target-libitm
  maintainer-clean-target: maybe-maintainer-clean-target-libatomic
-@@ -2432,6 +2462,8 @@ check-target:  \
+@@ -2456,6 +2486,8 @@ check-target:  \
      maybe-check-target-zlib \
      maybe-check-target-rda \
      maybe-check-target-libada \
@@ -159,7 +161,7 @@ Please update it when necessary.
      maybe-check-target-libgomp \
      maybe-check-target-libitm \
      maybe-check-target-libatomic
-@@ -2614,6 +2646,8 @@ install-target:  \
+@@ -2639,6 +2671,8 @@ install-target:  \
      maybe-install-target-zlib \
      maybe-install-target-rda \
      maybe-install-target-libada \
@@ -168,7 +170,7 @@ Please update it when necessary.
      maybe-install-target-libgomp \
      maybe-install-target-libitm \
      maybe-install-target-libatomic
-@@ -2720,6 +2754,8 @@ install-strip-target:  \
+@@ -2746,6 +2780,8 @@ install-strip-target:  \
      maybe-install-strip-target-zlib \
      maybe-install-strip-target-rda \
      maybe-install-strip-target-libada \
@@ -177,7 +179,7 @@ Please update it when necessary.
      maybe-install-strip-target-libgomp \
      maybe-install-strip-target-libitm \
      maybe-install-strip-target-libatomic
-@@ -33908,12 +33944,6 @@ maybe-check-gnattools:
+@@ -33934,12 +33970,6 @@ maybe-check-gnattools:
  maybe-check-gnattools: check-gnattools
  
  check-gnattools:
@@ -190,7 +192,7 @@ Please update it when necessary.
  
  @endif gnattools
  
-@@ -33954,24 +33984,8 @@ maybe-info-gnattools:
+@@ -33980,24 +34010,8 @@ maybe-info-gnattools:
  @if gnattools
  maybe-info-gnattools: info-gnattools
  
@@ -217,7 +219,7 @@ Please update it when necessary.
  
  @endif gnattools
  
-@@ -33980,24 +33994,8 @@ maybe-dvi-gnattools:
+@@ -34006,24 +34020,8 @@ maybe-dvi-gnattools:
  @if gnattools
  maybe-dvi-gnattools: dvi-gnattools
  
@@ -244,7 +246,7 @@ Please update it when necessary.
  
  @endif gnattools
  
-@@ -34006,24 +34004,8 @@ maybe-pdf-gnattools:
+@@ -34032,24 +34030,8 @@ maybe-pdf-gnattools:
  @if gnattools
  maybe-pdf-gnattools: pdf-gnattools
  
@@ -271,7 +273,7 @@ Please update it when necessary.
  
  @endif gnattools
  
-@@ -34032,24 +34014,8 @@ maybe-html-gnattools:
+@@ -34058,24 +34040,8 @@ maybe-html-gnattools:
  @if gnattools
  maybe-html-gnattools: html-gnattools
  
@@ -298,7 +300,7 @@ Please update it when necessary.
  
  @endif gnattools
  
-@@ -34058,24 +34024,8 @@ maybe-TAGS-gnattools:
+@@ -34084,24 +34050,8 @@ maybe-TAGS-gnattools:
  @if gnattools
  maybe-TAGS-gnattools: TAGS-gnattools
  
@@ -325,7 +327,7 @@ Please update it when necessary.
  
  @endif gnattools
  
-@@ -34084,25 +34034,8 @@ maybe-install-info-gnattools:
+@@ -34110,25 +34060,8 @@ maybe-install-info-gnattools:
  @if gnattools
  maybe-install-info-gnattools: install-info-gnattools
  
@@ -353,7 +355,7 @@ Please update it when necessary.
  
  @endif gnattools
  
-@@ -34111,25 +34044,8 @@ maybe-install-pdf-gnattools:
+@@ -34137,25 +34070,8 @@ maybe-install-pdf-gnattools:
  @if gnattools
  maybe-install-pdf-gnattools: install-pdf-gnattools
  
@@ -381,7 +383,7 @@ Please update it when necessary.
  
  @endif gnattools
  
-@@ -34138,25 +34054,8 @@ maybe-install-html-gnattools:
+@@ -34164,25 +34080,8 @@ maybe-install-html-gnattools:
  @if gnattools
  maybe-install-html-gnattools: install-html-gnattools
  
@@ -409,7 +411,7 @@ Please update it when necessary.
  
  @endif gnattools
  
-@@ -34165,24 +34064,8 @@ maybe-installcheck-gnattools:
+@@ -34191,24 +34090,8 @@ maybe-installcheck-gnattools:
  @if gnattools
  maybe-installcheck-gnattools: installcheck-gnattools
  
@@ -436,7 +438,7 @@ Please update it when necessary.
  
  @endif gnattools
  
-@@ -49313,13 +49196,8 @@ maybe-check-target-libada:
+@@ -49797,13 +49680,8 @@ maybe-check-target-libada:
  @if target-libada
  maybe-check-target-libada: check-target-libada
  
@@ -451,7 +453,7 @@ Please update it when necessary.
  
  @endif target-libada
  
-@@ -49328,13 +49206,8 @@ maybe-install-target-libada:
+@@ -49812,13 +49690,8 @@ maybe-install-target-libada:
  @if target-libada
  maybe-install-target-libada: install-target-libada
  
@@ -467,7 +469,7 @@ Please update it when necessary.
  
  @endif target-libada
  
-@@ -49343,13 +49216,8 @@ maybe-install-strip-target-libada:
+@@ -49827,13 +49700,8 @@ maybe-install-strip-target-libada:
  @if target-libada
  maybe-install-strip-target-libada: install-strip-target-libada
  
@@ -483,7 +485,7 @@ Please update it when necessary.
  
  @endif target-libada
  
-@@ -49360,14 +49228,103 @@ maybe-info-target-libada:
+@@ -49844,14 +49712,103 @@ maybe-info-target-libada:
  @if target-libada
  maybe-info-target-libada: info-target-libada
  
@@ -590,7 +592,7 @@ Please update it when necessary.
  	for flag in $(EXTRA_TARGET_FLAGS); do \
  	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
  	done; \
-@@ -49376,24 +49333,23 @@ info-target-libada: \
+@@ -49860,24 +49817,23 @@ info-target-libada: \
  	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
  	          "RANLIB=$${RANLIB}" \
  	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
@@ -621,7 +623,7 @@ Please update it when necessary.
  	for flag in $(EXTRA_TARGET_FLAGS); do \
  	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
  	done; \
-@@ -49402,24 +49358,23 @@ dvi-target-libada: \
+@@ -49886,24 +49842,23 @@ dvi-target-libada: \
  	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
  	          "RANLIB=$${RANLIB}" \
  	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
@@ -652,7 +654,7 @@ Please update it when necessary.
  	for flag in $(EXTRA_TARGET_FLAGS); do \
  	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
  	done; \
-@@ -49428,24 +49383,23 @@ pdf-target-libada: \
+@@ -49912,24 +49867,23 @@ pdf-target-libada: \
  	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
  	          "RANLIB=$${RANLIB}" \
  	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
@@ -683,7 +685,7 @@ Please update it when necessary.
  	for flag in $(EXTRA_TARGET_FLAGS); do \
  	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
  	done; \
-@@ -49454,28 +49408,559 @@ html-target-libada: \
+@@ -49938,28 +49892,559 @@ html-target-libada: \
  	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
  	          "RANLIB=$${RANLIB}" \
  	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
@@ -1253,7 +1255,7 @@ Please update it when necessary.
  	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
  	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
  	          "RANLIB=$${RANLIB}" \
-@@ -49483,26 +49968,26 @@ TAGS-target-libada: \
+@@ -49967,26 +50452,26 @@ TAGS-target-libada: \
  	           TAGS) \
  	  || exit 1
  
@@ -1291,7 +1293,7 @@ Please update it when necessary.
  	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
  	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
  	          "RANLIB=$${RANLIB}" \
-@@ -49510,26 +49995,26 @@ install-info-target-libada: \
+@@ -49994,26 +50479,26 @@ install-info-target-libada: \
  	           install-info) \
  	  || exit 1
  
@@ -1329,7 +1331,7 @@ Please update it when necessary.
  	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
  	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
  	          "RANLIB=$${RANLIB}" \
-@@ -49537,26 +50022,26 @@ install-pdf-target-libada: \
+@@ -50021,26 +50506,26 @@ install-pdf-target-libada: \
  	           install-pdf) \
  	  || exit 1
  
@@ -1367,7 +1369,7 @@ Please update it when necessary.
  	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
  	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
  	          "RANLIB=$${RANLIB}" \
-@@ -49564,25 +50049,25 @@ install-html-target-libada: \
+@@ -50048,25 +50533,25 @@ install-html-target-libada: \
  	           install-html) \
  	  || exit 1
  
@@ -1403,7 +1405,7 @@ Please update it when necessary.
  	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
  	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
  	          "RANLIB=$${RANLIB}" \
-@@ -49590,24 +50075,24 @@ installcheck-target-libada: \
+@@ -50074,24 +50559,24 @@ installcheck-target-libada: \
  	           installcheck) \
  	  || exit 1
  
@@ -1437,7 +1439,7 @@ Please update it when necessary.
  	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
  	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
  	          "RANLIB=$${RANLIB}" \
-@@ -49615,24 +50100,24 @@ mostlyclean-target-libada:
+@@ -50099,24 +50584,24 @@ mostlyclean-target-libada:
  	           mostlyclean) \
  	  || exit 1
  
@@ -1471,7 +1473,7 @@ Please update it when necessary.
  	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
  	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
  	          "RANLIB=$${RANLIB}" \
-@@ -49640,24 +50125,24 @@ clean-target-libada:
+@@ -50124,24 +50609,24 @@ clean-target-libada:
  	           clean) \
  	  || exit 1
  
@@ -1505,7 +1507,7 @@ Please update it when necessary.
  	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
  	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
  	          "RANLIB=$${RANLIB}" \
-@@ -49665,24 +50150,24 @@ distclean-target-libada:
+@@ -50149,24 +50634,24 @@ distclean-target-libada:
  	           distclean) \
  	  || exit 1
  
@@ -1539,7 +1541,7 @@ Please update it when necessary.
  	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
  	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
  	          "RANLIB=$${RANLIB}" \
-@@ -49690,7 +50175,7 @@ maintainer-clean-target-libada:
+@@ -50174,7 +50659,7 @@ maintainer-clean-target-libada:
  	           maintainer-clean) \
  	  || exit 1
  
@@ -1548,7 +1550,7 @@ Please update it when necessary.
  
  
  
-@@ -54749,6 +55234,8 @@ configure-target-libffi: stage_last
+@@ -55242,6 +55727,8 @@ configure-target-libffi: stage_last
  configure-target-zlib: stage_last
  configure-target-rda: stage_last
  configure-target-libada: stage_last
@@ -1557,7 +1559,7 @@ Please update it when necessary.
  configure-stage1-target-libgomp: maybe-all-stage1-gcc
  configure-stage2-target-libgomp: maybe-all-stage2-gcc
  configure-stage3-target-libgomp: maybe-all-stage3-gcc
-@@ -54784,6 +55271,8 @@ configure-target-libffi: maybe-all-gcc
+@@ -55278,6 +55765,8 @@ configure-target-libffi: maybe-all-gcc
  configure-target-zlib: maybe-all-gcc
  configure-target-rda: maybe-all-gcc
  configure-target-libada: maybe-all-gcc
@@ -1566,7 +1568,7 @@ Please update it when necessary.
  configure-target-libgomp: maybe-all-gcc
  configure-target-libitm: maybe-all-gcc
  configure-target-libatomic: maybe-all-gcc
-@@ -55239,8 +55728,12 @@ all-stageprofile-fixincludes: maybe-all-
+@@ -55733,8 +56222,12 @@ all-stageprofile-fixincludes: maybe-all-
  all-stagefeedback-fixincludes: maybe-all-stagefeedback-libiberty
  all-stageautoprofile-fixincludes: maybe-all-stageautoprofile-libiberty
  all-stageautofeedback-fixincludes: maybe-all-stageautofeedback-libiberty
@@ -1579,7 +1581,7 @@ Please update it when necessary.
  all-lto-plugin: maybe-all-libiberty
  
  all-stage1-lto-plugin: maybe-all-stage1-libiberty
-@@ -55937,6 +56430,8 @@ configure-target-libffi: maybe-all-targe
+@@ -56434,6 +56927,8 @@ configure-target-libffi: maybe-all-targe
  configure-target-zlib: maybe-all-target-libgcc
  configure-target-rda: maybe-all-target-libgcc
  configure-target-libada: maybe-all-target-libgcc
@@ -1588,7 +1590,7 @@ Please update it when necessary.
  configure-target-libgomp: maybe-all-target-libgcc
  configure-target-libitm: maybe-all-target-libgcc
  configure-target-libatomic: maybe-all-target-libgcc
-@@ -55987,6 +56482,10 @@ configure-target-rda: maybe-all-target-n
+@@ -56486,6 +56981,10 @@ configure-target-rda: maybe-all-target-n
  
  configure-target-libada: maybe-all-target-newlib maybe-all-target-libgloss
  
diff --git a/debian/patches/ada-gnattools-cross.diff b/debian/patches/ada-gnattools-cross.diff
index 9e34249..757e8e5 100644
--- a/debian/patches/ada-gnattools-cross.diff
+++ b/debian/patches/ada-gnattools-cross.diff
@@ -107,7 +107,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
  # HP/PA HP-UX 10
  ifeq ($(strip $(filter-out hppa% hp hpux10%,$(target_cpu) $(target_vendor) $(target_os))),)
    LIBGNAT_TARGET_PAIRS = \
-@@ -2508,24 +2540,6 @@ ADA_EXCLUDE_FILES=$(filter-out \
+@@ -2521,24 +2553,6 @@ ADA_EXCLUDE_FILES=$(filter-out \
    $(patsubst %$(objext),%.adb,$(GNATRTL_OBJS)), \
    $(ADA_EXCLUDE_SRCS))
  
@@ -132,7 +132,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
  GCC_LINK=$(CXX) $(GCC_LINK_FLAGS) $(ADA_INCLUDES) $(LDFLAGS)
  
  # Build directory for the tools. Let's copy the target-dependent
-@@ -2543,95 +2557,36 @@ GCC_LINK=$(CXX) $(GCC_LINK_FLAGS) $(ADA_
+@@ -2556,95 +2570,36 @@ GCC_LINK=$(CXX) $(GCC_LINK_FLAGS) $(ADA_
  	                tools/$(word 1,$(subst <, ,$(PAIR)));)
  	touch ../stamp-tools
  
@@ -238,7 +238,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
  
  # Note the use of the "mv" command in order to allow gnatlink to be linked with
  # with the former version of gnatlink itself which cannot override itself.
-@@ -2641,19 +2596,15 @@ gnatlink-re: ../stamp-tools gnatmake-re
+@@ -2654,19 +2609,15 @@ gnatlink-re: ../stamp-tools gnatmake-re
  	$(GNATMAKE) -j0 -c $(ADA_INCLUDES) gnatlink --GCC="$(CC) $(ALL_ADAFLAGS)"
  	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatlink
  	$(GNATLINK) -v gnatlink -o ../../gnatlinknew$(exeext) \
@@ -261,7 +261,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
  
  ../stamp-gnatlib-$(RTSDIR):
  	@if [ ! -f stamp-gnatlib-$(RTSDIR) ] ; \
-@@ -2693,14 +2644,10 @@ install-gnatlib: ../stamp-gnatlib-$(RTSD
+@@ -2706,14 +2657,10 @@ install-gnatlib: ../stamp-gnatlib-$(RTSD
  #     Also install the .dSYM directories if they exist (these directories
  #     contain the debug information for the shared libraries on darwin)
  	for file in gnat gnarl; do \
@@ -278,7 +278,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
  	   if [ -d $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext).dSYM ]; then \
  	      $(CP) -r $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext).dSYM \
  	        $(DESTDIR)$(ADA_RTL_OBJ_DIR); \
-@@ -2713,20 +2660,7 @@ install-gnatlib: ../stamp-gnatlib-$(RTSD
+@@ -2726,20 +2673,7 @@ install-gnatlib: ../stamp-gnatlib-$(RTSD
  	cd $(DESTDIR)$(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.adb
  	cd $(DESTDIR)$(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.ads
  
@@ -300,7 +300,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
  	$(MKDIR) $(RTSDIR)
  	$(CHMOD) u+w $(RTSDIR)
  # Copy target independent sources
-@@ -2790,7 +2724,7 @@ $(RTSDIR)/s-oscons.ads: ../stamp-gnatlib
+@@ -2803,7 +2737,7 @@ $(RTSDIR)/s-oscons.ads: ../stamp-gnatlib
  	    $(OSCONS_EXTRACT) ; \
  	    ../bldtools/oscons/xoscons s-oscons)
  
@@ -309,7 +309,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
  	test -f $(RTSDIR)/s-oscons.ads || exit 1
  # C files
  	$(MAKE) -C $(RTSDIR) \
-@@ -2828,32 +2762,45 @@ gnatlib: ../stamp-gnatlib1-$(RTSDIR) ../
+@@ -2841,32 +2775,45 @@ gnatlib: ../stamp-gnatlib1-$(RTSDIR) ../
  
  # Warning: this target assumes that LIBRARY_VERSION has been set correctly.
  gnatlib-shared-default:
@@ -371,7 +371,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
  
  	# Create static libgnat and libgnarl compiled with -fPIC
  	$(RM) $(RTSDIR)/libgnat_pic$(arext) $(RTSDIR)/libgnarl_pic$(arext)
-@@ -2872,21 +2819,15 @@ gnatlib-shared-dual:
+@@ -2885,21 +2832,15 @@ gnatlib-shared-dual:
  	     GNATLIBCFLAGS_FOR_C="$(GNATLIBCFLAGS_FOR_C)" \
  	     MULTISUBDIR="$(MULTISUBDIR)" \
  	     THREAD_KIND="$(THREAD_KIND)" \
@@ -396,7 +396,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
  
  gnatlib-shared-dual-win32:
  	$(MAKE) $(FLAGS_TO_PASS) \
-@@ -2896,17 +2837,15 @@ gnatlib-shared-dual-win32:
+@@ -2909,17 +2850,15 @@ gnatlib-shared-dual-win32:
  	     PICFLAG_FOR_TARGET="$(PICFLAG_FOR_TARGET)" \
  	     MULTISUBDIR="$(MULTISUBDIR)" \
  	     THREAD_KIND="$(THREAD_KIND)" \
diff --git a/debian/patches/ada-sjlj.diff b/debian/patches/ada-sjlj.diff
index d4947b6..212bee5 100644
--- a/debian/patches/ada-sjlj.diff
+++ b/debian/patches/ada-sjlj.diff
@@ -2,6 +2,8 @@
 
 # !!! Must be applied after ada-libgnatvsn.diff
 
+Index: b/src/libada-sjlj/Makefile.in
+===================================================================
 --- /dev/null
 +++ b/src/libada-sjlj/Makefile.in
 @@ -0,0 +1,201 @@
@@ -206,6 +208,8 @@
 +# Don't export variables to the environment, in order to not confuse
 +# configure.
 +.NOEXPORT:
+Index: b/src/libada-sjlj/configure.ac
+===================================================================
 --- /dev/null
 +++ b/src/libada-sjlj/configure.ac
 @@ -0,0 +1,152 @@
@@ -361,9 +365,11 @@
 +AC_CONFIG_FILES([Makefile])
 +
 +AC_OUTPUT
+Index: b/src/Makefile.def
+===================================================================
 --- a/src/Makefile.def
 +++ b/src/Makefile.def
-@@ -197,6 +197,7 @@
+@@ -197,6 +197,7 @@ target_modules = { module= libgnatvsn; n
  		   missing= TAGS;
  		   missing= install-info;
  		   missing= installcheck; };
@@ -371,7 +377,7 @@
  target_modules = { module= libgomp; bootstrap= true; lib_path=.libs; };
  target_modules = { module= libitm; lib_path=.libs; };
  target_modules = { module= libatomic; lib_path=.libs; };
-@@ -393,6 +394,7 @@
+@@ -393,6 +394,7 @@ dependencies = { module=all-libcpp; on=a
  dependencies = { module=all-fixincludes; on=all-libiberty; };
  
  dependencies = { module=all-target-libada; on=all-gcc; };
@@ -379,9 +385,11 @@
  dependencies = { module=all-gnattools; on=all-target-libada; };
  dependencies = { module=all-gnattools; on=all-target-libstdc++-v3; };
  dependencies = { module=all-gnattools; on=all-target-libgnatvsn; };
+Index: b/src/configure.ac
+===================================================================
 --- a/src/configure.ac
 +++ b/src/configure.ac
-@@ -170,6 +170,7 @@
+@@ -170,6 +170,7 @@ target_libraries="target-libgcc \
  		target-libffi \
  		target-libobjc \
  		target-libada \
@@ -389,7 +397,7 @@
  		${target_libiberty} \
  		target-libgnatvsn \
  		target-libgo"
-@@ -456,7 +457,7 @@
+@@ -456,7 +457,7 @@ AC_ARG_ENABLE(libada,
  ENABLE_LIBADA=$enableval,
  ENABLE_LIBADA=yes)
  if test "${ENABLE_LIBADA}" != "yes" ; then
@@ -398,9 +406,11 @@
  fi
  
  AC_ARG_ENABLE(libssp,
+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
-@@ -192,7 +192,7 @@
+@@ -191,7 +191,7 @@ TOOLSCASE =
  
  # Multilib handling
  MULTISUBDIR =
@@ -409,7 +419,7 @@
  
  # Link flags used to build gnat tools.  By default we prefer to statically
  # link with libgcc to avoid a dependency on shared libgcc (which is tricky
-@@ -2668,6 +2668,26 @@
+@@ -2673,6 +2673,26 @@ install-gnatlib: ../stamp-gnatlib-$(RTSD
  	cd $(DESTDIR)$(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.adb
  	cd $(DESTDIR)$(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.ads
  
@@ -434,9 +444,9 @@
 +	cd $(DESTDIR)$(ADA_INCLUDE_DIR_SJLJ); $(CHMOD) a-wx *.ads
 +
  ../stamp-gnatlib1-$(RTSDIR): Makefile
- 	$(RMDIR) $(RTSDIR)
  	$(MKDIR) $(RTSDIR)
-@@ -2936,7 +2956,7 @@
+ 	$(CHMOD) u+w $(RTSDIR)
+@@ -2938,7 +2958,7 @@ gnatlib-shared:
  # commenting the pragma instead of deleting the line, as the latter might
  # result in getting multiple blank lines, hence possible style check errors.
  gnatlib-sjlj:
@@ -445,7 +455,7 @@
  	THREAD_KIND="$(THREAD_KIND)" ../stamp-gnatlib1-$(RTSDIR)
  	sed \
  	  -e 's/Frontend_Exceptions.*/Frontend_Exceptions       : constant Boolean := True;/' \
-@@ -2945,6 +2965,7 @@
+@@ -2947,6 +2967,7 @@ gnatlib-sjlj:
  	  $(RTSDIR)/system.ads > $(RTSDIR)/s.ads
  	$(MV) $(RTSDIR)/s.ads $(RTSDIR)/system.ads
  	$(MAKE) $(FLAGS_TO_PASS) \
@@ -453,7 +463,7 @@
  	     EH_MECHANISM="" \
  	     GNATLIBFLAGS="$(GNATLIBFLAGS)" \
  	     GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
-@@ -2997,6 +3018,8 @@
+@@ -2998,6 +3019,8 @@ b_gnatm.o : b_gnatm.adb
  
  ADA_INCLUDE_DIR = $(libsubdir)/adainclude
  ADA_RTL_OBJ_DIR = $(libsubdir)/adalib
@@ -462,9 +472,11 @@
  
  # Special flags
  
+Index: b/src/gcc/ada/gcc-interface/config-lang.in
+===================================================================
 --- a/src/gcc/ada/gcc-interface/config-lang.in
 +++ b/src/gcc/ada/gcc-interface/config-lang.in
-@@ -34,8 +34,8 @@
+@@ -34,8 +34,8 @@ gtfiles="\$(srcdir)/ada/gcc-interface/ad
  
  outputs="ada/gcc-interface/Makefile ada/Makefile"
  
@@ -475,9 +487,11 @@
  
  # Ada is not enabled by default for the time being.
  build_by_default=no
+Index: b/src/gcc/ada/gcc-interface/Make-lang.in
+===================================================================
 --- a/src/gcc/ada/gcc-interface/Make-lang.in
 +++ b/src/gcc/ada/gcc-interface/Make-lang.in
-@@ -784,6 +784,7 @@
+@@ -784,6 +784,7 @@ ada.install-common:
  
  install-gnatlib:
  	$(MAKE) -C ada $(COMMON_FLAGS_TO_PASS) $(ADA_FLAGS_TO_PASS) install-gnatlib$(LIBGNAT_TARGET)
diff --git a/debian/patches/g++-multiarch-incdir.diff b/debian/patches/g++-multiarch-incdir.diff
index a24db1f..5f463fa 100644
--- a/debian/patches/g++-multiarch-incdir.diff
+++ b/debian/patches/g++-multiarch-incdir.diff
@@ -31,7 +31,7 @@ Index: b/src/gcc/Makefile.in
 ===================================================================
 --- a/src/gcc/Makefile.in
 +++ b/src/gcc/Makefile.in
-@@ -1156,6 +1156,7 @@ FLAGS_TO_PASS = \
+@@ -1150,6 +1150,7 @@ FLAGS_TO_PASS = \
  	"prefix=$(prefix)" \
  	"local_prefix=$(local_prefix)" \
  	"gxx_include_dir=$(gcc_gxx_include_dir)" \
@@ -39,7 +39,7 @@ Index: b/src/gcc/Makefile.in
  	"build_tooldir=$(build_tooldir)" \
  	"gcc_tooldir=$(gcc_tooldir)" \
  	"bindir=$(bindir)" \
-@@ -1687,6 +1688,14 @@ ifneq ($(xmake_file),)
+@@ -1681,6 +1682,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
-@@ -2773,7 +2782,7 @@ PREPROCESSOR_DEFINES = \
+@@ -2768,7 +2777,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-driver-extra-langs.diff b/debian/patches/gcc-driver-extra-langs.diff
index c041a79..3fa5c85 100644
--- a/debian/patches/gcc-driver-extra-langs.diff
+++ b/debian/patches/gcc-driver-extra-langs.diff
@@ -9,7 +9,7 @@ Index: b/src/gcc/Makefile.in
 ===================================================================
 --- a/src/gcc/Makefile.in
 +++ b/src/gcc/Makefile.in
-@@ -561,8 +561,8 @@ xm_include_list=@xm_include_list@
+@@ -554,8 +554,8 @@ xm_include_list=@xm_include_list@
  xm_defines=@xm_defines@
  lang_checks=
  lang_checks_parallelized=
diff --git a/debian/patches/gcc-fuse-ld-lld.diff b/debian/patches/gcc-fuse-ld-lld.diff
index 1464267..18a52cc 100644
--- a/debian/patches/gcc-fuse-ld-lld.diff
+++ b/debian/patches/gcc-fuse-ld-lld.diff
@@ -1,10 +1,10 @@
 # DP: Allow to use lld with -fuse-ld=ld.lld
 
-Index: gcc/collect2.c
+Index: b/src/gcc/collect2.c
 ===================================================================
---- a/src/gcc/collect2.c	(revision 246158)
-+++ a/src/gcc/collect2.c	(working copy)
-@@ -831,6 +831,7 @@
+--- a/src/gcc/collect2.c
++++ b/src/gcc/collect2.c
+@@ -831,6 +831,7 @@ main (int argc, char **argv)
        USE_PLUGIN_LD,
        USE_GOLD_LD,
        USE_BFD_LD,
@@ -12,7 +12,7 @@ Index: gcc/collect2.c
        USE_LD_MAX
      } selected_linker = USE_DEFAULT_LD;
    static const char *const ld_suffixes[USE_LD_MAX] =
-@@ -838,7 +839,8 @@
+@@ -838,7 +839,8 @@ main (int argc, char **argv)
        "ld",
        PLUGIN_LD_SUFFIX,
        "ld.gold",
@@ -22,7 +22,7 @@ Index: gcc/collect2.c
      };
    static const char *const real_ld_suffix = "real-ld";
    static const char *const collect_ld_suffix = "collect-ld";
-@@ -1004,6 +1006,8 @@
+@@ -1004,6 +1006,8 @@ main (int argc, char **argv)
  	  selected_linker = USE_BFD_LD;
  	else if (strcmp (argv[i], "-fuse-ld=gold") == 0)
  	  selected_linker = USE_GOLD_LD;
@@ -31,7 +31,7 @@ Index: gcc/collect2.c
  
  #ifdef COLLECT_EXPORT_LIST
  	/* These flags are position independent, although their order
-@@ -1093,7 +1097,8 @@
+@@ -1093,7 +1097,8 @@ main (int argc, char **argv)
    /* Maybe we know the right file to use (if not cross).  */
    ld_file_name = 0;
  #ifdef DEFAULT_LINKER
@@ -41,7 +41,7 @@ Index: gcc/collect2.c
      {
        char *linker_name;
  # ifdef HOST_EXECUTABLE_SUFFIX
-@@ -1307,7 +1312,7 @@
+@@ -1307,7 +1312,7 @@ main (int argc, char **argv)
  	      else if (!use_collect_ld
  		       && strncmp (arg, "-fuse-ld=", 9) == 0)
  		{
@@ -50,11 +50,11 @@ Index: gcc/collect2.c
  		  ld1--;
  		  ld2--;
  		}
-Index: gcc/common.opt
+Index: b/src/gcc/common.opt
 ===================================================================
---- a/src/gcc/common.opt	(revision 246158)
-+++ a/src/gcc/common.opt	(working copy)
-@@ -2512,9 +2512,13 @@
+--- a/src/gcc/common.opt
++++ b/src/gcc/common.opt
+@@ -2635,9 +2635,13 @@ Common Driver Negative(fuse-ld=gold)
  Use the bfd linker instead of the default linker.
  
  fuse-ld=gold
@@ -69,11 +69,11 @@ Index: gcc/common.opt
  fuse-linker-plugin
  Common Undocumented Var(flag_use_linker_plugin)
  
-Index: gcc/opts.c
+Index: b/src/gcc/opts.c
 ===================================================================
---- a/src/gcc/opts.c	(revision 246158)
-+++ a/src/gcc/opts.c	(working copy)
-@@ -2168,6 +2168,7 @@
+--- a/src/gcc/opts.c
++++ b/src/gcc/opts.c
+@@ -2315,6 +2315,7 @@ common_handle_option (struct gcc_options
  
      case OPT_fuse_ld_bfd:
      case OPT_fuse_ld_gold:
diff --git a/debian/patches/gcc-gfdl-build.diff b/debian/patches/gcc-gfdl-build.diff
index 5f0314c..0d57fcb 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
-@@ -2411,30 +2411,8 @@ s-tm-texi: $(srcdir)/doc/../doc/tm.texi
+@@ -2405,30 +2405,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-textdomain.diff b/debian/patches/gcc-textdomain.diff
index f9223e9..a056ab3 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
-@@ -4105,8 +4105,8 @@ install-po:
+@@ -4116,8 +4116,8 @@ install-po:
  	  dir=$(localedir)/$$lang/LC_MESSAGES; \
  	  echo $(mkinstalldirs) $(DESTDIR)$$dir; \
  	  $(mkinstalldirs) $(DESTDIR)$$dir || exit 1; \
diff --git a/debian/patches/gdc-7.diff b/debian/patches/gdc-7.diff
index 8c2b43c..76c2efd 100644
--- a/debian/patches/gdc-7.diff
+++ b/debian/patches/gdc-7.diff
@@ -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
-@@ -31396,7 +31396,8 @@ rs6000_output_function_epilogue (FILE *f
+@@ -31548,7 +31548,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.  */
  
-@@ -23578,6 +23588,8 @@ gen_compile_unit_die (const char *filena
+@@ -23594,6 +23604,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)
-@@ -25106,7 +25118,7 @@ declare_in_namespace (tree thing, dw_die
+@@ -25158,7 +25170,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);
-@@ -25129,7 +25141,7 @@ gen_namespace_die (tree decl, dw_die_ref
+@@ -25181,7 +25193,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.  */
-@@ -25196,7 +25208,7 @@ gen_decl_die (tree decl, tree origin, st
+@@ -25248,7 +25260,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.  */
-@@ -25743,7 +25755,7 @@ dwarf2out_decl (tree decl)
+@@ -25795,7 +25807,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 00d1d22..2b6c907 100644
--- a/debian/patches/gdc-libphobos-build.diff
+++ b/debian/patches/gdc-libphobos-build.diff
@@ -214,9 +214,11 @@ Index: b/src/configure.ac
  GCC_TARGET_TOOL(ld, LD_FOR_TARGET, LD, [ld/ld-new])
  GCC_TARGET_TOOL(lipo, LIPO_FOR_TARGET, LIPO)
  GCC_TARGET_TOOL(nm, NM_FOR_TARGET, NM, [binutils/nm-new])
+Index: b/src/Makefile.in
+===================================================================
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -156,6 +156,7 @@
+@@ -156,6 +156,7 @@ BUILD_EXPORTS = \
  	GFORTRAN="$(GFORTRAN_FOR_BUILD)"; export GFORTRAN; \
  	GOC="$(GOC_FOR_BUILD)"; export GOC; \
  	GOCFLAGS="$(GOCFLAGS_FOR_BUILD)"; export GOCFLAGS; \
@@ -224,7 +226,7 @@ Index: b/src/configure.ac
  	DLLTOOL="$(DLLTOOL_FOR_BUILD)"; export DLLTOOL; \
  	LD="$(LD_FOR_BUILD)"; export LD; \
  	LDFLAGS="$(LDFLAGS_FOR_BUILD)"; export LDFLAGS; \
-@@ -192,6 +193,7 @@
+@@ -192,6 +193,7 @@ HOST_EXPORTS = \
  	CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
  	GFORTRAN="$(GFORTRAN)"; export GFORTRAN; \
  	GOC="$(GOC)"; export GOC; \
@@ -232,7 +234,7 @@ Index: b/src/configure.ac
  	AR="$(AR)"; export AR; \
  	AS="$(AS)"; export AS; \
  	CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
-@@ -278,6 +280,7 @@
+@@ -278,6 +280,7 @@ BASE_TARGET_EXPORTS = \
  	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
  	GFORTRAN="$(GFORTRAN_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GFORTRAN; \
  	GOC="$(GOC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GOC; \
@@ -240,7 +242,7 @@ Index: b/src/configure.ac
  	DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
  	LD="$(COMPILER_LD_FOR_TARGET)"; export LD; \
  	LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
-@@ -342,6 +345,7 @@
+@@ -342,6 +345,7 @@ CXX_FOR_BUILD = @CXX_FOR_BUILD@
  DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@
  GFORTRAN_FOR_BUILD = @GFORTRAN_FOR_BUILD@
  GOC_FOR_BUILD = @GOC_FOR_BUILD@
@@ -248,7 +250,7 @@ Index: b/src/configure.ac
  LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
  LD_FOR_BUILD = @LD_FOR_BUILD@
  NM_FOR_BUILD = @NM_FOR_BUILD@
-@@ -551,6 +555,7 @@
+@@ -551,6 +555,7 @@ CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @CXX_
  RAW_CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @RAW_CXX_FOR_TARGET@
  GFORTRAN_FOR_TARGET=$(STAGE_CC_WRAPPER) @GFORTRAN_FOR_TARGET@
  GOC_FOR_TARGET=$(STAGE_CC_WRAPPER) @GOC_FOR_TARGET@
@@ -256,7 +258,7 @@ Index: b/src/configure.ac
  DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@
  LD_FOR_TARGET=@LD_FOR_TARGET@
  
-@@ -774,6 +779,7 @@
+@@ -774,6 +779,7 @@ BASE_FLAGS_TO_PASS = \
  	"GFORTRAN_FOR_TARGET=$(GFORTRAN_FOR_TARGET)" \
  	"GOC_FOR_TARGET=$(GOC_FOR_TARGET)" \
  	"GOCFLAGS_FOR_TARGET=$(GOCFLAGS_FOR_TARGET)" \
@@ -264,7 +266,7 @@ Index: b/src/configure.ac
  	"LD_FOR_TARGET=$(LD_FOR_TARGET)" \
  	"LIPO_FOR_TARGET=$(LIPO_FOR_TARGET)" \
  	"LDFLAGS_FOR_TARGET=$(LDFLAGS_FOR_TARGET)" \
-@@ -833,6 +839,7 @@
+@@ -833,6 +839,7 @@ EXTRA_HOST_FLAGS = \
  	'DLLTOOL=$(DLLTOOL)' \
  	'GFORTRAN=$(GFORTRAN)' \
  	'GOC=$(GOC)' \
@@ -272,7 +274,7 @@ Index: b/src/configure.ac
  	'LD=$(LD)' \
  	'LIPO=$(LIPO)' \
  	'NM=$(NM)' \
-@@ -889,6 +896,7 @@
+@@ -889,6 +896,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)' \
@@ -280,7 +282,7 @@ Index: b/src/configure.ac
  	'LD=$(COMPILER_LD_FOR_TARGET)' \
  	'LDFLAGS=$$(LDFLAGS_FOR_TARGET)' \
  	'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \
-@@ -992,6 +1000,7 @@
+@@ -992,6 +1000,7 @@ configure-target:  \
      maybe-configure-target-libobjc \
      maybe-configure-target-libgo \
      maybe-configure-target-libhsail-rt \
@@ -288,7 +290,7 @@ Index: b/src/configure.ac
      maybe-configure-target-libtermcap \
      maybe-configure-target-winsup \
      maybe-configure-target-libgloss \
-@@ -1160,6 +1169,7 @@
+@@ -1158,6 +1167,7 @@ all-target: maybe-all-target-libgfortran
  all-target: maybe-all-target-libobjc
  all-target: maybe-all-target-libgo
  all-target: maybe-all-target-libhsail-rt
@@ -296,7 +298,7 @@ Index: b/src/configure.ac
  all-target: maybe-all-target-libtermcap
  all-target: maybe-all-target-winsup
  all-target: maybe-all-target-libgloss
-@@ -1255,6 +1265,7 @@
+@@ -1251,6 +1261,7 @@ info-target: maybe-info-target-libgfortr
  info-target: maybe-info-target-libobjc
  info-target: maybe-info-target-libgo
  info-target: maybe-info-target-libhsail-rt
@@ -304,7 +306,7 @@ Index: b/src/configure.ac
  info-target: maybe-info-target-libtermcap
  info-target: maybe-info-target-winsup
  info-target: maybe-info-target-libgloss
-@@ -1343,6 +1354,7 @@
+@@ -1337,6 +1348,7 @@ dvi-target: maybe-dvi-target-libgfortran
  dvi-target: maybe-dvi-target-libobjc
  dvi-target: maybe-dvi-target-libgo
  dvi-target: maybe-dvi-target-libhsail-rt
@@ -312,7 +314,7 @@ Index: b/src/configure.ac
  dvi-target: maybe-dvi-target-libtermcap
  dvi-target: maybe-dvi-target-winsup
  dvi-target: maybe-dvi-target-libgloss
-@@ -1431,6 +1443,7 @@
+@@ -1423,6 +1435,7 @@ pdf-target: maybe-pdf-target-libgfortran
  pdf-target: maybe-pdf-target-libobjc
  pdf-target: maybe-pdf-target-libgo
  pdf-target: maybe-pdf-target-libhsail-rt
@@ -320,7 +322,7 @@ Index: b/src/configure.ac
  pdf-target: maybe-pdf-target-libtermcap
  pdf-target: maybe-pdf-target-winsup
  pdf-target: maybe-pdf-target-libgloss
-@@ -1519,6 +1532,7 @@
+@@ -1509,6 +1522,7 @@ html-target: maybe-html-target-libgfortr
  html-target: maybe-html-target-libobjc
  html-target: maybe-html-target-libgo
  html-target: maybe-html-target-libhsail-rt
@@ -328,7 +330,7 @@ Index: b/src/configure.ac
  html-target: maybe-html-target-libtermcap
  html-target: maybe-html-target-winsup
  html-target: maybe-html-target-libgloss
-@@ -1607,6 +1621,7 @@
+@@ -1595,6 +1609,7 @@ TAGS-target: maybe-TAGS-target-libgfortr
  TAGS-target: maybe-TAGS-target-libobjc
  TAGS-target: maybe-TAGS-target-libgo
  TAGS-target: maybe-TAGS-target-libhsail-rt
@@ -336,7 +338,7 @@ Index: b/src/configure.ac
  TAGS-target: maybe-TAGS-target-libtermcap
  TAGS-target: maybe-TAGS-target-winsup
  TAGS-target: maybe-TAGS-target-libgloss
-@@ -1695,6 +1710,7 @@
+@@ -1681,6 +1696,7 @@ install-info-target: maybe-install-info-
  install-info-target: maybe-install-info-target-libobjc
  install-info-target: maybe-install-info-target-libgo
  install-info-target: maybe-install-info-target-libhsail-rt
@@ -344,7 +346,7 @@ Index: b/src/configure.ac
  install-info-target: maybe-install-info-target-libtermcap
  install-info-target: maybe-install-info-target-winsup
  install-info-target: maybe-install-info-target-libgloss
-@@ -1783,6 +1799,7 @@
+@@ -1767,6 +1783,7 @@ install-pdf-target: maybe-install-pdf-ta
  install-pdf-target: maybe-install-pdf-target-libobjc
  install-pdf-target: maybe-install-pdf-target-libgo
  install-pdf-target: maybe-install-pdf-target-libhsail-rt
@@ -352,7 +354,7 @@ Index: b/src/configure.ac
  install-pdf-target: maybe-install-pdf-target-libtermcap
  install-pdf-target: maybe-install-pdf-target-winsup
  install-pdf-target: maybe-install-pdf-target-libgloss
-@@ -1871,6 +1888,7 @@
+@@ -1853,6 +1870,7 @@ install-html-target: maybe-install-html-
  install-html-target: maybe-install-html-target-libobjc
  install-html-target: maybe-install-html-target-libgo
  install-html-target: maybe-install-html-target-libhsail-rt
@@ -360,7 +362,7 @@ Index: b/src/configure.ac
  install-html-target: maybe-install-html-target-libtermcap
  install-html-target: maybe-install-html-target-winsup
  install-html-target: maybe-install-html-target-libgloss
-@@ -1959,6 +1977,7 @@
+@@ -1939,6 +1957,7 @@ installcheck-target: maybe-installcheck-
  installcheck-target: maybe-installcheck-target-libobjc
  installcheck-target: maybe-installcheck-target-libgo
  installcheck-target: maybe-installcheck-target-libhsail-rt
@@ -368,7 +370,7 @@ Index: b/src/configure.ac
  installcheck-target: maybe-installcheck-target-libtermcap
  installcheck-target: maybe-installcheck-target-winsup
  installcheck-target: maybe-installcheck-target-libgloss
-@@ -2047,6 +2066,7 @@
+@@ -2025,6 +2044,7 @@ mostlyclean-target: maybe-mostlyclean-ta
  mostlyclean-target: maybe-mostlyclean-target-libobjc
  mostlyclean-target: maybe-mostlyclean-target-libgo
  mostlyclean-target: maybe-mostlyclean-target-libhsail-rt
@@ -376,7 +378,7 @@ Index: b/src/configure.ac
  mostlyclean-target: maybe-mostlyclean-target-libtermcap
  mostlyclean-target: maybe-mostlyclean-target-winsup
  mostlyclean-target: maybe-mostlyclean-target-libgloss
-@@ -2135,6 +2155,7 @@
+@@ -2111,6 +2131,7 @@ clean-target: maybe-clean-target-libgfor
  clean-target: maybe-clean-target-libobjc
  clean-target: maybe-clean-target-libgo
  clean-target: maybe-clean-target-libhsail-rt
@@ -384,7 +386,7 @@ Index: b/src/configure.ac
  clean-target: maybe-clean-target-libtermcap
  clean-target: maybe-clean-target-winsup
  clean-target: maybe-clean-target-libgloss
-@@ -2223,6 +2244,7 @@
+@@ -2197,6 +2218,7 @@ distclean-target: maybe-distclean-target
  distclean-target: maybe-distclean-target-libobjc
  distclean-target: maybe-distclean-target-libgo
  distclean-target: maybe-distclean-target-libhsail-rt
@@ -392,7 +394,7 @@ Index: b/src/configure.ac
  distclean-target: maybe-distclean-target-libtermcap
  distclean-target: maybe-distclean-target-winsup
  distclean-target: maybe-distclean-target-libgloss
-@@ -2311,6 +2333,7 @@
+@@ -2283,6 +2305,7 @@ maintainer-clean-target: maybe-maintaine
  maintainer-clean-target: maybe-maintainer-clean-target-libobjc
  maintainer-clean-target: maybe-maintainer-clean-target-libgo
  maintainer-clean-target: maybe-maintainer-clean-target-libhsail-rt
@@ -400,7 +402,7 @@ Index: b/src/configure.ac
  maintainer-clean-target: maybe-maintainer-clean-target-libtermcap
  maintainer-clean-target: maybe-maintainer-clean-target-winsup
  maintainer-clean-target: maybe-maintainer-clean-target-libgloss
-@@ -2455,6 +2478,7 @@
+@@ -2425,6 +2448,7 @@ check-target:  \
      maybe-check-target-libobjc \
      maybe-check-target-libgo \
      maybe-check-target-libhsail-rt \
@@ -408,7 +410,7 @@ Index: b/src/configure.ac
      maybe-check-target-libtermcap \
      maybe-check-target-winsup \
      maybe-check-target-libgloss \
-@@ -2639,6 +2663,7 @@
+@@ -2607,6 +2631,7 @@ install-target:  \
      maybe-install-target-libobjc \
      maybe-install-target-libgo \
      maybe-install-target-libhsail-rt \
@@ -416,7 +418,7 @@ Index: b/src/configure.ac
      maybe-install-target-libtermcap \
      maybe-install-target-winsup \
      maybe-install-target-libgloss \
-@@ -2747,6 +2772,7 @@
+@@ -2713,6 +2738,7 @@ install-strip-target:  \
      maybe-install-strip-target-libobjc \
      maybe-install-strip-target-libgo \
      maybe-install-strip-target-libhsail-rt \
@@ -424,7 +426,7 @@ Index: b/src/configure.ac
      maybe-install-strip-target-libtermcap \
      maybe-install-strip-target-winsup \
      maybe-install-strip-target-libgloss \
-@@ -46453,6 +46479,464 @@
+@@ -46570,6 +46596,464 @@ maintainer-clean-target-libhsail-rt:
  
  
  
@@ -889,7 +891,7 @@ Index: b/src/configure.ac
  .PHONY: configure-target-libtermcap maybe-configure-target-libtermcap
  maybe-configure-target-libtermcap:
  @if gcc-bootstrap
-@@ -52349,6 +52833,14 @@
+@@ -51864,6 +52348,14 @@ check-gcc-brig:
  	(cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-brig);
  check-brig: check-gcc-brig check-target-libhsail-rt
  
@@ -904,7 +906,7 @@ Index: b/src/configure.ac
  
  # The gcc part of install-no-fixedincludes, which relies on an intimate
  # knowledge of how a number of gcc internal targets (inter)operate.  Delegate.
-@@ -55227,6 +55719,7 @@
+@@ -54742,6 +55234,7 @@ configure-target-libgfortran: stage_last
  configure-target-libobjc: stage_last
  configure-target-libgo: stage_last
  configure-target-libhsail-rt: stage_last
@@ -912,7 +914,7 @@ Index: b/src/configure.ac
  configure-target-libtermcap: stage_last
  configure-target-winsup: stage_last
  configure-target-libgloss: stage_last
-@@ -55264,6 +55757,7 @@
+@@ -54777,6 +55270,7 @@ configure-target-libgfortran: maybe-all-
  configure-target-libobjc: maybe-all-gcc
  configure-target-libgo: maybe-all-gcc
  configure-target-libhsail-rt: maybe-all-gcc
@@ -920,7 +922,7 @@ Index: b/src/configure.ac
  configure-target-libtermcap: maybe-all-gcc
  configure-target-winsup: maybe-all-gcc
  configure-target-libgloss: maybe-all-gcc
-@@ -56296,6 +56790,8 @@
+@@ -55803,6 +56297,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
@@ -929,7 +931,7 @@ Index: b/src/configure.ac
  configure-target-libstdc++-v3: maybe-configure-target-libgomp
  
  configure-stage1-target-libstdc++-v3: maybe-configure-stage1-target-libgomp
-@@ -56423,6 +56919,7 @@
+@@ -55930,6 +56426,7 @@ configure-target-libgfortran: maybe-all-
  configure-target-libobjc: maybe-all-target-libgcc
  configure-target-libgo: maybe-all-target-libgcc
  configure-target-libhsail-rt: maybe-all-target-libgcc
@@ -937,7 +939,7 @@ Index: b/src/configure.ac
  configure-target-libtermcap: maybe-all-target-libgcc
  configure-target-winsup: maybe-all-target-libgcc
  configure-target-libgloss: maybe-all-target-libgcc
-@@ -56468,6 +56965,8 @@
+@@ -55973,6 +56470,8 @@ configure-target-libgo: maybe-all-target
  
  configure-target-libhsail-rt: maybe-all-target-newlib maybe-all-target-libgloss
  
diff --git a/debian/patches/gdc-profiledbuild.diff b/debian/patches/gdc-profiledbuild.diff
index 2c1624b..fb49c4b 100644
--- a/debian/patches/gdc-profiledbuild.diff
+++ b/debian/patches/gdc-profiledbuild.diff
@@ -1,8 +1,10 @@
 # DP: Don't build gdc build tools idgen and impcnvgen with profiling flags
 
+Index: b/src/gcc/d/Make-lang.in
+===================================================================
 --- a/src/gcc/d/Make-lang.in
 +++ b/src/gcc/d/Make-lang.in
-@@ -97,6 +97,14 @@
+@@ -256,6 +256,14 @@ d/idgen: d/idgen.dmdgen.o
  d/impcvgen: d/impcnvgen.dmdgen.o
  	+$(LINKER_FOR_BUILD) $(BUILD_LINKER_FLAGS) $(BUILD_LDFLAGS) -o $@ $^
  
diff --git a/debian/patches/gdc-updates.diff b/debian/patches/gdc-updates.diff
index b75b917..35f102c 100644
--- a/debian/patches/gdc-updates.diff
+++ b/debian/patches/gdc-updates.diff
@@ -6,7 +6,7 @@ Index: b/src/gcc/d/Make-lang.in
 ===================================================================
 --- a/src/gcc/d/Make-lang.in
 +++ b/src/gcc/d/Make-lang.in
-@@ -51,7 +51,7 @@ gdc-cross$(exeext): gdc$(exeext)
+@@ -46,7 +46,7 @@ gdc-cross$(exeext): gdc$(exeext)
  	cp gdc$(exeext) gdc-cross$(exeext)
  
  # Filter out pedantic and virtual overload warnings.
diff --git a/debian/patches/gdc-versym-cpu.diff b/debian/patches/gdc-versym-cpu.diff
index ba94592..6db40bf 100644
--- a/debian/patches/gdc-versym-cpu.diff
+++ b/debian/patches/gdc-versym-cpu.diff
@@ -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
-@@ -821,6 +821,28 @@ extern unsigned char rs6000_recip_bits[]
+@@ -822,6 +822,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
-@@ -177,6 +177,22 @@ enum processor_flags
+@@ -194,6 +194,22 @@ enum processor_flags
  /* Target CPU builtins.  */
  #define TARGET_CPU_CPP_BUILTINS() s390_cpu_cpp_builtins (pfile)
  
diff --git a/debian/patches/skip-bootstrap-multilib.diff b/debian/patches/skip-bootstrap-multilib.diff
index 286bbcf..80ab31c 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
-@@ -2894,7 +2894,20 @@ dnl
+@@ -2895,7 +2895,20 @@ dnl
  AC_DEFUN([GLIBCXX_ENABLE_DEBUG], [
    AC_MSG_CHECKING([for additional debug build])
    GLIBCXX_ENABLE(libstdcxx-debug,$1,,[build extra debug library])

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



More information about the Reproducible-commits mailing list