Manual merge of version 1.185.1+rpi1 and 1.188 to produce 1.188+rpi1

diff --cc debian/README.Debian
index a9518ed6e437f236699b430232c523ed3f580b57,7c10e8237222c76c6ac85b5606d811a6486b2a28..94a3567544bd300e1cf41836e955c9b5a9ecdb14
--- 1/debian/README.Debian
--- 2/debian/README.Debian
+++ b/debian/README.Debian
@@@ -47,19 -47,17 +47,19 @@@ 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-9
-       gcc             : gcc-9
-       g++             : g++-9
-       gfortran        : gfortran-9
+       cpp             : cpp-10
+       gcc             : gcc-10
+       g++             : g++-10
+       gfortran        : gfortran-10
 +      gcj             : gcj-6
 +      gij             : gij-6
-       gccgo           : gccgo-9
-       gobjc           : gobjc-9
-       gobjc++         : gobjc++-9
-       gdc             : gdc-9
+       gccgo           : gccgo-10
+       gobjc           : gobjc-10
+       gobjc++         : gobjc++-10
+       gdc             : gdc-10
  
  Most of the documentation for GCC including the manual pages is
  licensed under the GFDL and therefore not included in the main section.

diff --cc debian/changelog
index 99d6429a722530b9871c31242537e99388686786,c1f21c3c62cc305c1ae33f70cbb82ae73dd0a1bb..a110221bc0d7994239dd190059eb6849f2895dcb
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,20 +1,27 @@@
- gcc-defaults (1.185.1+rpi1) bullseye-staging; urgency=medium
++gcc-defaults (1.188+rpi1) bullseye-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>  Sun, 24 Nov 2019 13:30:46 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Fri, 14 Aug 2020 02:57:27 +0000
++
+ gcc-defaults (1.188) unstable; urgency=medium
+ 
+   * Bump GCC 10 version to 10.1.0.
+   * Bump GCC 9 version to 9.3.0.
+   * Bump standards and debhelper versions.
+ 
+  -- Matthias Klose <doko@debian.org>  Tue, 21 Jul 2020 16:16:25 +0200
+ 
+ gcc-defaults (1.187) experimental; urgency=medium
+ 
+   * Default to GCC 10.
+   * Build gm2 packages on x32.
+   * Build a gcc-offload-amdgcn package.
+   * Fix some lintian warnings.
+   * Bump standards version.
+ 
+  -- Matthias Klose <doko@debian.org>  Tue, 10 Dec 2019 14:15:02 +0100
  
  gcc-defaults (1.185.1) unstable; urgency=medium
  

diff --cc debian/control
index e1c251c3be6cf5c903e9cf41b13a6bf4baedb696,d6ee7ce711f38f21b687c849e618a32ed69b0bcc..92aa90b8b2b67f5d0aa72b4d6265e90911ae9b54
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -3,12 -3,11 +3,12 @@@ Section: deve
  Priority: standard
  Maintainer: Debian GCC Maintainers <debian-gcc@lists.debian.org>
  Uploaders: Matthias Klose <doko@debian.org>
- Standards-Version: 4.4.0
- Build-Depends: m4, debhelper (>= 9),
+ Standards-Version: 4.5.0
+ Build-Depends: m4, debhelper (>= 11),
    dpkg-dev (>= 1.17.11),
-   gcc-9-base (>= 9.2.1-1),
+   gcc-10-base (>= 10.1.0-6~),
    lsb-release
 +Build-Depends-Indep: ca-certificates, gcj-jdk, python
  Vcs-Browser: https://salsa.debian.org/toolchain-team/gcc-defaults
  Vcs-Git: https://salsa.debian.org/toolchain-team/gcc-defaults.git
  

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

diff --cc debian/control.source
index 7e28d1f2a98f1565b49e2b0f0bc565c7dcb297b3,e64b57199dce4e8145525040f5bbfe99a6412954..ce51a616f359f74d1cd74dc7bdce1a5f1c1336c2
--- 1/debian/control.source
--- 2/debian/control.source
+++ b/debian/control.source
@@@ -3,11 -3,10 +3,11 @@@ Section: deve
  Priority: standard
  Maintainer: Debian GCC Maintainers <debian-gcc@lists.debian.org>
  Uploaders: Matthias Klose <doko@debian.org>
- Standards-Version: 4.4.0
- Build-Depends: m4, debhelper (>= 9),
+ Standards-Version: 4.5.0
+ Build-Depends: m4, debhelper (>= 11),
    dpkg-dev (>= 1.17.11),
-   gcc-9-base (>= 9.2.1-1),
+   gcc-10-base (>= 10.1.0-6~),
    lsb-release
 +Build-Depends-Indep: ca-certificates, gcj-jdk, python
  Vcs-Browser: https://salsa.debian.org/toolchain-team/gcc-defaults
  Vcs-Git: https://salsa.debian.org/toolchain-team/gcc-defaults.git

diff --cc debian/rules
index 883e71544b1c34716635b1de3a90bcdc13538f39,c4e3accf779435e9a8e50332658426d609352705..2216df8f1b88377d7f2993f97e834fc52aa19e70
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -191,9 -192,9 +194,10 @@@ REQV_49           := (>= 4.9.3-10~
  REQV_5                := (>= 5.4.1-2~)
  REQV_6                := (>= 6.4.0-1~)
  REQV_7                := (>= 7.3.0-11~)
 +REQV_LIBGCJ_BC        := (>= 6.4.0-1~)
  REQV_8                := (>= 8.3.0-6~)
- REQV_9                := (>= 9.2.1-1~)
+ REQV_9                := (>= 9.3.0-13~)
+ REQV_10               := (>= 10.1.0-3~)
  
  # architecture dependent variables
  DEB_HOST_ARCH         := $(shell dpkg-architecture -qDEB_HOST_ARCH)
@@@ -206,31 -207,25 +210,31 @@@ DEB_HOST_MULTIARCH      := $(shell dpkg-arch
  
  all_archs  = alpha amd64 armel armhf arm64 hppa i386 ia64 m68k mipsel mips64 mips64el or1k powerpc powerpcspe ppc64 ppc64el riscv64 s390 s390x sh4 sparc sparc64 x32 hurd-i386 kfreebsd-amd64 kfreebsd-i386
  
- gcc8_archs = powerpcspe
- gcc9_archs  = alpha amd64 armel armhf arm64 hppa i386 ia64 m68k mipsel mips64 mips64el or1k powerpc 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
 +
+ gcc9_archs = powerpcspe
+ gcc10_archs  = alpha amd64 armel armhf arm64 hppa i386 ia64 m68k mipsel mips64 mips64el or1k powerpc ppc64 ppc64el riscv64 s390 s390x sh4 sparc sparc64 x32 hurd-i386 kfreebsd-amd64 kfreebsd-i386
  
  gnat_archs  = alpha amd64 armel armhf arm64 hppa i386 ia64 m68k mipsel mips64 mips64el or1k powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64 x32 hurd-i386 kfreebsd-amd64 kfreebsd-i386
- gnat8_archs  =
+ gnat9_archs  =
  
  # CV_XXX is the complete version number, including the release, without epoch
- CV_CPP                := 9.2.1-$(REL_NO_921)
- CV_GCC                := 9.2.1-$(REL_NO_921)
- CV_GPP                := 9.2.1-$(REL_NO_921)
- CV_GOBJC      := 9.2.1-$(REL_NO_921)
- CV_GOBJCXX    := 9.2.1-$(REL_NO_921)
- CV_GFORT      := 9.2.1-$(REL_NO_921)
- CV_GGO                := 9.2.1-$(REL_NO_921)
- CV_GNAT               := 9.2.1-$(REL_NO_921)
+ CV_CPP                := 10.1.0-$(REL_NO_1010)
+ CV_GCC                := 10.1.0-$(REL_NO_1010)
+ CV_GPP                := 10.1.0-$(REL_NO_1010)
+ CV_GOBJC      := 10.1.0-$(REL_NO_1010)
+ CV_GOBJCXX    := 10.1.0-$(REL_NO_1010)
+ CV_GFORT      := 10.1.0-$(REL_NO_1010)
+ CV_GGO                := 10.1.0-$(REL_NO_1010)
+ CV_GNAT               := 10.1.0-$(REL_NO_1010)
 +CV_GCJ                := 6.4.0-$(REL_NO_64)
 +CV_GIJ                := 6.4.0-$(REL_NO_64)
 +CV_LIBGCJBC   := 6.4.0-$(REL_NO_64)
- CV_GDC                := 9.2.1-$(REL_NO_921)
+ CV_GDC                := 10.1.0-$(REL_NO_1010)
 +CV_LIBGCJCOMMON       := 1:6.4-$(REL_NO_64)
- CV_GM2                := 9.2.1-$(REL_NO_921)
- CV_BRIG               := 9.2.1-$(REL_NO_921)
- CV_OFFL               := 9.2.1-$(REL_NO_921)
+ CV_GM2                := 10.1.0-$(REL_NO_1010)
+ CV_BRIG               := 10.1.0-$(REL_NO_1010)
+ CV_OFFL               := 10.1.0-$(REL_NO_1010)
  
  $(foreach a, $(all_archs), \
    $(foreach v, CV_CPP CV_GCC CV_GPP CV_GOBJC CV_GOBJCXX CV_GFORT CV_GGO CV_GNAT CV_GDC CV_GM2 CV_BRIG CV_OFFL, \
@@@ -1512,7 -1278,7 +1539,7 @@@ endi
  
        for p in $$(dh_listpackages -a); do \
          case $$p in \
-           cpp|g++|gcc|gccgo|gcj-jdk|gcj-jre-headless|gfortran|gcc-hppa64-linux-gnu) \
 -          cpp|g++|gcc|gccgo|gfortran|gccbrig|gcc-hppa64-linux-gnu|gcc-offload-*) \
++          cpp|g++|gcc|gccgo|gcj-jdk|gcj-jre-headless|gfortran|gccbrig|gcc-hppa64-linux-gnu|gcc-offload-*) \
              [ "$(with_gfdl_docs)" = yes ] && continue; \
              mkdir -p -m 755 debian/$$p/usr/share/lintian/overrides; \
              echo "$$p binary: binary-without-manpage" \
@@@ -1619,9 -1384,18 +1650,18 @@@ binary.%: build-arch instal
          /usr/share/pkg-config-crosswrapper /usr/bin/${CROSS_GNU_TYPE}-pkg-config \
        )
  
+       for p in $(filter %-$(CROSS_PKG_GNU_TYPE),$(cross_packages)); do \
+         case $$p in \
+           cpp-$(CROSS_PKG_GNU_TYPE)) \
+             mkdir -p -m 755 debian/$$p/usr/share/lintian/overrides; \
+             echo "$$p binary: wrong-name-for-changelog-of-native-package" \
+               >> debian/$$p/usr/share/lintian/overrides/$$p;; \
+         esac; \
+       done
+ 
        for p in $(filter %-$(CROSS_PKG_GNU_TYPE),$(cross_packages)); do \
          case $$p in \
 -          cpp-$(CROSS_PKG_GNU_TYPE)|g++-$(CROSS_PKG_GNU_TYPE)|gcc-$(CROSS_PKG_GNU_TYPE)|gccgo-$(CROSS_PKG_GNU_TYPE)|gfortran-$(CROSS_PKG_GNU_TYPE)) \
 +          cpp-$(CROSS_PKG_GNU_TYPE)|g++-$(CROSS_PKG_GNU_TYPE)|gcc-$(CROSS_PKG_GNU_TYPE)|gccgo-$(CROSS_PKG_GNU_TYPE)|gcj-$(CROSS_PKG_GNU_TYPE)|gfortran-$(CROSS_PKG_GNU_TYPE)) \
              [ "$(with_gfdl_docs)" = yes ] && continue; \
              mkdir -p -m 755 debian/$$p/usr/share/lintian/overrides; \
              echo "$$p binary: binary-without-manpage" \