Merge version 2.35.1-6+rpi1 and 2.35.1-7 to produce 2.35.1-7+rpi1

diff --cc debian/changelog
index fa6e002d015102a060a2b8711465e23a086b98e6,da817d07583126e33fca576fb235d4ee5f2d4b9f..1ff8018ac5c90560b7c016333f7c9fd236ea2a14
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,28 -1,12 +1,38 @@@
- binutils (2.35.1-6+rpi1) bullseye-staging; urgency=medium
++binutils (2.35.1-7+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.
 +
 +  [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>  Tue, 29 Dec 2020 11:21:42 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 10 Jan 2021 04:50:19 +0000
++
+ binutils (2.35.1-7) unstable; urgency=medium
+ 
+   * Update from the binutils 2.35 branch:
+     - Fix PR gold/27140, ppc32 segmentation fault in make_stub. Closes: #973746.
+     - PR binutils/27128, nm -P portable output format regression.
+     - PR ld/26382, elf: Keep only one '@' for undefined versioned symbols.
+     - nm: Remove --with-symbol-versions.
+ 
+  -- Matthias Klose <doko@debian.org>  Wed, 06 Jan 2021 11:57:25 +0100
  
  binutils (2.35.1-6) unstable; urgency=medium