Merge version 6.4.0-20+rpi1 and 6.4.0-22 to produce 6.4.0-22+rpi1

diff --cc debian/changelog
index 71a40bb5260da03f3c59ae719b20e0159876fc62,a32b8b0c9aa20bad1703db0658e47f57c422526e..f201fe1401f51e5560d0bc43b340405981530fb1
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,18 +1,28 @@@
- gcc-6 (6.4.0-20+rpi1) buster-staging; urgency=medium
++gcc-6 (6.4.0-22+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 6.4.0-11+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 10 Feb 2018 15:48:42 +0000]
 +  * Disable testsuite.
 +
 +  [changes brought forward from 6.4.0-17+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Thu, 07 Jun 2018 14:05:12 +0000]
 +  * Re-enable gcj for now.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 22 Aug 2018 12:46:21 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 29 Sep 2018 06:32:04 +0000
++
+ gcc-6 (6.4.0-22) unstable; urgency=medium
+ 
+   * Update to SVN 20180921 (r264530) from the gcc-6-branch.
+     - Fix libsanitizer build failure on sparc64.
+ 
+  -- Matthias Klose <doko@debian.org>  Mon, 24 Sep 2018 13:50:28 +0200
+ 
+ gcc-6 (6.4.0-21) unstable; urgency=medium
+ 
+   * Update to SVN 20180921 (r264459) from the gcc-6-branch.
+     - Fix PR sanitizer/85835, PR tree-optimization/85859, PR target/87014,
+       PR fortran/86116.
+     - Fix build failure with glibc 2.28.
+ 
+  -- Matthias Klose <doko@debian.org>  Fri, 21 Sep 2018 11:21:42 +0200
  
  gcc-6 (6.4.0-20) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/rules.defs
Simple merge