Merge version 10-20200304-1+rpi1 and 10-20200312-2 to produce 10-20200312-2+rpi1

diff --cc debian/changelog
index 1b311e315eed87fc2bd37f352d71bd8cb97083d9,54f7b89eb91aae47b680fa8bdb9a99de2a7d6955..626d27fca45b089294f7266cc26a6eca5c8470a7
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,21 +1,34 @@@
- gcc-10 (10-20200304-1+rpi1) bullseye-staging; urgency=medium
++gcc-10 (10-20200312-2+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, 16 Mar 2020 13:27:12 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 19 Mar 2020 12:06:12 +0000
++
+ gcc-10 (10-20200312-2) unstable; urgency=medium
+ 
+   * Ship the include-fixed directory again, for a working #include <limits.h>.
+ 
+  -- Matthias Klose <doko@debian.org>  Fri, 13 Mar 2020 09:42:15 +0100
+ 
+ gcc-10 (10-20200312-1) unstable; urgency=medium
+ 
+   * GCC snapshot, taken from the trunk (20200312, daf2852b883).
+   * For all runtime libraries, generate dependencies on libgcc-sN instead
+     on libgccN.
+   * Use llvm 10 for the amdgcn offload compiler, when available.
+   * Update newlib to 3.3.0.
+   * Stop shipping the include-fixed directory.
+   * Build the snapshot package with the offload compilers included.
+   * Tighten dependency on libc6 for this upload.
+ 
+  -- Matthias Klose <doko@debian.org>  Thu, 12 Mar 2020 21:41:07 +0100
  
  gcc-10 (10-20200304-1) unstable; urgency=medium
  

diff --cc debian/rules.defs
Simple merge

diff --cc debian/rules.patch
Simple merge