Merge version 10.2.0-19+rpi1 and 10.2.1-1 to produce 10.2.1-1+rpi1

diff --cc debian/changelog
index 0075f4946d736d204e713ec8aec4a132bd3beed6,6c39dc1bf951ff1d468fe38957e5482e07b7113c..7c2149077eed4fc5d823a1af913cba40752e4a42
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,45 +1,58 @@@
- gcc-10 (10.2.0-19+rpi1) bullseye-staging; urgency=medium
++gcc-10 (10.2.1-1+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from gcc-8 8-20180207-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 17 Feb 2018 00:20:23 +0000]
 +  * Don't pass -march=armv7+fp to compiler when building libatomic.
 +
 +  [changes introduced in gcc-8 8.2.0-16+rpi1 by Peter Michael Green]
 +  * Disable testsuite (build seems to hang after testsuite completes).
 +
 +  [changes introduced in gcc-9 9.1.0-10+rpi1 by Peter Michael Green]
 +  * Update symbols file for raspbian.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 30 Nov 2020 21:43:49 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 18 Dec 2020 21:17:10 +0000
++
+ gcc-10 (10.2.1-1) unstable; urgency=medium
+ 
+   * Update to git 20201207 from the gcc-10 branch.
+     - Fix PR middle-end/94600, PR target/98086 (x86), PR middle-end/95694,
+       PR fortran/95342.
+   * Bump version to 10.2.1.
+   * Build again using gnat-10 everywhere.
+ 
+  -- Matthias Klose <doko@debian.org>  Mon, 07 Dec 2020 10:23:22 +0100
+ 
+ gcc-10 (10.2.0-23) unstable; urgency=medium
+ 
+   * Update to git 20201203 from the gcc-10 branch.
+     - Fix PR tree-optimization/97457, PR rtl-optimization/98037, PR c++/97904,
+       PR middle-end/95694.
+   * Relax the libc-dev dependencies for kfreebsd.
+   * Explicitly build with gnat-10 on m68k.
+ 
+  -- Matthias Klose <doko@debian.org>  Thu, 03 Dec 2020 14:42:11 +0100
+ 
+ gcc-10 (10.2.0-21) unstable; urgency=medium
+ 
+   * Build using gnat-9 to bootstrap on kfreebsd.
+ 
+  -- Matthias Klose <doko@debian.org>  Wed, 02 Dec 2020 14:46:47 +0100
+ 
+ gcc-10 (10.2.0-20) unstable; urgency=medium
+ 
+   * Update to git 20201202 from the gcc-10 branch.
+     - Fix PR target/97528 (ARM), PR debug/97599, PR c/97958, PR fortran/85796,
+       PR libstdc++/98001, PR libstdc++/97935, PR target/97939 (SPARC),
+       PR target/96607 (SPARC), PR tree-optimization/97812, PR middle-end/95171,
+       PR tree-optimization/97760, PR tree-optimization/97539,
+       PR middle-end/97554, PR libstdc++/95322, PR tree-optimization/96698,
+       PR tree-optimization/96920.
+   * Don't strip the sanitizer libraries, these are only used for debugging.
+     LP: #1894166.
+   * Don't run the libgphobos-link test on powerpc architectures.
+   * Install libstdc++6 gdb pretty printer files in /usr/share/gcc (unversioned).
+   * Don't mark the libgcc-sN cross packages with XB-Important/Protected: yes.
+ 
+  -- Matthias Klose <doko@debian.org>  Wed, 02 Dec 2020 13:57:11 +0100
  
  gcc-10 (10.2.0-19) unstable; urgency=medium
  

diff --cc debian/rules.defs
Simple merge

diff --cc debian/rules.patch
Simple merge