Merge version 10.2.1-1+rpi1 and 10.2.1-3 to produce 10.2.1-3+rpi1

diff --cc debian/changelog
index 7c2149077eed4fc5d823a1af913cba40752e4a42,979a1f889f9a689628bf41d76320d69b8e77d6c3..4e2d16d3116d47582029a3d32ca7bcaf7cd3cf68
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,22 +1,35 @@@
- gcc-10 (10.2.1-1+rpi1) bullseye-staging; urgency=medium
++gcc-10 (10.2.1-3+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>  Fri, 18 Dec 2020 21:17:10 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 03 Jan 2021 02:56:22 +0000
++
+ gcc-10 (10.2.1-3) unstable; urgency=medium
+ 
+   * Update to git 20201224 from the gcc-10 branch.
+     - Fix PR target/96793 (x86), PR c++/98332, PR c++/90254, PR c++/93711.
+   * Build the gcn offload compiler based on amdgcn-tools (based on LLVM 9).
+ 
+  -- Matthias Klose <doko@debian.org>  Thu, 24 Dec 2020 08:44:33 +0100
+ 
+ gcc-10 (10.2.1-2) unstable; urgency=medium
+ 
+   * Update to git 20201221 from the gcc-10 branch.
+     - Fix PR rtl-optimization/97092, PR ada/98230, PR c++/64194, PR d/98277,
+       PR fortran/98307.
+   * For the gcn offload compiler, use a version fixing LLVM Bug 48201.
+   * Don't install the lto-dump binary in the hppa64 package. Closes: #977461.
+   * Refresh patches.
+   * Strip compiler executables again.
+ 
+  -- Matthias Klose <doko@debian.org>  Tue, 22 Dec 2020 14:54:57 +0100
  
  gcc-10 (10.2.1-1) unstable; urgency=medium
  

diff --cc debian/rules.defs
Simple merge