Merge version 8-20180321-1+rpi1 and 8-20180402-1 to produce 8-20180402-1+rpi1

diff --cc debian/changelog
index 796abc54e6fd34b3296af2a718371bb247a014a7,1e9ab8957b5ae5b20af086bd97bcde0941fff402..eeed59b24fe44ebc545ca70e855abb0fb358b96e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,29 +1,36 @@@
- gcc-8 (8-20180321-1+rpi1) buster-staging; urgency=medium
++gcc-8 (8-20180402-1+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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 29 Mar 2018 03:16:51 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 09 Apr 2018 02:28:15 +0000
++
+ gcc-8 (8-20180402-1) unstable; urgency=medium
+ 
+   * GCC 8 snapshot, taken from the trunk 20180402 (r259004).
+   * Build a native compiler with a cross directory layout using the
+     FORCE_CROSS_LAYOUT environment variable.
+ 
+  -- Matthias Klose <doko@debian.org>  Mon, 02 Apr 2018 10:09:27 +0200
+ 
+ gcc-8 (8-20180331-1) unstable; urgency=medium
+ 
+   * GCC 8 snapshot, taken from the trunk 20180331 (r258989).
+     - Fix PR/libstdc++/85040, std::less<void> fails when operator< is
+       overloaded. Closes: #893517.
+     - Fix PR/target 84148, CET shouldn't be enabled in 32-bit run-time
+       libraries by default. Closes: #890092.
+ 
+   [ Samuel Thibault ]
+   * Fix disabling go on hurd-i386 for now.
+ 
+   [ Matthias Klose ]
+   * gdc: Link with the shared libphobos library by default.
+   * Fix control file generation for nolang=biarch builds (Helmut Grohne).
+     Closes: #891289.
+   * Simplify architecture to gnu-type mapping (Helmut Grohne). Closes: #893493.
+ 
+  -- Matthias Klose <doko@debian.org>  Sat, 31 Mar 2018 15:14:44 +0800
  
  gcc-8 (8-20180321-1) unstable; urgency=medium
  

diff --cc debian/rules.patch
Simple merge