Merge version 2.30-20+rpi1 and 2.30-21 to produce 2.30-21+rpi1

diff --cc debian/changelog
index 0948a5fc3f9c63dbcf1147f66da6da90e775a4cd,60bc2159034818854b9330c0e6654544e9cc9892..f15766928bb9e7ef2f25f91c3e684339506b3209
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,23 @@@
- binutils (2.30-20+rpi1) buster-staging; urgency=medium
++binutils (2.30-21+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, 31 May 2018 04:23:46 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 05 Jun 2018 12:30:52 +0000
++
+ binutils (2.30-21) unstable; urgency=medium
+ 
+   * Update, taken from the 2.30 branch 20180529.
+     - x86-64: Add TLSDESC fields to elf_x86_lazy_plt_layout.
+     - PR binutils/23199, mark section in a section group with SHF_GROUP.
+     - PR ld/23194, x86: Don't set eh->local_ref to 1 for versioned symbol.
+     - PR ld/23189, x86: Don't set eh->local_ref to 1 for linker defined symbols.
+     - PR binutils/23199, Invalid SHT_GROUP entry leads to group confusion.
+   * Fix PR gprof/23056, memory corruption in gprof. LP: #1763098.
+   * Fix PR binutils/23054, memory corruption in as. LP: #1763096.
+   * Fix PR ld/23055, memory corruption in ld. LP: #1763094.
+ 
+  -- Matthias Klose <doko@debian.org>  Tue, 29 May 2018 15:46:35 +0200
  
  binutils (2.30-20) unstable; urgency=medium