diff -Nru binutils-2.31.1/debian/changelog binutils-2.31.1/debian/changelog
--- binutils-2.31.1/debian/changelog	2019-03-21 14:49:23.000000000 +0000
+++ binutils-2.31.1/debian/changelog	2020-02-06 17:10:11.000000000 +0000
@@ -1,3 +1,18 @@
+binutils (2.31.1-16+rpi2) buster-staging; urgency=medium
+
+  * 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.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 06 Feb 2020 17:10:11 +0000
+
+binutils (2.31.1-16+rpi1) buster-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.
+
+ -- Raspbian forward porter <root@raspbian.org>  Sat, 27 Apr 2019 12:55:32 +0000
+
 binutils (2.31.1-16) unstable; urgency=medium
 
   * Snapshot, taken from the 2.31 branch (20190321).
diff -Nru binutils-2.31.1/debian/control binutils-2.31.1/debian/control
--- binutils-2.31.1/debian/control	2019-03-21 14:49:23.000000000 +0000
+++ binutils-2.31.1/debian/control	2020-02-06 17:10:11.000000000 +0000
@@ -59,7 +59,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}
@@ -321,7 +321,7 @@
 
 Package: binutils-mips-linux-gnu
 Priority: optional
-Architecture: mips amd64 i386 x32
+Architecture: mips
 Multi-Arch: allowed
 Depends: binutils-common (= ${binary:Version}),
   ${shlibs:Depends}, ${extraDepends}
@@ -339,7 +339,7 @@
 Package: binutils-mips-linux-gnu-dbg
 Section: debug
 Priority: optional
-Architecture: mips amd64 i386 x32
+Architecture: mips
 Multi-Arch: foreign
 Depends: binutils-mips-linux-gnu (= ${binary:Version})
 Description: GNU binary utilities, for mips-linux-gnu target (debug symbols)
@@ -347,7 +347,7 @@
 
 Package: binutils-mipsel-linux-gnu
 Priority: optional
-Architecture: mipsel amd64 i386 x32
+Architecture: mipsel
 Multi-Arch: allowed
 Depends: binutils-common (= ${binary:Version}),
   ${shlibs:Depends}, ${extraDepends}
@@ -365,7 +365,7 @@
 Package: binutils-mipsel-linux-gnu-dbg
 Section: debug
 Priority: optional
-Architecture: mipsel amd64 i386 x32
+Architecture: mipsel
 Multi-Arch: foreign
 Depends: binutils-mipsel-linux-gnu (= ${binary:Version})
 Description: GNU binary utilities, for mipsel-linux-gnu target (debug symbols)
@@ -373,7 +373,7 @@
 
 Package: binutils-mips64el-linux-gnuabi64
 Priority: optional
-Architecture: mips64el amd64 i386 x32
+Architecture: mips64el
 Multi-Arch: allowed
 Depends: binutils-common (= ${binary:Version}),
   ${shlibs:Depends}, ${extraDepends}
@@ -391,7 +391,7 @@
 Package: binutils-mips64el-linux-gnuabi64-dbg
 Section: debug
 Priority: optional
-Architecture: mips64el amd64 i386 x32
+Architecture: mips64el
 Multi-Arch: foreign
 Depends: binutils-mips64el-linux-gnuabi64 (= ${binary:Version})
 Description: GNU binary utilities, for mips64el-linux-gnuabi64 target (debug symbols)
@@ -399,7 +399,7 @@
 
 Package: binutils-powerpc64le-linux-gnu
 Priority: optional
-Architecture: ppc64el amd64 i386 x32 ppc64
+Architecture: ppc64el
 Multi-Arch: allowed
 Depends: binutils-common (= ${binary:Version}),
   ${shlibs:Depends}, ${extraDepends}
@@ -417,7 +417,7 @@
 Package: binutils-powerpc64le-linux-gnu-dbg
 Section: debug
 Priority: optional
-Architecture: ppc64el amd64 i386 x32 ppc64
+Architecture: ppc64el
 Multi-Arch: foreign
 Depends: binutils-powerpc64le-linux-gnu (= ${binary:Version})
 Description: GNU binary utilities, for powerpc64le-linux-gnu target (debug symbols)
@@ -425,7 +425,7 @@
 
 Package: binutils-s390x-linux-gnu
 Priority: optional
-Architecture: s390x amd64 i386 x32
+Architecture: s390x
 Multi-Arch: allowed
 Depends: binutils-common (= ${binary:Version}),
   ${shlibs:Depends}, ${extraDepends}
@@ -443,7 +443,7 @@
 Package: binutils-s390x-linux-gnu-dbg
 Section: debug
 Priority: optional
-Architecture: s390x amd64 i386 x32
+Architecture: s390x
 Multi-Arch: foreign
 Depends: binutils-s390x-linux-gnu (= ${binary:Version})
 Description: GNU binary utilities, for s390x-linux-gnu target (debug symbols)
@@ -451,7 +451,7 @@
 
 Package: binutils-alpha-linux-gnu
 Priority: optional
-Architecture: alpha amd64 i386 x32
+Architecture: alpha
 Multi-Arch: allowed
 Depends: binutils-common (= ${binary:Version}),
   ${shlibs:Depends}, ${extraDepends}
@@ -469,7 +469,7 @@
 Package: binutils-alpha-linux-gnu-dbg
 Section: debug
 Priority: optional
-Architecture: alpha amd64 i386 x32
+Architecture: alpha
 Multi-Arch: foreign
 Depends: binutils-alpha-linux-gnu (= ${binary:Version})
 Description: GNU binary utilities, for alpha-linux-gnu target (debug symbols)
@@ -477,7 +477,7 @@
 
 Package: binutils-hppa-linux-gnu
 Priority: optional
-Architecture: hppa amd64 i386 x32
+Architecture: hppa
 Multi-Arch: allowed
 Depends: binutils-common (= ${binary:Version}),
   ${shlibs:Depends}, ${extraDepends}
@@ -495,7 +495,7 @@
 Package: binutils-hppa-linux-gnu-dbg
 Section: debug
 Priority: optional
-Architecture: hppa amd64 i386 x32
+Architecture: hppa
 Multi-Arch: foreign
 Depends: binutils-hppa-linux-gnu (= ${binary:Version})
 Description: GNU binary utilities, for hppa-linux-gnu target (debug symbols)
@@ -503,7 +503,7 @@
 
 Package: binutils-ia64-linux-gnu
 Priority: optional
-Architecture: ia64 amd64 i386 x32
+Architecture: ia64
 Multi-Arch: allowed
 Depends: binutils-common (= ${binary:Version}),
   ${shlibs:Depends}, ${extraDepends}
@@ -521,7 +521,7 @@
 Package: binutils-ia64-linux-gnu-dbg
 Section: debug
 Priority: optional
-Architecture: ia64 amd64 i386 x32
+Architecture: ia64
 Multi-Arch: foreign
 Depends: binutils-ia64-linux-gnu (= ${binary:Version})
 Description: GNU binary utilities, for ia64-linux-gnu target (debug symbols)
@@ -529,7 +529,7 @@
 
 Package: binutils-m68k-linux-gnu
 Priority: optional
-Architecture: m68k amd64 i386 x32
+Architecture: m68k
 Multi-Arch: allowed
 Depends: binutils-common (= ${binary:Version}),
   ${shlibs:Depends}, ${extraDepends}
@@ -547,7 +547,7 @@
 Package: binutils-m68k-linux-gnu-dbg
 Section: debug
 Priority: optional
-Architecture: m68k amd64 i386 x32
+Architecture: m68k
 Multi-Arch: foreign
 Depends: binutils-m68k-linux-gnu (= ${binary:Version})
 Description: GNU binary utilities, for m68k-linux-gnu target (debug symbols)
@@ -581,7 +581,7 @@
 
 Package: binutils-powerpc-linux-gnu
 Priority: optional
-Architecture: powerpc amd64 i386 x32 ppc64el
+Architecture: powerpc
 Multi-Arch: allowed
 Depends: binutils-common (= ${binary:Version}),
   ${shlibs:Depends}, ${extraDepends}
@@ -599,7 +599,7 @@
 Package: binutils-powerpc-linux-gnu-dbg
 Section: debug
 Priority: optional
-Architecture: powerpc amd64 i386 x32 ppc64el
+Architecture: powerpc
 Multi-Arch: foreign
 Depends: binutils-powerpc-linux-gnu (= ${binary:Version})
 Description: GNU binary utilities, for powerpc-linux-gnu target (debug symbols)
@@ -607,7 +607,7 @@
 
 Package: binutils-powerpc-linux-gnuspe
 Priority: optional
-Architecture: powerpcspe amd64 i386 x32
+Architecture: powerpcspe
 Multi-Arch: allowed
 Depends: binutils-common (= ${binary:Version}),
   ${shlibs:Depends}, ${extraDepends}
@@ -625,7 +625,7 @@
 Package: binutils-powerpc-linux-gnuspe-dbg
 Section: debug
 Priority: optional
-Architecture: powerpcspe amd64 i386 x32
+Architecture: powerpcspe
 Multi-Arch: foreign
 Depends: binutils-powerpc-linux-gnuspe (= ${binary:Version})
 Description: GNU binary utilities, for powerpc-linux-gnuspe target (debug symbols)
@@ -633,7 +633,7 @@
 
 Package: binutils-powerpc64-linux-gnu
 Priority: optional
-Architecture: ppc64 amd64 i386 x32 ppc64el
+Architecture: ppc64
 Multi-Arch: allowed
 Depends: binutils-common (= ${binary:Version}),
   ${shlibs:Depends}, ${extraDepends}
@@ -651,7 +651,7 @@
 Package: binutils-powerpc64-linux-gnu-dbg
 Section: debug
 Priority: optional
-Architecture: ppc64 amd64 i386 x32 ppc64el
+Architecture: ppc64
 Multi-Arch: foreign
 Depends: binutils-powerpc64-linux-gnu (= ${binary:Version})
 Description: GNU binary utilities, for powerpc64-linux-gnu target (debug symbols)
@@ -659,7 +659,7 @@
 
 Package: binutils-riscv64-linux-gnu
 Priority: optional
-Architecture: riscv64 amd64 i386 x32
+Architecture: riscv64
 Multi-Arch: allowed
 Depends: binutils-common (= ${binary:Version}),
   ${shlibs:Depends}, ${extraDepends}
@@ -677,7 +677,7 @@
 Package: binutils-riscv64-linux-gnu-dbg
 Section: debug
 Priority: optional
-Architecture: riscv64 amd64 i386 x32
+Architecture: riscv64
 Multi-Arch: foreign
 Depends: binutils-riscv64-linux-gnu (= ${binary:Version})
 Description: GNU binary utilities, for riscv64-linux-gnu target (debug symbols)
@@ -685,7 +685,7 @@
 
 Package: binutils-sh4-linux-gnu
 Priority: optional
-Architecture: sh4 amd64 i386 x32
+Architecture: sh4
 Multi-Arch: allowed
 Depends: binutils-common (= ${binary:Version}),
   ${shlibs:Depends}, ${extraDepends}
@@ -703,7 +703,7 @@
 Package: binutils-sh4-linux-gnu-dbg
 Section: debug
 Priority: optional
-Architecture: sh4 amd64 i386 x32
+Architecture: sh4
 Multi-Arch: foreign
 Depends: binutils-sh4-linux-gnu (= ${binary:Version})
 Description: GNU binary utilities, for sh4-linux-gnu target (debug symbols)
@@ -711,7 +711,7 @@
 
 Package: binutils-sparc64-linux-gnu
 Priority: optional
-Architecture: sparc64 amd64 i386 x32
+Architecture: sparc64
 Multi-Arch: allowed
 Depends: binutils-common (= ${binary:Version}),
   ${shlibs:Depends}, ${extraDepends}
@@ -729,7 +729,7 @@
 Package: binutils-sparc64-linux-gnu-dbg
 Section: debug
 Priority: optional
-Architecture: sparc64 amd64 i386 x32
+Architecture: sparc64
 Multi-Arch: foreign
 Depends: binutils-sparc64-linux-gnu (= ${binary:Version})
 Description: GNU binary utilities, for sparc64-linux-gnu target (debug symbols)
@@ -763,7 +763,7 @@
 
 Package: binutils-i686-gnu
 Priority: optional
-Architecture: hurd-i386 amd64 i386 x32
+Architecture: hurd-i386
 Multi-Arch: allowed
 Depends: binutils-common (= ${binary:Version}),
   ${shlibs:Depends}, ${extraDepends}
@@ -781,7 +781,7 @@
 Package: binutils-i686-gnu-dbg
 Section: debug
 Priority: optional
-Architecture: hurd-i386 amd64 i386 x32
+Architecture: hurd-i386
 Multi-Arch: foreign
 Depends: binutils-i686-gnu (= ${binary:Version})
 Description: GNU binary utilities, for i686-gnu target (debug symbols)
@@ -789,7 +789,7 @@
 
 Package: binutils-x86-64-kfreebsd-gnu
 Priority: optional
-Architecture: kfreebsd-amd64 amd64 i386 x32
+Architecture: kfreebsd-amd64
 Multi-Arch: allowed
 Depends: binutils-common (= ${binary:Version}),
   ${shlibs:Depends}, ${extraDepends}
@@ -807,7 +807,7 @@
 Package: binutils-x86-64-kfreebsd-gnu-dbg
 Section: debug
 Priority: optional
-Architecture: kfreebsd-amd64 amd64 i386 x32
+Architecture: kfreebsd-amd64
 Multi-Arch: foreign
 Depends: binutils-x86-64-kfreebsd-gnu (= ${binary:Version})
 Description: GNU binary utilities, for x86-64-kfreebsd-gnu target (debug symbols)
@@ -815,7 +815,7 @@
 
 Package: binutils-i686-kfreebsd-gnu
 Priority: optional
-Architecture: kfreebsd-i386 amd64 i386 x32
+Architecture: kfreebsd-i386
 Multi-Arch: allowed
 Depends: binutils-common (= ${binary:Version}),
   ${shlibs:Depends}, ${extraDepends}
@@ -833,7 +833,7 @@
 Package: binutils-i686-kfreebsd-gnu-dbg
 Section: debug
 Priority: optional
-Architecture: kfreebsd-i386 amd64 i386 x32
+Architecture: kfreebsd-i386
 Multi-Arch: foreign
 Depends: binutils-i686-kfreebsd-gnu (= ${binary:Version})
 Description: GNU binary utilities, for i686-kfreebsd-gnu target (debug symbols)
diff -Nru binutils-2.31.1/debian/control.in binutils-2.31.1/debian/control.in
--- binutils-2.31.1/debian/control.in	2019-03-21 14:49:23.000000000 +0000
+++ binutils-2.31.1/debian/control.in	2020-02-06 16:55:49.000000000 +0000
@@ -59,7 +59,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.31.1/debian/rules binutils-2.31.1/debian/rules
--- binutils-2.31.1/debian/rules	2019-02-07 13:50:41.000000000 +0000
+++ binutils-2.31.1/debian/rules	2019-04-27 12:55:32.000000000 +0000
@@ -525,7 +525,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 powerpcspe sh4))