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

diff --cc debian/changelog
index 4e2d16d3116d47582029a3d32ca7bcaf7cd3cf68,01454bac9947c384cb50f187e35f673ddf5dd3ca..6d9b66d59f212a6e86569e4933ef423eec8b5704
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,35 +1,48 @@@
- gcc-10 (10.2.1-3+rpi1) bullseye-staging; urgency=medium
++gcc-10 (10.2.1-6+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>  Sun, 03 Jan 2021 02:56:22 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 21 Jan 2021 02:21:35 +0000
++
+ gcc-10 (10.2.1-6) unstable; urgency=medium
+ 
+   * Update to git 20210110 from the gcc-10 branch.
+     - Fix PR c++/98556, PR c++/98551, PR c++/96197.
+   * gcc-10-source: Depend on time.
+   * Fix PR rtl-optimization/97714, taken from the trunk. Closes: #975153.
+   * Build the gcn offload compiler based on amdgcn-tools (based on LLVM 9).
+ 
+  -- Matthias Klose <doko@debian.org>  Sun, 10 Jan 2021 12:35:39 +0100
+ 
+ gcc-10 (10.2.1-5) unstable; urgency=medium
+ 
+   * Update to git 20210108 from the gcc-10 branch.
+     - Fix PR target/96793 (x86), PR rtl-optimization/97421, PR fortran/96100,
+       PR fortran/96101, PR target/96320, PR target/97865,
+       PR tree-optimization/98514, PR tree-optimization/98474, PR c++/98353,
+       PR c++/98383, PR middle-end/98183, PR middle-end/98205,
+       PR target/94440 (x86), PR target/98100, PR plugins/98059,
+       PR target/98063 (x86), PR target/98522 (x86), PR target/98521 (x86),
+       PR target/97865, PR c++/98187, PR c++/98122, PR c++/98072, PR c++/82099,
+       PR c++/96675, PR c++/96742, PR c++/97975, PR c++/98043, PR c++/98103,
+       PR c++/97427, PR c++/97438, PR fortran/92587, PR fortran/96325,
+       PR fortran/83118, PR fortran/96012.
+   * Fix hppa64 snapshot builds.
+   * Force running tests on m68k and sh4 architectures.
+   * Provide timing and resource information for all builds.
+   * Backport PR target/97250: Add support for x86-64-v2, x86-64-v3, x86-64-v4
+     levels for x86-64.
+   * Build the offload compilers using newlib 4.1.0.
+   * Bump standards version.
+ 
+  -- Matthias Klose <doko@debian.org>  Fri, 08 Jan 2021 17:33:30 +0100
  
  gcc-10 (10.2.1-3) unstable; urgency=medium
  

diff --cc debian/rules.defs
Simple merge

diff --cc debian/rules.patch
Simple merge