Merge version 1.176+rpi1 and 1.178 to produce 1.178+rpi1

diff --cc debian/README.Debian
index 0f0a7714cd18b56a1e580cf2da63b4fbfa696c5e,46c877cbc63d04ae542e5272e28b60a7ee010492..04dcc82e0ce55bb49449b693cec1d03887e52bb6
--- 1/debian/README.Debian
--- 2/debian/README.Debian
+++ b/debian/README.Debian
@@@ -47,16 -47,16 +47,16 @@@ making sure you are always using the on
  architecture. To use the other compiler, simply set CC=gcc-5, or
  similar.
  
 -The default compiler versions for Debian GNU/Linux on amd64 are
 +The default compiler versions for Debian GNU/Linux on armhf are
  (minor version numbers omitted):
  
-       cpp             : cpp-7
-       gcc             : gcc-7
-       g++             : g++-7
-       gfortran        : gfortran-7
+       cpp             : cpp-8
+       gcc             : gcc-8
+       g++             : g++-8
+       gfortran        : gfortran-8
        gccgo           : gccgo-8
-       gobjc           : gobjc-7
-       gobjc++         : gobjc++-7
+       gobjc           : gobjc-8
+       gobjc++         : gobjc++-8
        gdc             : gdc-8
  
  Most of the documentation for GCC including the manual pages is

diff --cc debian/changelog
index 1a5672d5052f1bf0a559bd684eb6e05a4793bd80,44759f30bd9c844ff73bbd3b563c0b74d0da63fb..067a7b9af6c1f0fd08e2fe12ea625c4ce24261ad
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,18 +1,25 @@@
- gcc-defaults (1.176+rpi1) buster-staging; urgency=medium
++gcc-defaults (1.178+rpi1) buster-staging; urgency=medium
 +
++  [changes brought forward from 1.176+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 07 Jun 2018 13:27:06 +0000]
 +  * Re-enable gcj packages for now.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 07 Jun 2018 13:27:06 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 28 Jul 2018 11:25:06 +0000
++
+ gcc-defaults (1.178) unstable; urgency=medium
+ 
+   * gcc, g++: Provide gcc-<triplet>, g++-<triplet>.
+   * Bump standards version.
+   * Fix typos in package descriptions. Closes: #902276.
+ 
+  -- Matthias Klose <doko@debian.org>  Thu, 19 Jul 2018 10:22:48 +0200
+ 
+ gcc-defaults (1.177) experimental; urgency=medium
+ 
+   * Default to GCC 8.
+   * Tighten dependencies on the cpp, gcc, g++ and gfortran packages.
+     Closes: #871630.
+ 
+  -- Matthias Klose <doko@debian.org>  Thu, 26 Apr 2018 09:48:54 +0200
  
  gcc-defaults (1.176) unstable; urgency=medium
  

diff --cc debian/control
index 75783e49446b8db640b990e8bbebfc8bcc647534,433276811a058cef4293a9be2fdef55d977d2105..c63cd35da900403b6ea39105061b493be15a4ff6
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -3,13 -3,12 +3,12 @@@ Section: deve
  Priority: standard
  Maintainer: Debian GCC Maintainers <debian-gcc@lists.debian.org>
  Uploaders: Matthias Klose <doko@debian.org>
- Standards-Version: 4.1.3
+ Standards-Version: 4.1.5
  Build-Depends: m4, debhelper (>= 9),
    dpkg-dev (>= 1.17.11),
-   gcc-7-base (>= 7.3.0-12),
-   gcc-8-base (>= 8-20180321-1),
+   gcc-8-base (>= 8.1.0-4),
    lsb-release
 -#Build-Depends-Indep: ca-certificates, gcj-jdk, python
 +Build-Depends-Indep: ca-certificates, gcj-jdk, python
  Vcs-Svn: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-defaults
  Vcs-Browser: http://svn.debian.org/viewsvn/gcccvs/branches/sid/gcc-defaults
  XS-Python-Version: all

diff --cc debian/control.native.in
Simple merge

diff --cc debian/control.source
index 9ea732dcb70ef8aa6dcac07ae7d9035934eb7272,b508e8e65d9dcbf9230a980b99915008d29c3e3e..1e6b72fa09ef6fc03f41c949cb114f03e9868edc
--- 1/debian/control.source
--- 2/debian/control.source
+++ b/debian/control.source
@@@ -3,13 -3,12 +3,12 @@@ Section: deve
  Priority: standard
  Maintainer: Debian GCC Maintainers <debian-gcc@lists.debian.org>
  Uploaders: Matthias Klose <doko@debian.org>
- Standards-Version: 4.1.3
+ Standards-Version: 4.1.5
  Build-Depends: m4, debhelper (>= 9),
    dpkg-dev (>= 1.17.11),
-   gcc-7-base (>= 7.3.0-12),
-   gcc-8-base (>= 8-20180321-1),
+   gcc-8-base (>= 8.1.0-4),
    lsb-release
 -#Build-Depends-Indep: ca-certificates, gcj-jdk, python
 +Build-Depends-Indep: ca-certificates, gcj-jdk, python
  Vcs-Svn: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-defaults
  Vcs-Browser: http://svn.debian.org/viewsvn/gcccvs/branches/sid/gcc-defaults
  XS-Python-Version: all

diff --cc debian/rules
index 61a201d95bdf0c078b2aca3eb2dc343256e191e0,eef200c78cddeb95ce1b1f70f51d700e01336554..5dd6102fa07ad8f28adbcbfe8d77b012ec3afbbe
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -197,14 -198,15 +198,14 @@@ ifneq (,$(filter $(DEB_HOST_ARCH), i38
  endif
  DEB_HOST_MULTIARCH    := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
  
- all_archs  = alpha amd64 armel armhf arm64 hppa i386 ia64 m68k mips mipsel mips64 mips64el or1k powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64 x32 hurd-i386 kfreebsd-amd64 kfreebsd-i386
+ all_archs  = alpha amd64 armel armhf arm64 hppa i386 ia64 m68k mips mipsel mips64 mips64el or1k powerpc powerpcspe ppc64 ppc64el riscv64 s390 s390x sh4 sparc sparc64 x32 hurd-i386 kfreebsd-amd64 kfreebsd-i386
  
- gcc6_archs =
- gcc7_archs  = alpha amd64 armel armhf arm64 hppa i386 ia64 m68k mips mipsel mips64 mips64el or1k powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64 x32 hurd-i386 kfreebsd-amd64 kfreebsd-i386
+ gcc7_archs =
+ gcc8_archs  = alpha amd64 armel armhf arm64 hppa i386 ia64 m68k mips mipsel mips64 mips64el or1k powerpc powerpcspe ppc64 ppc64el riscv64 s390 s390x sh4 sparc sparc64 x32 hurd-i386 kfreebsd-amd64 kfreebsd-i386
  
  gcj6_archs  = alpha amd64 armel armhf arm64 hppa i386 ia64 m68k mips mipsel mips64 mips64el or1k powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64 x32 hurd-i386 kfreebsd-amd64 kfreebsd-i386
 -gcj6_archs  =
  
- gnat6_archs  = alpha amd64 armel armhf arm64 hppa i386 ia64 m68k mips mipsel mips64 mips64el or1k powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64 x32 hurd-i386 kfreebsd-amd64 kfreebsd-i386
+ gnat_archs  = alpha amd64 armel armhf arm64 hppa i386 ia64 m68k mips mipsel mips64 mips64el or1k powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64 x32 hurd-i386 kfreebsd-amd64 kfreebsd-i386
  gnat7_archs  =
  
  # CV_XXX is the complete version number, including the release, without epoch