Merge version 2.37-10.1+rpi1 and 2.37.90.20220123-2 to produce 2.37.90.20220123-2...

diff --cc debian/changelog
index 4ffdb4d30917c1f1402ea728b1aef07817f12c6b,a37ee71ce3a440ddfe2789fd89ce679240e134f8..f86ffefba3fee65109ae235aeb053947716c3986
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,54 -1,61 +1,90 @@@
- binutils (2.37-10.1+rpi1) bookworm-staging; urgency=medium
++binutils (2.37.90.20220123-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 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.
 +
 +  [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>  Tue, 11 Jan 2022 00:10:38 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 01 Feb 2022 11:25:58 +0000
 +
- binutils (2.37-10.1) unstable; urgency=medium
+ binutils (2.37.90.20220123-2) unstable; urgency=medium
  
-   * Non-maintainer upload.
+   * Apply proposed patch for PR ld/28819.
+ 
+  -- Matthias Klose <doko@debian.org>  Tue, 25 Jan 2022 16:57:38 +0100
+ 
+ binutils (2.37.90.20220123-1) unstable; urgency=medium
+ 
+   * New upstream snapshot, taken from the 2.38 release branch.
+ 
+  -- Matthias Klose <doko@debian.org>  Sun, 23 Jan 2022 17:51:30 +0100
+ 
+ binutils (2.37.50.20220121-1) unstable; urgency=medium
+ 
+   * New upstream snapshot.
+   * Revert the last change, PR ld/28751 is fixed.
+ 
+  -- Matthias Klose <doko@debian.org>  Fri, 21 Jan 2022 09:36:36 +0100
+ 
+ binutils (2.37.50.20220106-2) unstable; urgency=medium
+ 
+   * Ignore known regressions on powerpc, ppc64, ppc64el, see PR ld/28751.
+ 
+  -- Matthias Klose <doko@debian.org>  Fri, 07 Jan 2022 08:39:03 +0100
+ 
+ binutils (2.37.50.20220106-1) unstable; urgency=medium
+ 
+   * New upstream snapshot.
+   * Configure with --disable-silent-rules.
    * Disable LTO in mipsel to workaround timeouts during tests.
  
-  -- Bastian Blank <waldi@debian.org>  Sun, 02 Jan 2022 09:17:30 +0100
+  -- Matthias Klose <doko@debian.org>  Thu, 06 Jan 2022 07:38:55 +0100
+ 
+ binutils (2.37.50.20211201-1) experimental; urgency=medium
+ 
+   * New upstream snapshot.
+   * Ignore test regressions on mipsel, riscv64, sparc64.
  
- binutils (2.37-10) unstable; urgency=medium
+  -- Matthias Klose <doko@debian.org>  Wed, 01 Dec 2021 10:52:43 +0100
  
+ binutils (2.37.50.20211118-1) experimental; urgency=medium
+ 
+   * New upstream snapshot.
    * Configure --with-gold-ldflags=-static-libstdc++.
  
-  -- Matthias Klose <doko@debian.org>  Thu, 18 Nov 2021 09:10:54 +0100
+  -- Matthias Klose <doko@debian.org>  Thu, 18 Nov 2021 09:20:55 +0100
+ 
+ binutils (2.37.50.20211115-1) experimental; urgency=medium
+ 
+   * New upstream snapshot.
+ 
+  -- Matthias Klose <doko@debian.org>  Mon, 15 Nov 2021 11:17:26 +0100
  
- binutils (2.37-9) unstable; urgency=medium
+ binutils (2.37.50.20211102-1) experimental; urgency=medium
  
-   * Update from the binutils 2.37 branch:
-     - [GOLD] Place .note.gnu.property section before other note sections.
-     - Fix PR 28540, segmentation fault on NULL byte_get.
-     - Fix PR 28523, ld.bfd created undefined symbols on ppc64.
-   * Update VCS attributes.
+   * New upstream snapshot.
  
-  -- Matthias Klose <doko@debian.org>  Mon, 15 Nov 2021 10:56:26 +0100
+  -- Matthias Klose <doko@debian.org>  Tue, 02 Nov 2021 13:47:31 +0200
  
  binutils (2.37-8) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/control.in
Simple merge

diff --cc debian/rules
index 7e7cea38ae79a6c695102d1a62e40fb67ca3ead7,c0c4f258930ce0341f72e7d957f5552b7c66f3aa..8c51fd508ce957761eb5c842ab9dd69bbcae5e9b
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -185,17 -183,18 +185,18 @@@ endi
  endif
  
  HOST_ARCHS_armhf = amd64 i386 x32 arm64 ppc64el
 -HOST_ARCHS_armel = amd64 i386 x32 arm64 ppc64el
 -HOST_ARCHS_arm64 = amd64 i386 x32 ppc64el
 +HOST_ARCHS_armel = amd64 i386 x32 arm64 ppc64el armhf
 +HOST_ARCHS_arm64 = amd64 i386 x32 ppc64el armhf
  HOST_ARCHS_powerpc = amd64 i386 x32 ppc64el
 -HOST_ARCHS_ppc64el = amd64 i386 x32 ppc64 arm64
 +HOST_ARCHS_ppc64el = amd64 i386 x32 ppc64
  HOST_ARCHS_s390x = amd64 i386 x32 arm64 ppc64el
 -HOST_ARCHS_amd64 = arm64 i386 ppc64el x32
 -HOST_ARCHS_i386 = amd64 arm64 ppc64el x32
 +HOST_ARCHS_amd64 = arm64 i386 ppc64el x32 armhf
 +HOST_ARCHS_i386 = amd64 arm64 ppc64el x32 armhf
  HOST_ARCHS_ia64 = amd64 i386 x32
 -HOST_ARCHS_riscv64 = amd64 i386 x32 arm64 ppc64el
 +HOST_ARCHS_riscv64 = amd64 i386 x32 arm64 ppc64el armhf
  
  HOST_ARCHS_alpha = amd64 i386 x32
+ #HOST_ARCHS_arc = amd64 i386 x32
  HOST_ARCHS_hppa = amd64 i386 x32
  HOST_ARCHS_m68k = amd64 i386 x32
  HOST_ARCHS_ppc64 = amd64 i386 x32 ppc64el