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

diff --cc debian/changelog
index e080335fd33218040786aaccc7adbc3b33fe0370,c5e8b16f896a62ffc72a6ed1ac5af3803a150979..56d30a032445928823279db1901c38804cf0cf74
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,24 +1,34 @@@
- gcc-8 (8.4.0-3+rpi1) bullseye-staging; urgency=medium
++gcc-8 (8.4.0-4+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>  Sat, 18 Apr 2020 19:54:28 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 23 May 2020 09:17:53 +0000
++
+ gcc-8 (8.4.0-4) unstable; urgency=medium
+ 
+   * Update to git 20200519 from the gcc-8 branch.
+     - Fix PR target/94515, PR tree-optimization/93674, PR target/94613 (S390),
+       PR target/94814 (AArch64), PR target/90724 (AArch64),
+       PR target/94435 (AArch64), PR target/94368 (AArch64),
+       PR target/92692 (AArch64), PR tree-optimization/94482,
+       PR target/94556 (x86), PR target/94396 (AArch64), PR target/94417 (x86),
+       PR target/94603 (x86), PR target/94584 (xtensa), PR target/94500 (x86),
+       PR tree-optimization/93435, PR ipa/94445, PR fortran/85982,
+       PR bootstrap/94918, PR c++/90736, PR c++/91377, PR c++/91966,
+       PR c++/84733, PR c++/92909, PR c++/92068, PR c++/93248, PR fortran/59107,
+       PR fortran/93956, PR fortran/94788, PR fortran/93956, PR fortran/94270,
+       PR fortran/94030, PR fortran/92775, PR fortran/93484, PR fortran/93462,
+       PR libstdc++/93960.
+   * Fix local patch for PR jit/87808. Addresses: #954898.
+   * Don't include lib*gomp1 and libgcc4 in the control file, when not building
+     the common libraries.
+   * Build-depend on lib*gcc-sN packages for recent development releases.
+ 
+  -- Matthias Klose <doko@debian.org>  Tue, 19 May 2020 13:13:06 +0200
  
  gcc-8 (8.4.0-3) unstable; urgency=medium
  

diff --cc debian/rules.defs
Simple merge