Merge branch 'debpsuedomerge' into buster-working

diff --cc debian/changelog
index 899079565638f2d4a1c1fb8a964b29bc2f48daac,5d09c1345223b61041c0da053c0a36f202caa1d1..3bd41b3615ea70cbc5c16420f9e76d01f4f7386d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,40 +1,47 @@@
+ gcc-7 (7.1.0-9) unstable; urgency=medium
+ 
+   * Update to SVN 20170705 (r250006) from the gcc-7-branch.
+ 
+   [ Matthias Klose ]
+   * gcc-linaro-revert-r49596.diff: fix build for the linaro branch.
+   * Don't configure powerpc with --enable-default-pie, fails to build.
+     See #856224, PR target/81295.
+ 
+   [ Nicolas Boulenguez ]
+   * ada-gcc-name.diff: unpatch gnatchop. Addresses: #856274.
+   * Link libgnat with libatomic on armel. Closes: #861734.
+   * libgnat-dev: use multiarch paths in project and to install .ali files.
+   * Build Ada on armel, kfreebsd-*, hurd-i386; #86173[457] are closed.
+ 
+  -- Matthias Klose <doko@debian.org>  Wed, 05 Jul 2017 19:21:55 +0200
+ 
+ gcc-7 (7.1.0-8) unstable; urgency=medium
+ 
+   * Update to SVN 20170629 (r249793) from the gcc-7-branch.
+ 
+   [ Matthias Klose ]
+   * Move the liblto_plugin from the cpp to the gcc package.
+   * libstdc++6: Add more Breaks to smoothen upgrades from jessie to stretch.
+     Addresses: #863845, #863745.
+   * Don't provide libobjc_gc symlinks for the libobjc multilib packages.
+   * Configure with --enable-default-pie on ppc64 (Adrian Glaubitz) and
+     powerpc (Mathieu Malaterre).  Addresses: #856224.
+ 
+   [ Nicolas Boulenguez ]
+   * Update ada/confirm_debian_bugs.py for gcc-7.
+   * Drop ada-driver-check.diff, the problem is unreproducible.
+   * Stop symlinking gcc-7-7 -> gcc-7. See #856274 and #814977.
+   * gnatmake: compile once even with SOURCE_DATE_EPOCH. Closes: #866029.
+ 
+  -- Matthias Klose <doko@debian.org>  Thu, 29 Jun 2017 17:36:03 +0200
+ 
 +gcc-7 (7.1.0-7+rpi1) buster-staging; urgency=medium
 +
 +  * Disable testsuite.
 +  * Disable ada.
 +
 + -- Peter Michael Green <plugwash@raspbian.org>  Wed, 28 Jun 2017 15:47:01 +0000
 +
  gcc-7 (7.1.0-7) unstable; urgency=medium
  
    * Update to SVN 20170618 (r249347) from the gcc-7-branch.

diff --cc debian/control
Simple merge

diff --cc debian/rules.defs
Simple merge