Merge version 12.1.0-5+rpi1 and 12.1.0-7 to produce 12.1.0-7+rpi1

diff --cc debian/changelog
index 12deaf4f2f4ecc55117202477c37d725a5461e90,240a6a750c7d6ceee16f3961f72c4c472d3057b0..26b3d69f99b69c7a19ab0121e1e97784f8fd9f48
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,24 +1,34 @@@
- gcc-12 (12.1.0-5+rpi1) bookworm-staging; urgency=medium
++gcc-12 (12.1.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>  Sun, 17 Jul 2022 05:02:02 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 28 Jul 2022 04:09:27 +0000
++
+ gcc-12 (12.1.0-7) unstable; urgency=medium
+ 
+   * Remove the libphobos test forkgc2.d, hangs. See PR d/103944.
+ 
+  -- Matthias Klose <doko@debian.org>  Mon, 18 Jul 2022 18:35:43 +0200
+ 
+ gcc-12 (12.1.0-6) unstable; urgency=medium
+ 
+   * Update to git 20210717 from the gcc-12 branch.
+     - Fix PR rtl-optimization/105041, PR tree-optimization/105860,
+       PR target/105930 (x86), PR tree-optimization/106114,
+       PR target/105991 (PPC), PR target/106122 (x86), PR c++/106102,
+       PR target/103722 (SH), PR bootstrap/105551, PR target/106097,
+       PR c++/105626, PR c++/106024, PR c++/105541, PR c++/105779,
+       PR c++/106024, 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.
+   * Apply a hack to build libgo on the Hurd. Closes: #1005297.
+ 
+  -- Matthias Klose <doko@debian.org>  Sun, 17 Jul 2022 11:18:47 +0200
  
  gcc-12 (12.1.0-5) unstable; urgency=medium
  

diff --cc debian/rules.defs
Simple merge

diff --cc debian/rules.patch
Simple merge