Merge branch 'debpsuedomerge' into buster-working

diff --cc debian/changelog
index 44420a7942f4e9910dcac6604278ccef93a5e5ad,897d5a031079f52bc018cd9d5070a1eeb86f1f63..fac9c02d9a6a3945a0d1b8932b159ac35565bf03
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,7 -1,22 +1,26 @@@
+ gcc-7 (7.1.0-10) unstable; urgency=medium
+ 
+   * Update to SVN 20170722 (r250453) from the gcc-7-branch.
+ 
+   [ Nicolas Boulenguez ]
+   * libgnatvsn: embed xutil rident for version 2017 of asis package.
+ 
+   [ Matthias Klose ]
+   * Fix gnat cross build on m68k (Adrian Glaubitz). Closes: #862927.
+   * Enable gnat cross build on m68k. Closes: #868365.
+   * Update the Linaro support to the 7-2017.07 snapshot.
+   * Stop ignoring symbol mismatches for runtime libraries.
+ 
+   [ Aurelien Jarno ]
+   * libgo-s390x-default-isa.diff: do not build libgo with -march=z196,
+     use the default ISA instead.
+ 
+  -- Matthias Klose <doko@debian.org>  Sat, 22 Jul 2017 15:06:36 +0200
+ 
 +gcc-7 (7.1.0-9+rpi1) buster-staging; urgency=medium
 +
 + -- Raspbian forward porter <root@raspbian.org>  Thu, 20 Jul 2017 18:14:15 +0000
 +
  gcc-7 (7.1.0-9) unstable; urgency=medium
  
    * Update to SVN 20170705 (r250006) from the gcc-7-branch.

diff --cc debian/rules.defs
index d6d6737413ee512e41f1d73135a6ff827cdb0d1a,85e38184ec0c548ea849170fe9f7e981226b78e3..d9fe212e4422b3088c76e8f2bb5b2f0bb8bba872
--- 1/debian/rules.defs
--- 2/debian/rules.defs
+++ b/debian/rules.defs
@@@ -639,9 -639,11 +639,11 @@@ endi
  
  ifeq (,$(filter $(DEB_STAGE),stage1 stage2))
  # Ada --------------------
 -ada_no_cpus   := m32r sh3 sh3eb sh4eb
 +ada_no_cpus   := m32r sh3 sh3eb sh4eb arm
  # no Debian builds ... some of these should exist
- ada_no_cpus += m68k # see https://bugs.debian.org/814221
+ ifneq (,$(filter $(build_type), build-native cross-build-native))
+   ada_no_cpus += m68k # see https://bugs.debian.org/868365
+ endif
  ada_no_systems        := 
  ada_no_cross  := no
  ada_no_snap   := no