Merge version 2.35.1-3+rpi2 and 2.35.1-4 to produce 2.35.1-4+rpi1

diff --cc debian/changelog
index eb7bfd298790761b84e18728f2d90fc7ec10e859,b97760bad8e71203e1d626efbf9ae0e2d4e92d03..f5d6dc641a183d1ca76166e593b3259fb652f072
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,26 -1,14 +1,35 @@@
- binutils (2.35.1-3+rpi2) bullseye-staging; urgency=medium
- 
-   * 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.
- 
-  -- Peter Michael Green <plugwash@raspbian.org>  Tue, 01 Dec 2020 21:55:01 +0000
- 
- binutils (2.35.1-3+rpi1) bullseye-staging; urgency=medium
++binutils (2.35.1-4+rpi1) bullseye-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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 30 Nov 2020 03:35:06 +0000
++  [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.
++
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 10 Dec 2020 10:38:30 +0000
++
+ binutils (2.35.1-4) unstable; urgency=medium
+ 
+   * Update from the binutils 2.35 branch:
+     - Fix PR ld/27016.
+     - Fix PR binutils/26929, readelf: stack buffer overflow.
+     - Fix PR gas/26858 Fix availability of single precision vmul/vmla
+       in arm mode.
+     - gold: Fix powerpc incremental-dump assertion failure.
+   * Bump standards version.
+ 
+  -- Matthias Klose <doko@debian.org>  Sun, 06 Dec 2020 12:18:40 +0100
  
  binutils (2.35.1-3) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/control.in
Simple merge