diff -Nru binutils-2.34/debian/changelog binutils-2.34/debian/changelog
--- binutils-2.34/debian/changelog	2020-05-15 09:49:49.000000000 +0000
+++ binutils-2.34/debian/changelog	2020-05-19 06:07:58.000000000 +0000
@@ -1,3 +1,15 @@
+binutils (2.34-8+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.
+
+ -- Raspbian forward porter <root@raspbian.org>  Tue, 19 May 2020 06:07:58 +0000
+
 binutils (2.34-8) unstable; urgency=medium
 
   * Temporarily drop the test dependencies on the riscv64 and x32 cross
diff -Nru binutils-2.34/debian/control binutils-2.34/debian/control
--- binutils-2.34/debian/control	2020-05-15 09:49:49.000000000 +0000
+++ binutils-2.34/debian/control	2020-05-19 06:07:58.000000000 +0000
@@ -56,7 +56,7 @@
 Package: binutils
 Architecture: any
 Depends: ${shlibs:Depends}, binutils-common (= ${binary:Version}),
-  libbinutils (= ${binary:Version}), ${binutils:native} (= ${binary:Version})
+  libbinutils (= ${binary:Version}), ${binutils:native}:any (= ${binary:Version})
 Conflicts: modutils (<< 2.4.19-1), ${extraConflicts},
   binutils-multiarch (<< 2.27-8)
 Provides: elf-binutils, ${gold:Provides}
diff -Nru binutils-2.34/debian/control.in binutils-2.34/debian/control.in
--- binutils-2.34/debian/control.in	2020-05-15 09:49:29.000000000 +0000
+++ binutils-2.34/debian/control.in	2020-05-19 06:07:58.000000000 +0000
@@ -56,7 +56,7 @@
 Package: binutils
 Architecture: any
 Depends: ${shlibs:Depends}, binutils-common (= ${binary:Version}),
-  libbinutils (= ${binary:Version}), ${binutils:native} (= ${binary:Version})
+  libbinutils (= ${binary:Version}), ${binutils:native}:any (= ${binary:Version})
 Conflicts: modutils (<< 2.4.19-1), ${extraConflicts},
   binutils-multiarch (<< 2.27-8)
 Provides: elf-binutils, ${gold:Provides}
diff -Nru binutils-2.34/debian/rules binutils-2.34/debian/rules
--- binutils-2.34/debian/rules	2020-02-22 09:15:07.000000000 +0000
+++ binutils-2.34/debian/rules	2020-05-19 06:07:58.000000000 +0000
@@ -536,7 +536,7 @@
 
 CONFARGS_TARGET_aarch64		= --enable-targets=aarch64_be-linux-gnu
 
-with_check := yes
+with_check := disabled by plugwash
 ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
   # override buildd admins to run the testsuite anyway ...
   ifeq (,$(filter $(DEB_HOST_ARCH), m68k sh4))