Manual merge of version 2.35.1-4+rpi1 and 2.35.1-5 to produce 2.35.1-5+rpi1

diff --cc debian/changelog
index f5d6dc641a183d1ca76166e593b3259fb652f072,99852e8b9df5e0bfb6da2ea0cab75f1304f932e2..5cefe237b4ed580c06721b9430040906fef1ba46
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,10 +1,31 @@@
- binutils (2.35.1-4+rpi1) bullseye-staging; urgency=medium
++binutils (2.35.1-5+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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 10 Dec 2020 10:38:30 +0000
++ -- Peter Micheal Green <plugwash@raspbian.org>  Sun, 20 Dec 2020 08:27:41 +0000
++
+ binutils (2.35.1-5) unstable; urgency=medium
+ 
+   * Backport the PGO/LTO build patches.
+   * Configure with --enable-pgo-build=lto, but don't do that for the cross
+     packages. Takes some time to build ...
+ 
+  -- Matthias Klose <doko@debian.org>  Thu, 17 Dec 2020 20:42:32 +0100
  
  binutils (2.35.1-4) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge