Manual merge of version 13.3.0-1+rpi2 and 13.3.0-16 to produce 13.3.0-16+rpi1

diff --cc debian/changelog
index 87de432923929036ef34275131f89fb51915c09a,751012cf21ba09be628ad0a4a1ad6b6bf819263c..db315b93df4c4186f6eaafa4bce7801d2b8d772e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,278 +1,296 @@@
- gcc-13 (13.3.0-1+rpi2) trixie-staging; urgency=medium
- 
-   * Re-enable modula 2 compiler.
- 
-  -- Peter Michael Green <plugwash@raspbian.org>  Tue, 23 Jul 2024 12:17:46 +0000
- 
- gcc-13 (13.3.0-1+rpi1) trixie-staging; urgency=medium
++gcc-13 (13.3.0-16+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).
 +
 +  [changed introduced in gcc-13 13.3.0-1+rpi1 by Peter Michael Green]
 +  * Enable patch ada-armel-libatomic on armhf too.
 +  * Disable modula-2 compiler.
 +  * Disable jit compiler.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 29 Jun 2024 05:45:29 +0000
++  [changes brought forward from 13.3.0-1+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Tue, 23 Jul 2024 12:17:46 +0000]
++  * Re-enable modula 2 compiler.
++
++ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 24 Jun 2025 14:55:51 +0000
++
+ gcc-13 (13.3.0-16) unstable; urgency=medium
+ 
+   * Update to git 20250514 from the gcc-13 branch.
+     - Fix PR ipa/119852, PR middle-end/118411, PR target/119610 (AArch64),
+       PR debug/101533, PR middle-end/101478, PR tree-optimization/87984,
+       PR middle-end/66279, PR tree-optimization/111125, PR c++/79786,
+       PR lto/91299, PR libstdc++/112351.
+   * Ada: revert upstream a210011c, restore libgnat hash.  See: #1104593.
+   * libsanitizer: Fix build with glibc 2.42.
+ 
+  -- Matthias Klose <doko@debian.org>  Wed, 14 May 2025 10:16:33 +0200
+ 
+ gcc-13 (13.3.0-15) unstable; urgency=medium
+ 
+   * Update to git 20250502 from the gcc-13 branch.
+     - Fix PR ada/112958.
+   * Fix multilib installation for PR libstdc++/103382. Closes: #1104493.
+   * gnat: Add gnat-N-<triplet> conflicts. Closes: #1063664.
+ 
+  -- Matthias Klose <doko@debian.org>  Sat, 03 May 2025 20:43:18 +0200
+ 
+ gcc-13 (13.3.0-14) experimental; urgency=medium
+ 
+   * Update to git 20250430 from the gcc-13 branch.
+     - Fix PR tree-optimization/118924, PR tree-optimization/118924,
+       PR tree-optimization/119399, PR tree-optimization/116125,
+       PR target/119235 (S390), PR rtl-optimization/119785,
+       PR driver/119727, PR lto/119625, PR rtl-optimization/119291,
+       PR middle-end/119204, PR middle-end/119219, PR c/119183,
+       PR c/114870, PR tree-optimization/118915, PR ipa/117432,
+       PR target/118776 (x86), PR tree-optimization/118689,
+       PR middle-end/114877, PR middle-end/118024, PR sanitizer/117960,
+       PR rtl-optimization/117095, PR target/117642, PR middle-end/102674,
+       PR middle-end/43374, PR tree-optimization/94589,
+       PR tree-optimization/117612, PR tree-optimization/117439,
+       PR target/117296, PR middle-end/117249, PR sanitizer/117209,
+       PR target/116738 (x86), PR tree-optimization/116412,
+       PR middle-end/113546, PR tree-optimization/118922,
+       PR tree-optimization/117243, PR tree-optimization/116749,
+       PR tree-optimization/116922, PR middle-end/111285,
+       PR rtl-optimization/119689, PR rtl-optimization/115568,
+       PR rtl-optimization/115568, PR rtl-optimization/116564,
+       PR tree-optimization/119145, PR tree-optimization/117424,
+       PR tree-optimization/117113, PR tree-optimization/116906,
+       PR lto/114501, PR tree-optimization/114052, PR lto/113207,
+       PR tree-optimization/112859, PR tree-optimization/112859,
+       PR tree-optimization/115347, PR ipa/111245, PR middle-end/115110,
+       PR ipa/118318, PR c++/114992, PR middle-end/43374, PR c/117230,
+       PR c/119582, PR c/119000, PR c/117745, PR c++/114772, PR c++/101180,
+       PR c++/111075, PR c++/98533, PR c++/119123, PR c++/119045,
+       PR c++/118763, PR c++/118661, PR c++/117827, PR c++/118509,
+       PR c++/117825, PR c++/116108, PR c++/117317, PR c++/117259,
+       PR c++/116678, PR c++/114525, PR c++/117504, PR c++/116681,
+       PR c++/114292, PR c++/118104, PR d/118477, PR d/119826, PR d/119817,
+       PR d/118309, PR d/117002, PR d/117621, PR fortran/119656,
+       PR fortran/116706, PR libgcc/101075, PR libgcc/119796,
+       PR libgcc/119151, PR libstdc++/117406, PR libstdc++/117321,
+       PR libstdc++/108760, PR libstdc++/105609, PR libstdc++/117121,
+       PR libstdc++/108846, PR libstdc++/116471, PR libstdc++/106612,
+       PR libstdc++/118093, PR libstdc++/104395, PR libstdc++/21334,
+       PR libstdc++/119671, PR libstdc++/101587, PR libstdc++/101587,
+       PR libstdc++/110498, PR libstdc++/114758, PR libstdc++/117983,
+       PR libstdc++/116212, PR libstdc++/119429, PR libstdc++/108236,
+       PR libstdc++/109517, PR libstdc++/109976, PR libstdc++/106212,
+       PR libstdc++/117966, PR libstdc++/90389, PR libstdc++/118035,
+       PR libstdc++/118158, PR libstdc++/101527.
+   * On ppc64el configure --with-long-double-format=ieee for upcoming distros.
+   * Address PR libstdc++/103382, when not building the common libs, install
+     the library in the gcc_lib_dir to link against the libstdc++ from this
+     GCC version.
+ 
+  -- Matthias Klose <doko@debian.org>  Wed, 09 Apr 2025 07:33:08 +0200
+ 
+ gcc-13 (13.3.0-13) unstable; urgency=medium
+ 
+   * Update to git 20250315 from the gcc-13 branch.
+     - Fix PR c++/110031, PR c++/114349, PR c++/114854, PR c++/109966,
+       PR c++/109859, PR c++/109680, PR c++/117985, PR c++/113158,
+       PR c++/111132, PR c++/116369, PR c++/110382, PR c++/115657,
+       PR c++/110114, PR c++/115476, PR fortran/105152 PR fortran/100193,
+       PR fortran/87496, PR fortran/103389, PR fortran/104429, PR fortran/82774,
+       PR ipa/118243, PR target/115485 (ARM), PR rtl-optimization/118739,
+       PR tree-optimization/118976, PR target/116999 (AArch64),
+       PR target/117045 (AArch64), PR testsuite/116238, PR target/116720 (RISCV),
+       PR target/118835 (S390), PR tree-optimization/117912,
+       PR tree-optimization/116850, PR middle-end/115641,
+       PR tree-optimization/118717, PR tree-optimization/117119,
+       PR tree-optimization/114921, PR tree-optimization/114921, PR jit/118780,
+       PR target/118800 (AArch64), PR target/118825 (x86), PR middle-end/115913,
+       PR target/110901 (AArch64), PR target/113257 (AArch64),
+       PR target/118067 (X86), PR gcov-profile/116743,
+       PR tree-optimization/117574, PR tree-optimization/117417,
+       PR tree-optimization/117333, PR tree-optimization/117307,
+       PR tree-optimization/117254, PR tree-optimization/117104,
+       PR middle-end/117086, PR middle-end/116891, PR tree-optimization/116768,
+       PR tree-optimization/116481, PR tree-optimization/116380,
+       PR tree-optimization/116290, PR ada/118712, PR ada/119265,
+       PR c++/119134, PR c++/118047, PR c++/118355, PR c++/117153,
+       PR c++/118255, PR c++/118147, PR c++/117775, PR d/119139, PR d/116961,
+       PR d/111650, PR d/114434, PR fortran/59252, PR fortran/106692,
+       PR jit/118780.
+   * Only provide the gnat-V-HASH for native compilers.
+   * Add lib32<lib> conflicts for libn32<lib> packages. Addresses: #1092571.
+   * Refresh patches.
+   * Bump standards version.
+ 
+  -- Matthias Klose <doko@debian.org>  Sat, 15 Mar 2025 07:41:49 +0100
+ 
+ gcc-13 (13.3.0-12) unstable; urgency=medium
+ 
+   * Update to git 20241231 from the gcc-13 branch.
+     - Fix PR fortran/117797, PR fortran/117897.
+   * d/control: Add Rules-Requires-Root: binary-targets. Too late for trixie.
+   * Drop the package-metadata spec, now implemented in the linkers.
+   * Apply proposed patch for PR modula2/118045.
+   * Fix check for assembler section merging support on ARM, see binutils
+     PR ld/32491.
+ 
+  -- Matthias Klose <doko@debian.org>  Tue, 31 Dec 2024 09:06:06 +0100
+ 
+ gcc-13 (13.3.0-11) unstable; urgency=medium
+ 
+   * Don build ada for hurd-amd64.
+   * Revert PR ada/117996, causing a change in the gnat-13-xxx provides.
+     See #1090345.
+ 
+  -- Matthias Klose <doko@debian.org>  Tue, 17 Dec 2024 09:40:13 +0100
+ 
+ gcc-13 (13.3.0-10) unstable; urgency=medium
+ 
+   * Update to git 20241216 from the gcc-13 branch.
+     - Fix PR target/64242 (AVR), PR ada/117996, PR c++/116424, PR c++/117615,
+       PR fortran/117730, PR fortran/84674, PR fortran/105054,
+       PR libstdc++/117822, PR libstdc++/117560, PR libstdc++/114394.
+   * Fix amdgcn-tools links for the amdgcn offload install.
+   * 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.
+   * Fix PR libgomp/117851, taken from the trunk.
+   * Remove the ada-nobiarch-check patch, superseded.
+   * Run the tests sequentially on architectures with failing builds.
+   * Rewrite the logwatch script to look at all log files.
+   * Fix libphobos testsuite with sbuild's unshare backend. Addresses: #1089007.
+ 
+  -- Matthias Klose <doko@debian.org>  Mon, 16 Dec 2024 13:39:40 +0100
+ 
+ gcc-13 (13.3.0-9) unstable; urgency=medium
+ 
+   * Update to git 20241128 from the gcc-13 branch.
+     - Fix PR target/117562 (x86), PR target/117744 (AVR),
+       PR target/117357 (x86), PR middle-end/116997, PR target/117659 (AVR),
+       PR target/117500 (AVR), PR target/117564 (PA), PR target/117525 (PA),
+       PR tree-optimization/117142, 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 ipa/115815, PR target/117159 (x86),
+       PR target/117116 (x86), PR tree-optimization/109934,
+       PR tree-optimization/109920, PR ipa/109985, PR ipa/113787,
+       PR ipa/115033, PR ipa/114207, PR ipa/111613, PR ada/115917, PR ada/117328,
+       PR ada/113868, PR ada/116551, PR ada/114593, PR c++/116731, PR c++/117158,
+       PR fortran/117763, PR fortran/84869, PR fortran/116388, PR fortran/109345,
+       PR fortran/115700, PR fortran/115070, PR fortran/115348, PR fortran/79685,
+       PR fortran/116040, PR fortran/112459, PR fortran/84868,
+       PR preprocessor/117118, PR libstdc++/101228, PR libstdc++/117135,
+       PR libstdc++/116777, PR libstdc++/113663, PR libstdc++/114387,
+       PR libstdc++/115854, PR libstdc++/116549, PR c++/116369,
+       PR libstdc++/117094, PR libstdc++/116754, PR libstdc++/117085.
+   * Fix running the tests with exactly one dejagnu run.
+ 
+  -- Matthias Klose <doko@debian.org>  Thu, 28 Nov 2024 12:11:08 +0100
+ 
+ gcc-13 (13.3.0-8) unstable; urgency=medium
+ 
+   * Update to git 20241010 from the gcc-13 branch.
+     - Fix PR ada/115535.
+ 
+  -- Matthias Klose <doko@debian.org>  Thu, 10 Oct 2024 11:15:22 +0200
+ 
+ gcc-13 (13.3.0-7) unstable; urgency=medium
+ 
+   [ Matthias Klose ]
+   * Update to git 20241009 from the gcc-13 branch.
+     - Fix PR target/116512 (x86), PR target/116962 (x86),
+       PR tree-optimization/116585, PR ipa/113291, PR target/116839 (x86),
+       PR target/115860 (S390), PR tree-optimization/116057,
+       PR tree-optimization/115841, PR tree-optimization/115701,
+       PR tree-optimization/115694, PR tree-optimization/115669,
+       PR tree-optimization/115646, PR tree-optimization/115278,
+       PR tree-optimization/115197, PR target/116621 (x86),
+       PR target/116287 (x86), PR tree-optimization/116034, PR middle-end/115527,
+       PR target/116617 (x86), PR ipa/116410, PR target/113780 (ARM),
+       PR ada/115535, PR ada/114640, PR ada/114636, PR c++/116676, PR c++/116449,
+       PR fortran/100273, PR lto/116614, PR libstdc++/115399,
+       PR libstdc++/116641, PR libstdc++/116857, PR libstdc++/116755,
+       PR libstdc++/114770.
+   * Bump standards version.
+ 
+   [ Nicolas Boulenguez ]
+   * Link libgnarl with libatomic on sparc. Closes: #1072071.
+ 
+  -- Matthias Klose <doko@debian.org>  Wed, 09 Oct 2024 15:54:35 +0200
+ 
+ gcc-13 (13.3.0-6) unstable; urgency=medium
+ 
+   * Update to git 20240830 from the gcc-13 branch.
+     - Fix PR ipa/115277, PR target/114603 (AArch64), PR target/116407 (AVR),
+       PR target/114607 (AArch64), PR target/116043 (x86), PR target/113384 (PA),
+       PR target/116189 (SH), PR c++/113063, PR c++/116289, PR fortran/108889.
+   * gcc/configure.ac enables some features based on the binutils version. The
+     most recently checked binutils version is 2.36 for GCC 14.  For now it is
+     safe to derive the binutils runtime dependency from the binutils build
+     dependency.
+ 
+  -- Matthias Klose <doko@debian.org>  Fri, 30 Aug 2024 12:29:24 +0200
+ 
+ gcc-13 (13.3.0-5) unstable; urgency=medium
+ 
+   * Configure with --with-abi=lp64d --disable-multilib on loong64.
+   * Use the versioned gnatbind and gnatmake binaries for the build.
+   * Emit the config.log when the configure step fails.
+   * Fix two lintian warnings for the control file.
+   * Build-depend on pkgconf instead of pkg-config.
+ 
+  -- Matthias Klose <doko@debian.org>  Mon, 05 Aug 2024 05:42:17 +0200
+ 
+ gcc-13 (13.3.0-4) unstable; urgency=medium
+ 
+   * Update to git 20240731 from the gcc-13 branch.
+     - Fix 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/113719 (x86),
+       PR target/115872, PR target/115752 (loong), PR target/115611 (ARM),
+       PR fortran/103115, PR fortran/113363, PR fortran/103312,
+       PR libstdc++/116070, PR libstdc++/115522.
+   * Build libitm1 on loong64 and riscv64.
+   * Show bootstrap compilers in the build log.
+ 
+  -- Matthias Klose <doko@debian.org>  Wed, 31 Jul 2024 08:09:38 +0200
+ 
+ gcc-13 (13.3.0-3) unstable; urgency=medium
+ 
+   * Update to git 20240711 from the gcc-13 branch.
+     - PR middle-end/115836, PR fortran/84006, PR fortran/100027,
+       PR fortran/98534, PR libstdc++/115807, PR libstdc++/115585.
+   * 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>  Fri, 12 Jul 2024 17:06:58 +0200
+ 
+ gcc-13 (13.3.0-2) unstable; urgency=medium
+ 
+   * Update to git 20240707 from the gcc-13 branch.
+     - Fix PR target/106069 (PPC), PR target/115355 (PPC),
+       PR target/103100 (AArch64), PR target/115618 (AArch64),
+       PR target/114846 (PPC), PR driver/115440, PR fortran/83865,
+       PR libstdc++/115668, PR libstdc++/115454, PR libstdc++/115575,
+       PR target/87376 (AVR), PR target/115475 (AArch64),
+       PR target/115457 (AArch64), PR target/115691 (PARISC),
+       PR target/98762 (AVR), PR target/106069 (PPC), PR target/115355 (PPC),
+      PR target/88236 (AVR), PR target/115726 (AVR).
+   * Disable running the tests on the Ubuntu arm64 buildds (times out).
+   * Starting with Ubuntu 24.10, stop building s390x multilibs.
+   * d/p/0006-Ada-select-64-bits-time-functions-from-GNU-libc-when-.diff
+     Adjust for the new glibc behaviour of defining __USE_TIME_BITS64 also
+     on native 64-bits platforms (Simon Chopin). Closes: #1074577. LP: #2071605.
+   * Build target libraries with -mbranch-protection=standard to enable PAC/BTI
+     support on arm64 (Emanuele Rocca). Closes: #1055711.
+   * Build target libraries with -fno-omit-frame-pointer, when enabled in
+     dpkg-buildflags.
+ 
+  -- Matthias Klose <doko@debian.org>  Mon, 08 Jul 2024 12:53:33 +0200
  
  gcc-13 (13.3.0-1) unstable; urgency=medium
  

diff --cc debian/control
index 25bc411adffb39ee31970b38a927fa6e908f4b45,3137d12e2eb0a2e61f57e3025fd9e5b0919e7b07..00d5c2d30c0d53ac0b226a5f1fcdb0c4ea7d07b5
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -11,14 -11,14 +11,14 @@@ Build-Depends: debhelper (>= 9.20141010
    dwz, libunwind8-dev [ia64], libatomic-ops-dev [ia64],
    gawk, lzma, xz-utils, patchutils,
    libzstd-dev, zlib1g-dev, systemtap-sdt-dev [linux-any],
-   binutils:native (>= 2.37), binutils-hppa64-linux-gnu:native (>= 2.37) [hppa amd64 i386 x32],
+   binutils:native (>= 2.39), binutils-hppa64-linux-gnu:native (>= 2.39) [hppa amd64 i386 x32],
    gperf (>= 3.0.1), bison (>= 1:2.3), flex,
 -  gettext, nvptx-tools [amd64 arm64 ppc64el], amdgcn-tools [amd64],
 +  gettext, nvptx-tools [amd64 arm64 ppc64el],
    texinfo (>= 4.3), locales-all, sharutils,
-   procps, gnat-13:native [!arc !ia64 !loong64 !sh3 !sh3eb !sh4eb], g++-13:native, netbase, gdc-13:native [!arc !ia64 !loong64 !m68k !sh4 !s390 !sparc64 !alpha !hurd-alpha !hurd-amd64 !hurd-i386 !kfreebsd-amd64 !kfreebsd-i386],
 -  procps, gnat-13:native [!arc !ia64 !loong64 !sh3 !sh3eb !sh4eb !hurd-amd64], g++-13:native, netbase, gdc-13:native [!arc !ia64 !loong64 !m68k !sh4 !s390 !sparc64 !alpha !hurd-alpha !hurd-amd64 !hurd-i386 !kfreebsd-amd64 !kfreebsd-i386], python3:any,
++  procps, gnat-13:native [!arc !ia64 !loong64 !sh3 !sh3eb !sh4eb !hurd-amd64], g++-13:native, netbase, gdc-13:native [!arc !ia64 !loong64 !m68k !sh4 !s390 !sparc64 !alpha !hurd-alpha !hurd-amd64 !hurd-i386 !kfreebsd-amd64 !kfreebsd-i386],
    libisl-dev (>= 0.20), libmpc-dev (>= 1.0), libmpfr-dev (>= 3.0.0-9~), libgmp-dev (>= 2:5.0.1~), lib32z1-dev [amd64 kfreebsd-amd64], lib64z1-dev [i386], unzip <!nocheck>,
-   dejagnu <!nocheck>, coreutils (>= 2.26) | realpath (>= 1.9.12), chrpath, lsb-release, quilt, time,
-   pkg-config, libgc-dev,
+   dejagnu <!nocheck>, git <!nocheck>, coreutils (>= 2.26) | realpath (>= 1.9.12), chrpath, lsb-release, quilt, time,
+   pkgconf, libgc-dev,
    g++-13-for-host <cross>, gobjc-13-for-host [!avr] <cross>, gfortran-13-for-host <cross>, gdc-13-for-host [!s390 !sh4] <cross>, gccgo-13-for-host [!hppa !m68k !sh4] <cross>, gnat-13-for-host [!m68k] <cross>, gm2-13-for-host [!loong64 !powerpc !ppc64 !sh4 !hurd-amd64 !hurd-i386 !kfreebsd-amd64 !kfreebsd-i386] <cross>,
  Build-Depends-Indep: doxygen (>= 1.7.2) <!nodoc>, graphviz (>= 2.2) <!nodoc>, ghostscript <!nodoc>, texlive-latex-base <!nodoc>, xsltproc <!nodoc>, libxml2-utils <!nodoc>, docbook-xsl-ns <!nodoc>,
  Homepage: http://gcc.gnu.org/

diff --cc debian/rules.defs
Simple merge

diff --cc debian/rules.patch
Simple merge