Merge version 8.4.0-6+rpi1 and 8.4.0-7 to produce 8.4.0-7+rpi1

diff --cc debian/changelog
index 2550bfedf98892045c09c274770d084bdc58f3a8,aa1a6d0fd0679779fe8c4191b8afc8bd2fc37268..1da56cec83b370f55ccf1e892f6d0be0bb714640
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,11 +1,21 @@@
- gcc-8 (8.4.0-6+rpi1) bullseye-staging; urgency=medium
++gcc-8 (8.4.0-7+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 8-20180207-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 17 Feb 2018 00:20:23 +0000]
 +  * Don't pass -march=armv7+fp to compiler when building libatomic.
 +
 +  [changes introduced in 8.2.0-16+rpi1 by Peter Michael Green]
 +  * Disable testsuite (build seems to hang after testsuite completes).
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 15 Jan 2021 10:09:19 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 08 Feb 2021 03:19:54 +0000
++
+ gcc-8 (8.4.0-7) unstable; urgency=medium
+ 
+   * Update to git 20210202 from the gcc-8 branch.
+     - Fix PR target/98618 (AArch64), PR fortran/86470, PR libgomp/65099,
+       PR libstdc++/98605, PR libstdc++/65480, PR libstdc++/68735.
+   * Fix PR target/97528 (ARM), taken from the gcc-10 branch.
+ 
+  -- Matthias Klose <doko@debian.org>  Tue, 02 Feb 2021 11:40:35 +0100
  
  gcc-8 (8.4.0-6) unstable; urgency=medium
  

diff --cc debian/rules.patch
Simple merge