Merge version 12.4.0-1+rpi1 and 12.4.0-2 to produce 12.4.0-2+rpi1

diff --cc debian/changelog
index cf9bf699eaa068e73131dc02d85881ef5cfba7b3,d2d4d9473a8040fe73d23aa718b6242183ce932a..183e8c5fb80239433ad803905129f1d77f2cd347
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,20 +1,30 @@@
- gcc-12 (12.4.0-1+rpi1) trixie-staging; urgency=medium
++gcc-12 (12.4.0-2+rpi1) trixie-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, 25 Jun 2024 15:40:55 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 26 Jul 2024 02:04:23 +0000
++
+ gcc-12 (12.4.0-2) unstable; urgency=medium
+ 
+   * Update to git 20240711 from the gcc-12 branch.
+     - Fix PR middle-end/115836, PR target/103100 (AArch64),
+       PR target/87376 (AVR), PR target/115475 (AArch64),
+       PR target/115457 (AArch64), PR target/115691 (PA), PR target/98762 (AVR),
+       PR target/106069 (PPC), PR target/115355 (PPC), PR target/88236 (AVR),
+       PR target/115726 (AVR), PR target/114846 (PPC), PR libstdc++/115807,
+       PR libstdc++/115454, PR libstdc++/115575, PR libstdc++/115454.
+   * Starting with Ubuntu 24.10, stop building s390x multilibs.
+   * Pass --package-metadata on distros with supporting linkers (starting
+     with Debian trixie and Ubuntu noble).
+     The package metadata is constructed from the environment variables
+     ELF_PACKAGE_METADATA.
+     Setting NO_PKG_METADATA=1 disables the generation of the package metadata.
+ 
+  -- Matthias Klose <doko@debian.org>  Thu, 11 Jul 2024 15:34:19 +0200
  
  gcc-12 (12.4.0-1) unstable; urgency=medium
  

diff --cc debian/rules.defs
Simple merge

diff --cc debian/rules.patch
Simple merge