diff -Nru gcc-defaults-1.176ubuntu1/debian/changelog gcc-defaults-1.176ubuntu2/debian/changelog
--- gcc-defaults-1.176ubuntu1/debian/changelog	2018-04-06 18:04:15.000000000 +0000
+++ gcc-defaults-1.176ubuntu2/debian/changelog	2018-04-06 18:04:15.000000000 +0000
@@ -1,4 +1,4 @@
-gcc-defaults (1.176ubuntu1) bionic; urgency=medium
+gcc-defaults (1.176ubuntu2) bionic; urgency=medium
 
   * Merge with Debian; remaining changes:
     - Build -multilib packages on armel and armhf (except for gccgo).
diff -Nru gcc-defaults-1.176ubuntu1/debian/control gcc-defaults-1.176ubuntu2/debian/control
--- gcc-defaults-1.176ubuntu1/debian/control	2018-04-06 18:04:15.000000000 +0000
+++ gcc-defaults-1.176ubuntu2/debian/control	2018-04-06 18:04:15.000000000 +0000
@@ -437,6 +437,271 @@
  This is a dependency package providing the default GNU C cross-compiler
  for the hppa64 architecture.
 
+Package: cpp-x86-64-linux-gnu
+Priority: optional
+Architecture: arm64 i386 ppc64el x32
+Multi-Arch: foreign
+Section: interpreters
+Depends: cpp-${pv:cpp}-x86-64-linux-gnu ${reqv:cpp}, ${misc:Depends}
+Suggests: cpp-doc
+Description: GNU C preprocessor (cpp) for the amd64 architecture
+ The GNU C preprocessor is a macro processor that is used automatically
+ by the GNU C compiler to transform programs before actual compilation.
+ .
+ This package has been separated from gcc for the benefit of those who
+ require the preprocessor but not the cross-compiler for amd64 architecture.
+ .
+ This is a dependency package providing the default GNU C preprocessor
+ for the amd64 architecture.
+
+Package: gcc-x86-64-linux-gnu
+Priority: optional
+Architecture: arm64 i386 ppc64el x32
+Multi-Arch: foreign
+Depends: cpp-x86-64-linux-gnu (>= ${version:cpp}),
+  gcc-${pv:gcc}-x86-64-linux-gnu ${reqv:gcc},
+  ${misc:Depends}
+Recommends: libc6-dev-amd64-cross | libc-dev-amd64-cross
+Suggests: make, manpages-dev, autoconf, automake, libtool, flex, bison, gdb-x86-64-linux-gnu, gcc-doc
+Description: GNU C compiler for the amd64 architecture
+ This is the GNU C compiler, a fairly portable optimizing compiler for C.
+ .
+ This is a dependency package providing the default GNU C cross-compiler
+ for the amd64 architecture.
+
+Package: g++-x86-64-linux-gnu
+Priority: optional
+Architecture: arm64 i386 ppc64el x32
+Multi-Arch: foreign
+Depends: cpp-x86-64-linux-gnu (>= ${version:cpp}),
+  gcc-x86-64-linux-gnu (>= ${version:cpp}),
+  g++-${pv:gpp}-x86-64-linux-gnu ${reqv:gpp},
+  ${misc:Depends}
+Description: GNU C++ compiler for the amd64 architecture
+ This is the GNU C++ compiler, a fairly portable optimizing compiler for C++.
+ .
+ This is a dependency package providing the default GNU C++ cross-compiler
+ for the amd64 architecture.
+
+Package: gobjc-x86-64-linux-gnu
+Priority: optional
+Architecture: arm64 i386 ppc64el x32
+Multi-Arch: foreign
+Depends: cpp-x86-64-linux-gnu (>= ${version:cpp}),
+  gcc-x86-64-linux-gnu (>= ${version:cpp}),
+  gobjc-${pv:gobjc}-x86-64-linux-gnu ${reqv:gobjc},
+  ${misc:Depends}
+Description: GNU Objective-C compiler for the amd64 architecture
+ This is the GNU Objective-C compiler, which compiles Objective-C on platforms
+ supported by the gcc compiler. It uses the gcc backend to generate optimized
+ code.
+ .
+ This is a dependency package providing the default GNU Objective-C
+ cross-compiler for the amd64 architecture.
+
+Package: gobjc++-x86-64-linux-gnu
+Priority: optional
+Architecture: arm64 i386 ppc64el x32
+Multi-Arch: foreign
+Depends: cpp-x86-64-linux-gnu (>= ${version:cpp}),
+  gcc-x86-64-linux-gnu (>= ${version:cpp}),
+  gobjc++-${pv:gobjcxx}-x86-64-linux-gnu ${reqv:gobjcxx},
+  ${misc:Depends}
+Recommends: g++-x86-64-linux-gnu (>= ${version:cpp}), gobjc-x86-64-linux-gnu (>= ${version:cpp})
+Description: GNU Objective-C++ compiler for the amd64 architecture
+ This is the GNU Objective-C++ compiler, which compiles
+ Objective-C++ on platforms supported by the gcc compiler. It uses the
+ gcc backend to generate optimized code.
+ .
+ This is a dependency package providing the default GNU Objective-C++
+ cross-compiler for the amd64 architecture.
+
+Package: gfortran-x86-64-linux-gnu
+Priority: optional
+Architecture: arm64 i386 ppc64el x32
+Multi-Arch: foreign
+Depends: cpp-x86-64-linux-gnu (>= ${version:cpp}),
+  gcc-x86-64-linux-gnu (>= ${version:gcc}),
+  gfortran-${pv:gfort}-x86-64-linux-gnu ${reqv:gfort},
+  ${misc:Depends}
+Suggests: gfortran-doc
+Description: GNU Fortran 95 compiler for the amd64 architecture
+ This is the GNU Fortran 95 compiler, which compiles Fortran 95 on platforms
+ supported by the gcc compiler. It uses the gcc backend to generate optimized
+ code.
+ .
+ This is a dependency package providing the default GNU Fortran 95
+ cross-compiler for the amd64 architecture.
+
+Package: gccgo-x86-64-linux-gnu
+Priority: optional
+Architecture: arm64 i386 ppc64el x32
+Multi-Arch: foreign
+Depends: cpp-x86-64-linux-gnu (>= ${version:cpp}),
+  g++-x86-64-linux-gnu (>= ${version:gcc}),
+  gccgo-${pv:ggo}-x86-64-linux-gnu ${reqv:ggo},
+  ${misc:Depends}
+Suggests: gccgo-doc
+Description: Go compiler (based on GCC) for the amd64 architecture
+ This is the GNU Go compiler, which compiles Go on platforms supported by
+ the gcc compiler. It uses the gcc backend to generate optimized code.
+ .
+ This is a dependency package providing the default GNU Go cross-compiler
+ for the amd64 architecture.
+
+#Package: gcj-x86-64-linux-gnu
+#Priority: optional
+#Architecture: arm64 i386 ppc64el x32
+#Multi-Arch: foreign
+#Depends: cpp-x86-64-linux-gnu (>= ${version:cpp}),
+#  gcj-${pv:gcj}-x86-64-linux-gnu ${reqv:gcj},
+#  ${misc:Depends}
+#Description: GNU Java compiler (based on GCC) for the amd64 architecture
+# This is the GNU Java compiler, which compiles java on platforms supported by
+# the gcc compiler. It uses the gcc backend to generate optimized code.
+# .
+# This is a dependency package providing the default GNU Java cross-compiler
+# for the amd64 architecture.
+
+Package: gdc-x86-64-linux-gnu
+Priority: optional
+Architecture: arm64 i386 ppc64el x32
+Multi-Arch: foreign
+Depends: cpp-x86-64-linux-gnu (>= ${version:cpp}),
+  gdc-${pv:gdc}-x86-64-linux-gnu ${reqv:gdc},
+  ${misc:Depends}
+Description: GNU D compiler (based on GCC) for the amd64 architecture
+ This is the GNU D compiler, which compiles D on platforms supported by
+ the gcc compiler. It uses the gcc backend to generate optimized code.
+ .
+ This is a dependency package providing the default GNU D cross-compiler
+ for the amd64 architecture.
+
+Package: gcc-multilib-x86-64-linux-gnu
+Priority: optional
+Architecture: arm64 i386 ppc64el x32
+Depends: cpp-x86-64-linux-gnu (>= ${version:cpp}),
+  gcc-x86-64-linux-gnu (>= ${version:gcc}),
+  gcc-${pv:gcc}-multilib-x86-64-linux-gnu ${reqv:gcc},
+  ${misc:Depends}
+Recommends: libc6-dev-amd64-cross | libc-dev-amd64-cross
+Suggests: make, manpages-dev, autoconf, automake, libtool, flex, bison, gdb-x86-64-linux-gnu, gcc-doc
+Description: GNU C compiler for the amd64 architecture
+ This is the GNU C compiler, a fairly portable optimizing compiler for C.
+ .
+ This is a dependency package providing the default GNU C cross-compiler
+ for the amd64 architecture.
+
+Package: g++-multilib-x86-64-linux-gnu
+Priority: optional
+Architecture: arm64 i386 ppc64el x32
+Depends: cpp-x86-64-linux-gnu (>= ${version:cpp}),
+  g++-x86-64-linux-gnu (>= ${version:gpp}),
+  gcc-multilib-x86-64-linux-gnu (>= ${version:gcc}),
+  g++-${pv:gpp}-multilib-x86-64-linux-gnu ${reqv:gpp},
+  ${misc:Depends}
+Description: GNU C++ compiler for the amd64 architecture
+ This is the GNU C++ compiler, a fairly portable optimizing compiler for C++.
+ .
+ This is a dependency package providing the default GNU C++
+ cross-compiler for the amd64 architecture.
+
+Package: gobjc-multilib-x86-64-linux-gnu
+Priority: optional
+Architecture: arm64 i386 ppc64el x32
+Depends: cpp-x86-64-linux-gnu (>= ${version:cpp}),
+  gobjc-x86-64-linux-gnu (>= ${version:gobjc}),
+  gcc-multilib-x86-64-linux-gnu (>= ${version:cpp}),
+  gobjc-${pv:gobjc}-multilib-x86-64-linux-gnu ${reqv:gobjc},
+  ${misc:Depends}
+Description: GNU Objective-C compiler for the amd64 architecture
+ This is the GNU Objective-C compiler, which compiles Objective-C on platforms
+ supported by the gcc compiler. It uses the gcc backend to generate optimized
+ code.
+ .
+ This is a dependency package providing the default GNU Objective-C
+ cross-compiler for the amd64 architecture.
+
+Package: gobjc++-multilib-x86-64-linux-gnu
+Priority: optional
+Architecture: arm64 i386 ppc64el x32
+Depends: cpp-x86-64-linux-gnu (>= ${version:cpp}),
+  gcc-multilib-x86-64-linux-gnu (>= ${version:cpp}),
+  gobjc++-x86-64-linux-gnu (>= ${version:gobjcxx}),
+  gobjc++-${pv:gobjcxx}-multilib-x86-64-linux-gnu ${reqv:gobjcxx},
+  ${misc:Depends}
+Recommends: g++-x86-64-linux-gnu (>= ${version:cpp}),
+  gobjc-x86-64-linux-gnu (>= ${version:cpp})
+Description: GNU Objective-C++ compiler for the amd64 architecture
+ This is the GNU Objective-C++ compiler, which compiles
+ Objective-C++ on platforms supported by the gcc compiler. It uses the
+ gcc backend to generate optimized code.
+ .
+ This is a dependency package providing the default GNU Objective-C++
+ cross-compiler for the amd64 architecture.
+
+Package: gfortran-multilib-x86-64-linux-gnu
+Priority: optional
+Architecture: arm64 i386 ppc64el x32
+Depends: cpp-x86-64-linux-gnu (>= ${version:cpp}),
+  gcc-multilib-x86-64-linux-gnu (>= ${version:gcc}),
+  gfortran-x86-64-linux-gnu (>= ${version:gfort}),
+  gfortran-${pv:gfort}-multilib-x86-64-linux-gnu ${reqv:gfort},
+  ${misc:Depends}
+Suggests: gfortran-doc
+Description: GNU Fortran 95 compiler for the amd64 architecture
+ This is the GNU Fortran 95 compiler, which compiles Fortran 95 on platforms
+ supported by the gcc compiler. It uses the gcc backend to generate optimized
+ code.
+ .
+ This is a dependency package providing the default GNU Fortran 95
+ cross-compiler for the amd64 architecture.
+
+Package: gccgo-multilib-x86-64-linux-gnu
+Priority: optional
+Architecture: arm64 i386 ppc64el x32
+Depends: cpp-x86-64-linux-gnu (>= ${version:cpp}),
+  g++-multilib-x86-64-linux-gnu (>= ${version:gcc}),
+  gccgo-x86-64-linux-gnu (>= ${version:ggo}),
+  gccgo-${pv:ggo}-multilib-x86-64-linux-gnu ${reqv:ggo},
+  ${misc:Depends}
+Suggests: gccgo-doc
+Description: Go compiler (based on GCC) for the amd64 architecture
+ This is the GNU Go compiler, which compiles Go on platforms supported by
+ the gcc compiler. It uses the gcc backend to generate optimized code.
+ .
+ This is a dependency package providing the default GNU Go cross-compiler
+ cross-compiler for the amd64 architecture.
+
+Package: gdc-multilib-x86-64-linux-gnu
+Priority: optional
+Architecture: arm64 i386 ppc64el x32
+Depends: cpp-x86-64-linux-gnu (>= ${version:cpp}),
+  gdc-${pv:gdc}-multilib-x86-64-linux-gnu ${reqv:gdc},
+  gdc-x86-64-linux-gnu (>= ${version:gdc}),
+  ${misc:Depends}
+Description: GNU D compiler (based on GCC) for the amd64 architecture
+ This is the GNU D compiler, which compiles D on platforms supported by
+ the gcc compiler. It uses the gcc backend to generate optimized code.
+ .
+ This is a dependency package providing the default GNU D cross-compiler
+ cross-compiler for the amd64 architecture.
+
+Package: pkg-config-x86-64-linux-gnu
+Priority: optional
+Architecture: arm64 i386 ppc64el x32
+Depends: pkg-config (>= 0.25-1.1ubuntu2), ${misc:Depends}
+Description: manage compile and link flags for libraries for amd64 architecture
+ pkg-config is a system for managing library compile and link flags that
+ works with automake and autoconf.
+ .
+ Increasingly libraries ship with ".pc" files that allow querying of the
+ compiler and linker flags needed to use them through the pkg-config(1)
+ program.
+ .
+ This is a dependency package providing cross pkg-config support for the
+ amd64 architecture.
+
 Package: cpp-s390x-linux-gnu
 Priority: optional
 Architecture: amd64 i386 x32
diff -Nru gcc-defaults-1.176ubuntu1/debian/rules gcc-defaults-1.176ubuntu2/debian/rules
--- gcc-defaults-1.176ubuntu1/debian/rules	2018-04-06 18:04:15.000000000 +0000
+++ gcc-defaults-1.176ubuntu2/debian/rules	2018-04-06 18:04:15.000000000 +0000
@@ -731,7 +731,7 @@
 endif
 ifeq ($(with_cross),yes)
 	: # FIXME: filter-out some gdc and gccgo multilib configs
-	$(foreach a,$(CROSS_ARCHS), \
+	$(foreach a, amd64 $(CROSS_ARCHS), \
 	  sed \
 	    -e "s/CROSS_ARCH/$(a)/g" \
 	    -e 's/CROSS_GNU_TYPE/$(subst _,-,$(call _gnu_type,$(a)))/g' \