Merge version 2.39.90.20221231-1+rpi1 and 2.40-2 to produce 2.40-2+rpi1

diff --cc debian/changelog
index b61abdb7abe17621abfc735b281734efa6c6a9be,4f4e3a1645971fdf7149ab15a07030f6d3247cdf..8904d53c4729313cad8dea4cdb4c9383c4fc2497
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,26 -1,41 +1,65 @@@
- binutils (2.39.90.20221231-1+rpi1) bookworm-staging; urgency=medium
++binutils (2.40-2+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 2.29-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 17 Aug 2017 15:41:49 +0000]
 +  * Disable testsuite, it fails on our lxc based autobuilders.
 +
 +  [changes brought forward from 2.31.1-16+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Thu, 06 Feb 2020 17:10:11 +0000]
 +  * Allow dependency of binutils on binutils-triplet to be satisfied by
 +    foreign architectures, to facilitate setting up environments where the
 +    linker is 64-bit while everything else is 32-bit.
 +
 +  [changes brought forward from 2.35-3+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Tue, 22 Sep 2020 18:10:17 +0000]
 +  * Build sufficient cross binutils to support u-boot build.
 +
 +  [changes brought forward from 2.35.1-3+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Tue, 01 Dec 2020 21:55:01 +0000]
 +  * Build the same set of cross-binutils on arm64 as on armhf.
 +    (avoids issues when control is generated on armhf and then package is
 +    built on arm64)
 +  * Remove <!nocheck> build-depends as testsuite is disabled.
 +
 +  [changes brought forward from 2.37.90.20220130-2+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Thu, 10 Feb 2022 12:05:47 +0000]
 +  * Apply patch proposed upstream to fix glibc link issue.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 05 Jan 2023 03:14:31 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 05 Feb 2023 02:50:50 +0000
++
+ binutils (2.40-2) unstable; urgency=high
+ 
+   * binutils 2.40 release.
+     - ARM: Fix ld bloat introduced between binutils-2.38 and 2.39.
+     - ld/testsuite: Adjust for ELF_MAXPAGESIZE 0x1000.
+     - PR libctf/29983: ctf-link outdated input check faulty.
+     - PR bfd/29988, Fix a potential illegal memory access in the BFD library
+       when parsing a corrupt DWARF file.
+     - PR gas/29940, gas/RISC-V: adjust assembler for opcode table re-ordering.
+     - IBM zSystems: Fix offset relative to static TLS.
+   * Remove the workaround for PR gas/29940.
+   * Refresh patches.
+ 
+  -- Matthias Klose <doko@debian.org>  Sat, 14 Jan 2023 18:24:22 +0100
+ 
+ binutils (2.39.90.20230110-1) unstable; urgency=medium
+ 
+   * New upstream snapshot, taken from the 2.40 branch.
+     - libsframe: adjust an incorrect check in flip_sframe.
+     - sframe: fix the defined SFRAME_FRE_TYPE_*_LIMIT constants.
+     - Fix PR ld/18841, ifunc relocation ordering on ARM.
+     - Skip PR ld/23169 test on ARM.
+     - Fix PR 29972, inconsistent format specification in singular form.
+     - Avoid unaligned pointer reads in PEP idata section.
+     - Update translations.
+   * Build-depend on libzstd-dev.
+   * binutils-source: Depend on libjansson-dev, pkg-config, libzstd-dev.
+   * debian/copyright: Update years.
+   * Bump standards version.
+ 
+  -- Matthias Klose <doko@debian.org>  Tue, 10 Jan 2023 06:17:01 +0100
+ 
+ binutils (2.39.90.20230104-1) unstable; urgency=medium
+ 
+   * New upstream snapshot, taken from the 2.40 branch.
+   * Also don't ship libsframe in i386 cross binutils. Closes: #1026779.
+ 
+  -- Matthias Klose <doko@debian.org>  Wed, 04 Jan 2023 08:44:08 +0100
  
  binutils (2.39.90.20221231-1) unstable; urgency=medium
  

diff --cc debian/control
index c7d7b554d0c98e249bde3d4b4695554136ed6168,e5ab9d8eccbd887d72a27caf7381eca8f1cfb0ca..31d42f53fea42dd2630817a3059f80adf33bb7a5
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -7,7 -7,23 +7,7 @@@ Standards-Version: 4.6.
  Build-Depends: autoconf (>= 2.64), dpkg-dev (>= 1.19.0.5),
    bison, flex, gettext, texinfo, dejagnu, quilt, chrpath, dwz, debugedit (>= 4.16),
    python3:any, file, xz-utils, lsb-release, zlib1g-dev, procps, help2man,
-   libjansson-dev, pkg-config,
+   libjansson-dev, pkg-config, libzstd-dev,
 -  g++-aarch64-linux-gnu [amd64 i386 x32] <!nocheck>,
 -  g++-arm-linux-gnueabi [amd64 arm64 i386 x32] <!nocheck>,
 -  g++-arm-linux-gnueabihf [amd64 arm64 i386 x32] <!nocheck>,
 -  g++-powerpc64le-linux-gnu [amd64 arm64 i386 ppc64 x32] <!nocheck>,
 -  g++-s390x-linux-gnu [amd64 arm64 i386 ppc64el x32] <!nocheck>,
 -  g++-alpha-linux-gnu [amd64 i386 x32] <!nocheck>,
 -  g++-hppa-linux-gnu [amd64 i386 x32] <!nocheck>,
 -  g++-m68k-linux-gnu [amd64 i386 x32] <!nocheck>,
 -  g++-powerpc-linux-gnu [amd64 i386 ppc64el x32] <!nocheck>,
 -  g++-powerpc64-linux-gnu [amd64 i386 x32] <!nocheck>,
 -  g++-riscv64-linux-gnu [amd64 arm64 i386 ppc64el x32] <!nocheck>,
 -  g++-sh4-linux-gnu [amd64 i386 x32] <!nocheck>,
 -  g++-sparc64-linux-gnu [amd64 i386 x32] <!nocheck>,
 -  g++-i686-linux-gnu [amd64 arm64 ppc64el x32] <!nocheck>,
 -  g++-x86-64-linux-gnu [arm64 i386 ppc64el] <!nocheck>,
 -  g++-x86-64-linux-gnux32 [amd64 arm64 i386 ppc64el] <!nocheck>,
  Build-Conflicts: libelf-dev
  Rules-Requires-Root: no
  Homepage: https://www.gnu.org/software/binutils/

diff --cc debian/control.in
index 42f30a73592d5087f024f02a372b23a014d95b6c,8d88fc73b0833360d620d0bd219df4aa2d8a0692..61e3fcab5fd44d2d6416ab5601bcbb9d8841955b
--- 1/debian/control.in
--- 2/debian/control.in
+++ b/debian/control.in
@@@ -3,11 -3,27 +3,11 @@@ Section: deve
  Priority: optional
  Maintainer: Matthias Klose <doko@debian.org>
  Uploaders: James Troup <binutils@elmo.tasta.io>
- Standards-Version: 4.6.1
+ Standards-Version: 4.6.2
  Build-Depends: autoconf (>= 2.64), @dpkg_dev@
 -  bison, flex, gettext, texinfo, dejagnu, quilt, chrpath, dwz, debugedit (>= 4.16),
 +  bison,, flex, gettext, texinfo, dejagnu, quilt, chrpath, dwz, debugedit (>= 4.16),
    python3:any, file, xz-utils, lsb-release, zlib1g-dev, procps, help2man,
-   libjansson-dev, pkg-config
 -  libjansson-dev, pkg-config, libzstd-dev,
 -  g++-aarch64-linux-gnu [amd64 i386 x32] <!nocheck>,
 -  g++-arm-linux-gnueabi [amd64 arm64 i386 x32] <!nocheck>,
 -  g++-arm-linux-gnueabihf [amd64 arm64 i386 x32] <!nocheck>,
 -  g++-powerpc64le-linux-gnu [amd64 arm64 i386 ppc64 x32] <!nocheck>,
 -  g++-s390x-linux-gnu [amd64 arm64 i386 ppc64el x32] <!nocheck>,
 -  g++-alpha-linux-gnu [amd64 i386 x32] <!nocheck>,
 -  g++-hppa-linux-gnu [amd64 i386 x32] <!nocheck>,
 -  g++-m68k-linux-gnu [amd64 i386 x32] <!nocheck>,
 -  g++-powerpc-linux-gnu [amd64 i386 ppc64el x32] <!nocheck>,
 -  g++-powerpc64-linux-gnu [amd64 i386 x32] <!nocheck>,
 -  g++-riscv64-linux-gnu [amd64 arm64 i386 ppc64el x32] <!nocheck>,
 -  g++-sh4-linux-gnu [amd64 i386 x32] <!nocheck>,
 -  g++-sparc64-linux-gnu [amd64 i386 x32] <!nocheck>,
 -  g++-i686-linux-gnu [amd64 arm64 ppc64el x32] <!nocheck>,
 -  g++-x86-64-linux-gnu [arm64 i386 ppc64el] <!nocheck>,
 -  g++-x86-64-linux-gnux32 [amd64 arm64 i386 ppc64el] <!nocheck>,
++  libjansson-dev, pkg-config, libzstd-dev
  Build-Conflicts: libelf-dev
  Rules-Requires-Root: no
  Homepage: https://www.gnu.org/software/binutils/

diff --cc debian/patches/series
index c61ac1ec5d143a182fb8f01ec405ffdbee01e376,87991c96a855d682d812684ca32279153cfaad48..e8c99d9fb994eaac2485788b05147782b755197b
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -24,6 -36,8 +24,5 @@@ mips-hack.dif
  perl-shebang.diff
  
  link-jansson.diff
- pr29940-workaround.diff
 +fix-glibc-link-assertion.patch
 +auto-2.38.50.20220707-1+rpi1-84d864a8c2aeed15bfe172bf90b18895b65054fa-1657735965

diff --cc debian/rules
Simple merge