Merge version 2.38-3+rpi1 and 2.38-4 to produce 2.38-4+rpi1

diff --cc debian/changelog
index 3e845846e195ae36028f2fd840066e61afb7522c,2955654a1c9365e5c5d830cafeab0bff6275c815..0cc8026159557f3156ea52fd2e13424e93879665
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,26 -1,17 +1,41 @@@
- binutils (2.38-3+rpi1) bookworm-staging; urgency=medium
++binutils (2.38-4+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, 17 Mar 2022 21:51:51 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 06 May 2022 02:32:12 +0000
++
+ binutils (2.38-4) unstable; urgency=medium
+ 
+   * Update from the binutils 2.38 branch:
+     - Fix PR ld/29087, x86: invalid relocation against protected symbol.
+     - s390: Add DT_JMPREL pointing to .rela.[i]plt with static-pie.
+     - Fix PR ld/22263, s390: Avoid dynamic TLS relocs in PIE.
+     - Fix PR libctf/28933: ld: diagnose corrupted CTF header cth_strlen.
+     - Fix PR 28885.
+     - PR28959, obdump doesn't disassemble mftb instruction.
+     - PowerPC64 DT_RELR relative reloc addresses.
+   * Fix reproducible builds: source tarball embeds build user and group.
+     Closes: #1010238.
+ 
+  -- Matthias Klose <doko@debian.org>  Mon, 02 May 2022 22:50:25 +0200
  
  binutils (2.38-3) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge