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

diff --cc debian/changelog
index 183e8c5fb80239433ad803905129f1d77f2cd347,a1d6118c29247e5877d6c4d07bf8d0669fe986a4..cc103e9a3e6409eaf56c7e5035f6ddedd75d4344
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,45 +1,55 @@@
- gcc-12 (12.4.0-2+rpi1) trixie-staging; urgency=medium
++gcc-12 (12.4.0-4+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>  Fri, 26 Jul 2024 02:04:23 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 13 Jan 2025 07:27:47 +0000
++
+ gcc-12 (12.4.0-4) unstable; urgency=medium
+ 
+   * Update to git 20250102 from the gcc-12 branch.
+     - Fix PR target/64242 (AVR), PR tree-optimization/117142,
+       PR target/117562 (x86), PR target/117744 (AVR), PR target/117357 (x86),
+       PR target/117659 (AVR), PR target/117525 (AVR), PR target/117418 (x86),
+       PR tree-optimization/117398, PR target/117318 (x86),
+       PR rtl-optimization/117327, PR target/116415 (PPC),
+       PR target/117240 (x86), PR target/117159 (x86), PR target/117116 (x86),
+       PR ipa/111613, PR ipa/109985, PR ipa/113787, PR ipa/115033, PR ipa/114207,
+       PR tree-optimization/109934, PR target/116962 (x86),
+       PR tree-optimization/116585, PR target/116839 (x86),
+       PR target/115860 (S390), PR target/116621 (x86), PR ipa/116410,
+       PR target/116512 (x86), PR target/114603 (AArch64),
+       PR target/114607 (AArch64), PR target/116043 (x86), PR target/113384 (PA),
+       PR target/116189 (SH), PR target/114759 (PPC), PR target/114759 (PPC),
+       PR target/115389 (PPC), PR tree-optimization/115843,
+       PR rtl-optimization/115565, PR target/97367 (PPC),
+       PR rtl-optimization/115049, PR target/115526 (alpha),
+       PR target/115872, PR target/115611 (ARM), PR ada/117996, PR ada/115917,
+       PR ada/114593, PR c++/117615, PR c++/117158, PR c++/116676,
+       PR fortran/105054, PR fortran/117763, PR fortran/109345, PR fortran/79685,
+       PR fortran/84868, PR fortran/100273, PR fortran/108889, PR fortran/103115,
+       PR libstdc++/115399, PR libstdc++/116641, PR libstdc++/115585.
+   * Fix amdgcn-tools links for the amdgcn offload install.
+   * Fix check for assembler section merging support on ARM, see binutils
+     PR ld/32491.
+   * Revert PR ada/117996, causing a change in the gnat-12-xxx provides.
+     See #1090345.
+   * d/control: Add Rules-Requires-Root: binary-targets. Too late for trixie.
+   * Rewrite the logwatch script to look at all log files.
+   * Drop the package-metadata spec, now implemented in the linkers.
+   * Fix libphobos testsuite with sbuild's unshare backend. Addresses: #1089007.
+   * Fix PR libgomp/117851, taken from the trunk.
+   * Build-depend on git, needed for the gotools tests.
+   * Don't run the libgo tests for multilibs, that cannot run.
+   * Don't run the gnat and gm2 tests for multilibs, which are not built.
+   * Bump standards version.
+   * Refresh patches.
+   * Remove the ada-nobiarch-check patch, superseded.
+ 
+  -- Matthias Klose <doko@debian.org>  Thu, 02 Jan 2025 18:46:51 +0100
  
  gcc-12 (12.4.0-2) unstable; urgency=medium
  

diff --cc debian/rules.patch
Simple merge