Merge version 2.37-4+rpi2 and 2.37-5 to produce 2.37-5+rpi1

diff --cc debian/changelog
index 7c68f3af939f691bb23889e0ece6896c300a14b5,2bf68ba9512566b251a68c54ff91cf0e18672b3e..5d1a2ec34d4f3d209bd4ddcd9b04682bdfacac5f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,34 -1,12 +1,41 @@@
- binutils (2.37-4+rpi2) bookworm-staging; urgency=medium
- 
-   * Fix merge screwup that left us with no arm64 cross binutils.
- 
-  -- Peter Michael Green <plugwash@raspbian.org>  Wed, 01 Sep 2021 12:43:37 +0000
- 
- binutils (2.37-4+rpi1) bookworm-staging; urgency=medium
++binutils (2.37-5+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 introduced in 2.35.1-5+rpi1 by Peter Michael Green]
 +  * Touch gold/yyscript.h and gold/yyscript.c in clean target to ensure they are
 +    newer than yyscript.y and hence stop the upstream build system trying to
 +    regenerate them when building from a git checkout.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 28 Aug 2021 20:11:42 +0000
++  [changes brought forward from 2.37-4+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Wed, 01 Sep 2021 12:43:37 +0000]
++  * Fix merge screwup that left us with no arm64 cross binutils.
++
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 02 Sep 2021 14:37:32 +0000
++
+ binutils (2.37-5) unstable; urgency=medium
+ 
+   * Update from the binutils 2.37 branch:
+     - [GOLD] PowerPC64 relocation overflow for -Os register save/restore funcs.
+   * Update libctf0 and libctf-nobsd0 symbols files.
+   * Rebuild man pages, included as empty files in the upstream tarball.
+     Closes: #992323. LP: #1940712.
+ 
+  -- Matthias Klose <doko@debian.org>  Mon, 30 Aug 2021 10:51:17 +0200
  
  binutils (2.37-4) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge