Manual merge of version 8-20180218-1+rpi1 and 8-20180312-2 to produce 8-20180312...

diff --cc debian/changelog
index e1cc3d66c68514fbad0f05e251990f533293db4a,65d43bca19a1cc165ada50605af0d7d783237342..991a872e0dec41c775608c53c5f84309f56f63ce
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,49 +1,56 @@@
- gcc-8 (8-20180218-1+rpi1) buster-staging; urgency=medium
++gcc-8 (8-20180312-2+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 01 Mar 2018 16:23:50 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 22 Mar 2018 23:26:14 +0000
++
+ gcc-8 (8-20180312-2) unstable; urgency=medium
+ 
+   * GCC 8 snapshot, taken from the trunk 20180312 (r258445).
+   * Update GDC to 20180311.
+ 
+   [ Matthias Klose ]
+   * Fix typo in libasan and lib32asan symbols files for s390x.
+ 
+   [ Aurelien Jarno ]
+   * Disable gnat on riscv64.
+   * Backport RISC-V libffi support from upstream.
+ 
+  -- Matthias Klose <doko@debian.org>  Mon, 12 Mar 2018 12:33:10 +0100
+ 
+ gcc-8 (8-20180310-1) unstable; urgency=medium
+ 
+   * GCC 8 snapshot, taken from the trunk 20180310 (r258410).
+   * Build libasan and libubsan packages on s390x.
+   * Update libasan symbols files for s390x.
+ 
+  -- Matthias Klose <doko@debian.org>  Sat, 10 Mar 2018 10:54:02 +0700
+ 
+ gcc-8 (8-20180308-1) unstable; urgency=medium
+ 
+   * GCC 8 snapshot, taken from the trunk 20180308 (r258348).
+   * Update GDC to 20180304.
+ 
+   [ Matthias Klose ]
+   * Fix cross builds building without "common" libraries.
+   * Fix cross-building libgnat on armel, when not building the common libraries.
+   * Remove the go patches for the Hurd. Unmaintained.
+   * Update libcc1 symbols file.
+   * Install more intrinsic header files.
+ 
+   [ Aurelien Jarno ]
+   * Configure s390x build with --with-arch=z196 on Debian.
+   * Drop libgo-s390x-default-isa.diff patch.
+   * Disable multilib on riscv64.
+   * Update gcc-as-needed.diff, gcc-hash-style-both.diff and
+     gcc-hash-style-gnu.diff for riscv64.
+   * Update gcc-multiarch.diff for riscv64.
+ 
+   [ Karsten Merker ]
+   * Force the riscv64 ISA to rv64imafdc and ABI to lp64d.
+ 
+  -- Matthias Klose <doko@debian.org>  Thu, 08 Mar 2018 14:17:37 +0700
  
  gcc-8 (8-20180218-1) unstable; urgency=medium
  

diff --cc debian/rules.patch
index 592b57c469302cbf7bbb78b8ebb935687baee0fa,894b433d7dd0f0152caa4a62207597fec8171683..1d54995a98639abddcf3f244490e4e4cdfe07ee3
--- 1/debian/rules.patch
--- 2/debian/rules.patch
+++ b/debian/rules.patch
@@@ -80,6 -79,6 +79,9 @@@ debian_patches += 
  #     $(if $(filter yes, $(DEB_CROSS)),,gcc-print-file-name) \
  #     libstdc++-nothumb-check \
  
++debian_patches += \
++      raspbian-disable-libatomic-march \
++
  hardening_patches =
  ifeq ($(with_ssp)-$(with_ssp_default),yes-yes)
    hardening_patches += gcc-default-ssp