Merge version 10-20200324-1+rpi1 and 10-20200418-1 to produce 10-20200418-1+rpi1

diff --cc debian/changelog
index 68430321eb9adc4abe71a48a6535b7fbb184bf1f,ca71b42ed918d00f2efee36d2c3f56e19703e547..fe68222c3b0b96e859a57e8569ffccde534fe6d6
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,57 +1,70 @@@
- gcc-10 (10-20200324-1+rpi1) bullseye-staging; urgency=medium
++gcc-10 (10-20200418-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>  Sat, 28 Mar 2020 03:35:26 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 24 Apr 2020 22:13:37 +0000
++
+ gcc-10 (10-20200418-1) unstable; urgency=medium
+ 
+   * GCC snapshot, taken from the trunk (20200418, c5bac7d127f2).
+     - Fix PR lto/94612, offloading support.
+     - Fix PR rtl-optimization/93974, ICE on ppc64el with -O3.
+ 
+   [ Nicolas Boulenguez ]
+   * Remove ada-lib-info-file-prefix-map.diff (see #87972).
+ 
+   [ Matthias Klose ]
+   * libgcc-sN: Don't add the libgcc-N-dev breaks for backports.
+   * Include the complete offload compilers in the gcc-snapshot builds.
+ 
+  -- Matthias Klose <doko@debian.org>  Sat, 18 Apr 2020 11:56:38 +0200
+ 
+ gcc-10 (10-20200411-1) unstable; urgency=medium
+ 
+   * GCC snapshot, taken from the trunk (20200411, f883c46b487).
+   * Fix gnat cross builds.
+   * Strip again the compiler executables.
+ 
+  -- Matthias Klose <doko@debian.org>  Sun, 12 Apr 2020 15:12:15 +0200
+ 
+ gcc-10 (10-20200410-1) unstable; urgency=medium
+ 
+   * GCC snapshot, taken from the trunk (20200410, 7478addd84a).
+ 
+   [ Matthias Klose ]
+   * Update libgccjit and libgphobos symbols files.
+   * Remove the libgcc-sN provides from the last upload.
+   * Don't install the empty gcc_lib_dir in gcc-N-base.
+   * Configure with -enable-libphobos-checking=release.
+ 
+   [ Nicolas Boulenguez ]
+   * Remove some dependencies older than oldoldstable.
+   * Build gnat. Remove obsolete no_install option for libgnat.
+   * ada-lib-info-file-source-date-epoch.diff: port fix from gcc-9.
+   * ada: install libgnat-BV.so without adding a .1 suffix.
+   * Rename libgnatvsn to libgnat_util (following upstream).
+     Make the compatibility project abstract instead of generating twice.
+   * ada-changes-in-autogen-output.diff: keep more upstream default values in
+     order to reduce the diff noise.
+ 
+  -- Matthias Klose <doko@debian.org>  Fri, 10 Apr 2020 14:45:04 +0200
+ 
+ gcc-10 (10-20200402-1) unstable; urgency=medium
+ 
+   * GCC snapshot, taken from the trunk (20200402, 86c92411320).
+   * Fix PR target/94254 (PPC), proposed patch.
+   * Update libstdc++6 symbols file for armel. Closes: #954954.
+   * libgcc-sN: Provide libgcc-sN with an epoch version to rebuild gcc-8.
+     Closes: #954826.
+ 
+  -- Matthias Klose <doko@debian.org>  Thu, 02 Apr 2020 15:01:48 +0200
  
  gcc-10 (10-20200324-1) unstable; urgency=medium
  

diff --cc debian/libstdc++6.symbols.common
Simple merge

diff --cc debian/rules.defs
Simple merge

diff --cc debian/rules.patch
Simple merge