Merge version 11.2.0-4+rpi1 and 11.2.0-7 to produce 11.2.0-7+rpi1

diff --cc debian/changelog
index fa65d7873a4a656f76e731ba42a5f29e79f6c44a,1a4d1d19b963c12639c1071017d56be0813fb41d..3c2ad227a66448ffa3b4a2a0433308cb9af27000
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,25 +1,35 @@@
- gcc-11 (11.2.0-4+rpi1) bookworm-staging; urgency=medium
++gcc-11 (11.2.0-7+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).
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 07 Sep 2021 12:58:11 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 29 Sep 2021 16:32:05 +0000
++
+ gcc-11 (11.2.0-7) unstable; urgency=medium
+ 
+   * Update to git 20210918 from the gcc-11 branch.
+     - Fix PR rtl-optimization/102306, PR target/101934 (AArch64), PR c++/88578,
+       PR c++/102295, PR target/97142 (PPC), PR ada/101970, PR c++/102305,
+       PR d/102185, PR fortran/85130, PR fortran/82314, PR fortran/98490,
+       PR fortran/101327.
+   * Fix libgcc-s1 symbols file for alpha.
+   * Don't build libjit on kfreebsd. See #994035.
+ 
+  -- Matthias Klose <doko@debian.org>  Sun, 19 Sep 2021 10:08:56 +0200
+ 
+ gcc-11 (11.2.0-5) unstable; urgency=medium
+ 
+   * Update to git 20210909 from the gcc-11 branch.
+     - Fix PR c++/60318, PR target/102224 (x86), PR target/102115 (xtensa),
+       PR tree-optimization/102046, PR tree-optimization/101925,
+       PR middle-end/101824, PR target/102166 (x86), PR target/101849 (PPC),
+       PR c++/100495, PR fortran/100950, PR fortran/100950, PR fortran/102113.
+   * Configure again with --enable-cet, amd64 and x32 only. Closes: #993626.
+ 
+  -- Matthias Klose <doko@debian.org>  Thu, 09 Sep 2021 13:48:13 +0200
  
  gcc-11 (11.2.0-4) unstable; urgency=medium
  

diff --cc debian/rules.defs
Simple merge

diff --cc debian/rules.patch
Simple merge