Merge version 2.29.1-3+rpi1 and 2.29.1-4 to produce 2.29.1-4+rpi1

diff --cc debian/changelog
index 7e33035311c3f5855be088dbe4680890495decfa,e03e6904dbb66dc324d311ced8bced4c57736ba6..e9946b205a4b2c7078d3b54a2726a04e5d57f0d6
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,23 @@@
- binutils (2.29.1-3+rpi1) buster-staging; urgency=medium
++binutils (2.29.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>  Fri, 29 Sep 2017 23:14:00 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 07 Oct 2017 17:26:47 +0000
++
+ binutils (2.29.1-4) unstable; urgency=medium
+ 
+   * Update, taken from the 2.29 branch 20171001.
+     - PR ld/22220, BFD linker wrongly marks symbols as PREVAILING_DEF_IRONLY.
+     - PR ld/22199, x86-64: Don't pass output_bfd to info->callbacks->minfo.
+     - [GOLD] Set non-exec stack for ppc64.
+   * Move man/{go,}ld.1.gz to binutils-common (Helmut Grohne). Closes: #877266.
+   * Build-depend on target g++ compilers instead of target gcc compilers.
+   * Fail when string merge can't alloc memory, taken from the trunk.
+     Closes: #874674.
+   * Fix legacy cross builds. Closes: #876677.
+ 
+  -- Matthias Klose <doko@debian.org>  Sun, 01 Oct 2017 20:16:22 +0200
  
  binutils (2.29.1-3) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge