Merge version 10.4.0-1+rpi1 and 10.4.0-4 to produce 10.4.0-4+rpi1

diff --cc debian/changelog
index 13604540fe7b414df5328f545c27ac6790bfc8e9,367eb95587c568ef6158e4c379242e934c85e655..9d8d051ad457677b5bba36a93586482d71e107f1
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,27 +1,40 @@@
- gcc-10 (10.4.0-1+rpi1) bookworm-staging; urgency=medium
++gcc-10 (10.4.0-4+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from gcc-8 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 gcc-8 8.2.0-16+rpi1 by Peter Michael Green]
 +  * Disable testsuite (build seems to hang after testsuite completes).
 +
 +  [changes introduced in gcc-9 9.1.0-10+rpi1 by Peter Michael Green]
 +  * Update symbols file for raspbian.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 19 Jul 2022 23:29:59 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 29 Jul 2022 16:41:43 +0000
++
+ gcc-10 (10.4.0-4) unstable; urgency=medium
+ 
+   * Fix the backport of the fix for PR target/102952.
+ 
+  -- Matthias Klose <doko@debian.org>  Tue, 19 Jul 2022 11:27:17 +0200
+ 
+ gcc-10 (10.4.0-3) unstable; urgency=medium
+ 
+   * Fix applying the pr102952-doc patch.
+ 
+  -- Matthias Klose <doko@debian.org>  Mon, 18 Jul 2022 16:41:26 +0200
+ 
+ gcc-10 (10.4.0-2) unstable; urgency=medium
+ 
+   * Update to git 20220718 from the gcc-10 branch.
+     - Fix PR tree-optimization/105860, PR d/106139, PR fortran/104313,
+       PR fortran/103137, PR fortran/103138, PR fortran/103693,
+       PR fortran/105243, PR fortran/106121, PR fortran/105954,
+       PR fortran/105691, PR fortran/105813.
+   * Backport PR target/102952, support for -mharden-sls and
+     -mindirect-branch-cs-prefix for x86, suggested by Ben Hutchings.
+     Closes: #1014851.
+ 
+  -- Matthias Klose <doko@debian.org>  Mon, 18 Jul 2022 09:33:00 +0200
  
  gcc-10 (10.4.0-1) unstable; urgency=medium
  

diff --cc debian/rules.patch
Simple merge