Merge version 8.4.0-1+rpi1 and 8.4.0-3 to produce 8.4.0-3+rpi1

diff --cc debian/changelog
index 2e235aa12a3f6be07fe26eaec7f1d34cafac41d2,40128fa79812a21a72ffd6bcb77053dd0c56f69e..e080335fd33218040786aaccc7adbc3b33fe0370
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,28 +1,38 @@@
- gcc-8 (8.4.0-1+rpi1) bullseye-staging; urgency=medium
++gcc-8 (8.4.0-3+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>  Tue, 10 Mar 2020 20:47:53 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 18 Apr 2020 19:54:28 +0000
++
+ gcc-8 (8.4.0-3) unstable; urgency=medium
+ 
+   * Update to git 20200402 from the gcc-8 branch.
+     - Fix PR target/93819 (PPC), PR target/87583 (PPC), PR gcov-profile/91601,
+       PR lto/94249, PR c++/84733, PR fortran/94030, PR fortran/92775,
+       PR fortran/93484.
+   * Fix libgcc-sN dependency generation. Closes: #954826.
+ 
+  -- Matthias Klose <doko@debian.org>  Thu, 02 Apr 2020 15:30:15 +0200
+ 
+ gcc-8 (8.4.0-2) unstable; urgency=medium
+ 
+   * Update to git 20200323 from the gcc-8 branch.
+     - Fix PR driver/92757, PR tree-optimization/94163, PR libgcc/85334,
+       PR rtl-optimization/94119, PR target/91913 (ARM), PR c/93949,
+       PR c++/92909, PR c++/92068, PR c++/93248, PR fortran/93462.
+   * For all runtime libraries, generate dependencies on libgcc-sN instead
+     on libgccN, when libgccN isn't built from this source package.
+   * Stop shipping the include-fixed directory.
+   * Move limits.h and syslimits.h into <gcc-lib-dir>/include, and remove
+     <gcc-lib-dir>/include-fixed.
+   * Fix building gnattools in an amd64 "cross" build.
+   * Generate dependencies on libgcc-sN if not building the common packages.
+ 
+  -- Matthias Klose <doko@debian.org>  Mon, 23 Mar 2020 16:00:42 +0100
  
  gcc-8 (8.4.0-1) unstable; urgency=medium
  

diff --cc debian/rules.defs
Simple merge