diff --git a/srcpkgs/cross-i686-pc-linux-gnu/files/bug90756.patch b/srcpkgs/cross-i686-pc-linux-gnu/files/bug90756.patch
deleted file mode 120000
index 02ae43b18b..0000000000
--- a/srcpkgs/cross-i686-pc-linux-gnu/files/bug90756.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/bug90756.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-i686-pc-linux-gnu/files/non-nullness.patch b/srcpkgs/cross-i686-pc-linux-gnu/files/non-nullness.patch
deleted file mode 120000
index c8b653748f..0000000000
--- a/srcpkgs/cross-i686-pc-linux-gnu/files/non-nullness.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../gcc/patches/non-nullness.patch
\ No newline at end of file
diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template
index 34dc2a3827..c5b0e414ca 100644
--- a/srcpkgs/cross-i686-pc-linux-gnu/template
+++ b/srcpkgs/cross-i686-pc-linux-gnu/template
@@ -1,8 +1,8 @@
 # Template build file for 'cross-i686-pc-linux-gnu'
 #
 _binutils_version=2.32
-_gcc_version=9.1.0
-_glibc_version=2.29
+_gcc_version=9.2.0
+_glibc_version=2.30
 _linux_version=4.19
 
 _triplet=i686-pc-linux-gnu
@@ -10,8 +10,8 @@ _archflags="-march=i686 -mtune=generic"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.31
-revision=2
+version=0.32
+revision=1
 short_desc="GNU Cross toolchain for the ${_triplet} target (binutils/gcc/glibc)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 homepage="https://www.voidlinux.org/"
@@ -22,8 +22,8 @@ distfiles="
  ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
- f3eeb8d57e25ca9fc13c2af3dae97754f9f643bc69229546828e3a240e2af04b
+ ea6ef08f121239da5695f76c9b33637a118dcf63e24164422231917fa61fb206
+ e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
 
 archs="armv6l armv7l x86_64"
@@ -32,7 +32,7 @@ nopie=yes
 nodebug=yes
 lib32disabled=yes
 create_wrksrc=yes
-hostmakedepends="flex perl python3"
+hostmakedepends="gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel"
 depends="${pkgname}-libc-${version}_${revision}"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
@@ -81,9 +81,7 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/non-nullness.patch
 	_apply_patch -p0 ${FILESDIR}/no-stack_chk_fail_local.patch
-	_apply_patch -p0 ${FILESDIR}/bug90756.patch
 
 	msg_normal "Building cross gcc bootstrap\n"
 
@@ -235,7 +233,7 @@ _gcc_build() {
 	_args+=" --prefix=/usr"
 	_args+=" --libdir=/usr/lib"
 	_args+=" --with-sysroot=${_sysroot}"
-	_args+=" --enable-languages=c,ada,c++,fortran,lto"
+	_args+=" --enable-languages=c,ada,c++,objc,obj-c++,go,fortran,lto"
 	_args+=" --with-gnu-as"
 	_args+=" --with-gnu-ld"
 	_args+=" --disable-multilib"
@@ -252,7 +250,6 @@ _gcc_build() {
 	_args+=" --enable-default-ssp"
 	_args+=" --enable-gnu-indirect-function"
 	_args+=" --enable-libquadmath"
-	_args+=" --disable-libatomic"
 	_args+=" --disable-libssp"
 	_args+=" --disable-libmpx"
 	_args+=" --disable-libmudflap"
@@ -338,6 +335,11 @@ do_install() {
 	ln -svf libgnat-${_majorver}.so libgnat.so
 	rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so
 
+	# We need to build libatomic in target gcc as gccgo needs it to
+	# build... but it's not needed at runtime, so remove it from the
+	# destdir so it doesn't conflict with the libatomic package
+	rm -f ${DESTDIR}/${_sysroot}/usr/lib/libatomic.*
+
 	# Remove unnecessary stuff
 	rm -f ${DESTDIR}/usr/lib*/libiberty.a
 	rm -rf ${DESTDIR}/usr/share