Merge version 2.31.1-2+rpi1 and 2.31.1-4 to produce 2.31.1-4+rpi1

diff --cc debian/changelog
index 6ccc2c7c5ef56927f04e93d65facac5ce223708c,dd8005a422cc9c6c0ee0415fb680670ccc94e6e8..4baebd2641494204375a92dc9d3a5128853c84aa
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,26 +1,33 @@@
- binutils (2.31.1-2+rpi1) buster-staging; urgency=medium
++binutils (2.31.1-4+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>  Thu, 09 Aug 2018 15:52:00 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 22 Aug 2018 15:51:33 +0000
++
+ binutils (2.31.1-4) unstable; urgency=medium
+ 
+   * Rewrite. the "build" autopkg tests not to use the "build-needed"
+     restriction until #906125 is fixed. Closes: #884117.
+   * Build armel and armhf cross binutils on ppc64el.
+ 
+  -- Matthias Klose <doko@debian.org>  Tue, 14 Aug 2018 20:43:44 +0200
+ 
+ binutils (2.31.1-3) unstable; urgency=medium
+ 
+   * Snapshot, taken from the 2.31 branch (20180814).
+     - Fix PR ld/23428, properly add X86_ISA_1_NEEDED property.
+     - Fix PR ld/23486, properly merge GNU_PROPERTY_X86_ISA_1_USED.
+     - x32: Align the .note.gnu.property section to 4 bytes.
+     - PowerPC64 __tls_get_addr_opt stub .eh_frame fix.
+     - PowerPC64: __tls_get_addr_opt stubs and tocsave optimization.
+     - PR gas/23465, x86: don't mistakenly scale non-8-bit displacements.
+     - PR gold/23455, add --warn-drop-version option; by default, do not warn
+       when discarding version info.
+     - hppa: Fix unwind offset for call_info->start_symbol.
+   * Build arm64 cross binutils on ppc64el.
+ 
+  -- Matthias Klose <doko@debian.org>  Tue, 14 Aug 2018 07:33:39 +0200
  
  binutils (2.31.1-2) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge