Merge version 2.29.1-8+rpi1 and 2.29.1-10 to produce 2.29.1-10+rpi1

diff --cc debian/changelog
index 901f56a31bb697584e0ad8a1f2d2a0ea1fd24e8e,b3e79ee5d4d79d1bb55f32472504f0f9a9d510b0..ca13796443fb8abf675d1be25d5938dbaa4e68ac
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,21 +1,28 @@@
- binutils (2.29.1-8+rpi1) buster-staging; urgency=medium
++binutils (2.29.1-10+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>  Wed, 22 Nov 2017 12:51:04 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 09 Dec 2017 02:21:38 +0000
++
+ binutils (2.29.1-10) unstable; urgency=medium
+ 
+   * Update, taken from the 2.29 branch 20171201.
+     - Fix PR gold/22233, segfault in relocate_erratum_stub on aarch64.
+     - Update local fix for PR gold/20765, internal error in fix_errata on
+       aarch64 (Peter Smith). LP: #1638902.
+   * binutils-source: Depend on python3 instead of python.
+   * Override m68k, powerpcspe and m68k buildd admins to run the testsuite.
+ 
+  -- Matthias Klose <doko@debian.org>  Fri, 01 Dec 2017 02:34:24 +0100
+ 
+ binutils (2.29.1-9) unstable; urgency=medium
+ 
+   * Update, taken from the 2.29 branch 20171128.
+     - Fix PR ld/22431, powerpc64 ld segfault when .plt discarded.
+     - Fix DWARF reader to use correct size for DW_FORM_ref_addr.
+ 
+  -- Matthias Klose <doko@debian.org>  Tue, 28 Nov 2017 07:02:24 +0100
  
  binutils (2.29.1-8) unstable; urgency=medium
  

diff --cc debian/rules
index dd5a68d23dc2d72a4472dcecfc23190638e6b731,e8e0aae6eeed8dfdf52cd7f1010b6d215dee66e6..498eebd067d67b013083b2c89d45c73ce5c2b5d9
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -488,14 -488,16 +488,16 @@@ 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)))
-       with_check := disabled through DEB_BUILD_OPTIONS
+   # override buildd admins to run the testsuite anyway ...
+   ifeq (,$(filter $(DEB_HOST_ARCH), m68k powerpcspe sh4))
+     with_check := disabled through DEB_BUILD_OPTIONS
+   endif
  endif
  ifneq (,$(filter $(DEB_HOST_ARCH), armel armhf mips mipsel sparc))
-       ignore_regressions := regressions ignored on architecture $(DEB_HOST_ARCH)
+   ignore_regressions := regressions ignored on architecture $(DEB_HOST_ARCH)
  endif
- 
  ignore_regressions := regressions ignored on architecture $(DEB_HOST_ARCH)
  
  with_strip := yes