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

diff --cc debian/changelog
index f3e2d84e81ddac3905a4f61b9b8ef184adba6001,b41933b08b104e301dd435a1d81631485960896a..12deaf4f2f4ecc55117202477c37d725a5461e90
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,56 +1,66 @@@
- gcc-12 (12.1.0-2+rpi1) bookworm-staging; urgency=medium
++gcc-12 (12.1.0-5+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>  Thu, 19 May 2022 22:10:52 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 17 Jul 2022 05:02:02 +0000
++
+ gcc-12 (12.1.0-5) unstable; urgency=medium
+ 
+   * Update to git 20210629 from the gcc-12 branch.
+     - Fix PR bootstrap/105551, PR rtl-optimization/106032, PR ipa/105600,
+       PR middle-end/106030, PR target/106096, PR tree-optimization/105736,
+       PR tree-optimization/105254, PR tree-optimization/105940,
+       PR tree-optimization/105940, PR target/105960 (x86), PR ipa/105739,
+       PR target/105209 (alpha), PR target/105970 (x86), PR middle-end/105998,
+       PR middle-end/105951, PR target/105981 (ARM), PR target/104871 (Darwin),
+       PR target/105599 (Darwin), PR target/105953 (x86), PR c++/105931,
+       PR c++/105925, PR c++/105885, PR c++/105964, PR c++/105908,
+       PR c++/106001, PR c++/105871, PR libgomp/106045.
+ 
+   [ Matthias Klose ]
+   * Fix PR bootstrap/105551, taken from the trunk.
+ 
+   [ Nicolas Boulenguez ]
+   * ada: move ada/debian_packaging.mk from the gcc-BV source package
+     back to gnat.
+ 
+  -- Matthias Klose <doko@debian.org>  Wed, 29 Jun 2022 15:42:10 +0200
+ 
+ gcc-12 (12.1.0-4) unstable; urgency=medium
+ 
+   * Update to git 20210616 from the gcc-12 branch.
+     - Fix PR target/105953 (x86).
+   * Fix PR bootstrap/105551, taken from the trunk.
+ 
+  -- Matthias Klose <doko@debian.org>  Thu, 16 Jun 2022 07:16:59 +0200
+ 
+ gcc-12 (12.1.0-3) unstable; urgency=medium
+ 
+   * Update to git 20210612 from the gcc-12 branch.
+     - Fix PR target/105879 (xtensa), PR target/105854 (x86),
+       PR tree-optimization/105786, PR tree-optimization/105726,
+       PR middle-end/105711, PR middle-end/105604, PR ipa/105639,
+       PR sanitizer/105729, PR sanitizer/105714, PR c/105635, PR target/101891,
+       PR other/105527, PR target/105556 (PPC), PR tree-optimization/103116,
+       PR tree-optimization/105618, PR rtl-optimization/105577,
+       PR tree-optimization/105562, PR rtl-optimization/105559,
+       PR middle-end/105537, PR tree-optimization/105431,
+       PR tree-optimization/105458, PR target/105162 (AArch64),
+       PR rtl-optimization/105455, PR c++/105756, PR c++/105852, PR c++/105761,
+       PR c++/105761, PR c++/105795, PR c++/105734, PR c++/105779,
+       PR c++/105491, PR c++/105652, PR c++/105655, PR c++/105623,
+       PR c++/102307, PR c++/105725, PR c++/105589, PR c++/105191,
+       PR c++/92385, PR c++/104470, PR c++/102651, PR c++/49387,
+       PR d/105544, PR fortran/105230, PR preprocessor/105732,
+       PR gcov-profile/105535, PR libgomp/105745, PR libstdc++/105671,
+       PR libstdc++/105681.
+   * Reenable the jit build on m68k. Closes: #1009026.
+ 
+  -- Matthias Klose <doko@debian.org>  Sun, 12 Jun 2022 19:19:41 +0200
  
  gcc-12 (12.1.0-2) unstable; urgency=medium
  

diff --cc debian/rules.defs
Simple merge

diff --cc debian/rules.patch
Simple merge