Merge version 2.31.1-16+rpi1 and 2.32.51.20190707-1 to produce 2.32.51.20190707-1...

diff --cc debian/changelog
index 4309e9d8629c60db291d9a435ff532e872e2648f,dd227d7f3ded4d2c0f6268cbbee95acaafff22f7..eeaef3a1243396eb20c35c6b4fc55044bec9d4ba
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,45 +1,52 @@@
- binutils (2.31.1-16+rpi1) buster-staging; urgency=medium
++binutils (2.32.51.20190707-1+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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 27 Apr 2019 12:55:32 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 29 Jul 2019 02:24:59 +0000
 +
- binutils (2.31.1-16) unstable; urgency=medium
+ binutils (2.32.51.20190707-1) unstable; urgency=medium
  
-   * Snapshot, taken from the 2.31 branch (20190321).
+   * Snapshot, taken from the trunk (20190707).
+ 
+  -- Matthias Klose <doko@debian.org>  Sun, 07 Jul 2019 12:20:11 +0200
+ 
+ binutils (2.32.51.20190701-1) experimental; urgency=medium
+ 
+   * Snapshot, taken from the trunk (20190701).
+ 
+  -- Matthias Klose <doko@debian.org>  Mon, 01 Jul 2019 13:46:05 +0200
+ 
+ binutils (2.32.51.20190624-1) experimental; urgency=medium
+ 
+   * Snapshot, taken from the trunk (20190624).
+     - Fix PR ld/24704, skiboot link failure. LP: #1833237.
+ 
+  -- Matthias Klose <doko@debian.org>  Mon, 24 Jun 2019 07:59:05 +0000
+ 
+ binutils (2.32.51.20190611-1) experimental; urgency=medium
+ 
+   * Snapshot, taken from the trunk (20190611).
+   * Simplify setting the soname for the various builds.
+ 
+  -- Matthias Klose <doko@debian.org>  Tue, 11 Jun 2019 10:48:30 +0200
+ 
+ binutils (2.32-8) experimental; urgency=medium
+ 
+   * Snapshot, taken from the 2.32 branch (20190424).
+     - Fix PR ld/24302 (AArch64): When DF_BIND_NOW don't use TLSDESC GOT value.
+     - Fix PR ld/24458 (x86): Also check x86 linker_def for non-shared
+       definition.
+     - AArch64: Add new LDGM/STGM instruction.
+     - AArch64: Update Store Allocation Tag instructions.
+     - AArch64: Fix disassembler bug with out-of-order sections.
+ 
+  -- Matthias Klose <doko@debian.org>  Wed, 24 Apr 2019 09:25:48 +0200
+ 
+ binutils (2.32-7) experimental; urgency=medium
+ 
+   * Snapshot, taken from the 2.32 branch (20190321).
      - Fix PR ld/24355, segfault in function called from ppc_finish_symbols.
-   * Fix VCS attributes in the control file. Closes: #915982.
    * Demote binutils-<target> from Multi-Arch: foreign to Multi-Arch: allowed
      (Helmut Grohne). Closes: #920286.
    * Let binutils-for-host Depends: binutils-<host>:any.

diff --cc debian/rules
index 3f5068f1debad42beb93b1ee385f23f8dbbb063e,7d20d80d9683e60cd087f1241419e25df7c9efe9..c55b34d244aecd6edf959a8bfa8e3c5eabe17b1c
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -525,10 -524,10 +524,10 @@@ CONFARGS_TARGET_mips64r6el      = --enable-t
  
  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))
+   ifeq (,$(filter $(DEB_HOST_ARCH), m68k sh4))
      with_check := disabled through DEB_BUILD_OPTIONS
    endif
  endif