Re: [PR PATCH] [Updated] gcc: update to 9.1.0

[voidlinux-github@inbox.vuxu.org]

[-- Attachment #1: Type: text/plain, Size: 581 bytes --]

There is an updated pull request by pullmoll against master on the void-packages repository

https://github.com/pullmoll/void-packages gcc91
https://github.com/void-linux/void-packages/pull/12700

gcc: update to 9.1.0
Remove `libmtx{,-devel}` as they are no longer supported.
No package used them thus not sure if we need a replaces="libmtx>=0" etc.

No longer try to build `gcc-gdc` as cross compiling fails and I don't feel like wasting more time on it.

Closes: #11663

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/12700.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gcc91-12700.patch --]
[-- Type: application/text/x-diff, Size: 74012 bytes --]

From 06576ab18e68a8eb9292e4123ba51311adc0533b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 14 May 2019 10:59:51 +0200
Subject: [PATCH 01/32] gcc: update to 9.1.0

Remove libmtx{,-devel} as they are no longer supported.
No package used them thus not sure if we need a replaces="libmtx>=0" etc.

[ci skip]
---
 common/shlibs                                 |   6 +-
 .../gcc/patches/0016-invalid_tls_model.diff   |  51 ------
 srcpkgs/gcc/patches/musl-ada.patch            |  87 +++++-----
 srcpkgs/gcc/template                          | 151 ++++++++++--------
 srcpkgs/libmpx                                |   1 -
 srcpkgs/libmpx-devel                          |   1 -
 6 files changed, 122 insertions(+), 175 deletions(-)
 delete mode 100644 srcpkgs/gcc/patches/0016-invalid_tls_model.diff
 delete mode 120000 srcpkgs/libmpx
 delete mode 120000 srcpkgs/libmpx-devel

diff --git a/common/shlibs b/common/shlibs
index 199b9fcfc3e..b8149de6481 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -57,7 +57,7 @@ libcc1plugin.so.0 gcc-6.2.1_1
 libitm.so.1 libitm-4.7.3_1
 liblto_plugin.so.0 gcc-4.7.3_1
 libgcc_s.so.1 libgcc-4.4.0_1
-libgo.so.13 libgo-8.2.0_1
+libgo.so.14 libgo-9.1.0_1
 libmpx.so.2 libmpx-6.2.1_1
 libmpxwrappers.so.2 libmpx-6.2.1_1
 libperl.so.5.28 perl-5.28.0_1
@@ -863,8 +863,8 @@ libgdkmm-2.4.so.1 gtkmm2-2.24.0_1
 libgtkmm-2.4.so.1 gtkmm2-2.24.0_1
 libquadmath.so.0 libquadmath-4.4.0_1
 libgfortran.so.5 libgfortran-8.2.0_1
-libgnarl-8.so libada-8.2.0_5
-libgnat-8.so libada-8.2.0_5
+libgnarl-9.so libada-9.1.0_1
+libgnat-9.so libada-9.1.0_1
 libmozjs185.so.1.0 js-1.8.5_1
 libwebp.so.7 libwebp-0.6.0_1
 libwebpmux.so.3 libwebp-0.6.0_1
diff --git a/srcpkgs/gcc/patches/0016-invalid_tls_model.diff b/srcpkgs/gcc/patches/0016-invalid_tls_model.diff
deleted file mode 100644
index b3fe841e207..00000000000
--- a/srcpkgs/gcc/patches/0016-invalid_tls_model.diff
+++ /dev/null
@@ -1,51 +0,0 @@
---- ./libgomp/configure.tgt.orig	2018-09-25 13:44:16.654561098 -0400
-+++ ./libgomp/configure.tgt	2018-09-25 13:44:50.452688100 -0400
-@@ -10,23 +10,6 @@
- #  XCFLAGS		Add extra compile flags to use.
- #  XLDFLAGS		Add extra link flags to use.
- 
--# Optimize TLS usage by avoiding the overhead of dynamic allocation.
--if test $gcc_cv_have_tls = yes ; then
--  case "${target}" in
--
--    *-*-k*bsd*-gnu*)
--	;;
--
--    *-*-linux* | *-*-gnu*)
--	XCFLAGS="${XCFLAGS} -ftls-model=initial-exec"
--	;;
--
--    *-*-rtems*)
--	XCFLAGS="${XCFLAGS} -ftls-model=local-exec"
--	;;
--  esac
--fi
--
- # Since we require POSIX threads, assume a POSIX system by default.
- config_path="posix"
- 
---- ./libitm/configure.tgt.orig	2018-09-25 13:47:31.019296903 -0400
-+++ ./libitm/configure.tgt	2018-09-25 13:47:37.676322335 -0400
-@@ -27,22 +27,6 @@
- #  XCFLAGS		Add extra compile flags to use.
- #  XLDFLAGS		Add extra link flags to use.
- 
--# Optimize TLS usage by avoiding the overhead of dynamic allocation.
--if test "$gcc_cv_have_tls" = yes ; then
--  case "${target}" in
--
--    # For x86, we use slots in the TCB head for most of our TLS.
--    # The setup of those slots in beginTransaction can afford to
--    # use the global-dynamic model.
--    i[456]86-*-linux* | x86_64-*-linux*)
--	;;
--    
--    *-*-linux*)
--	XCFLAGS="${XCFLAGS} -ftls-model=initial-exec"
--	;;
--  esac
--fi
--
- # Map the target cpu to an ARCH sub-directory.  At the same time,
- # work out any special compilation flags as necessary.
- case "${target_cpu}" in
diff --git a/srcpkgs/gcc/patches/musl-ada.patch b/srcpkgs/gcc/patches/musl-ada.patch
index 5e6f2f77d2b..5e91b0476a3 100644
--- a/srcpkgs/gcc/patches/musl-ada.patch
+++ b/srcpkgs/gcc/patches/musl-ada.patch
@@ -124,51 +124,9 @@ index 0d12f7e..a063b47 100644
  #endif
  
  #if defined (_WIN32)
-diff --git a/gcc/ada/terminals.c b/gcc/ada/terminals.c
-index 7025f57..207b50d 100644
---- gcc/ada/terminals.c
-+++ gcc/ada/terminals.c
-@@ -1108,13 +1108,6 @@ __gnat_setup_winsize (void *desc, int rows, int columns)
- #include <stdio.h>
- #include <stdlib.h>
- 
--/* On some system termio is either absent or including it will disable termios
--   (HP-UX) */
--#if !defined (__hpux__) && !defined (BSD) && !defined (__APPLE__) \
--  && !defined (__rtems__) && !defined (__QNXNTO__)
--#   include <termio.h>
--#endif
--
- #include <sys/ioctl.h>
- #include <termios.h>
- #include <fcntl.h>
-diff --git a/gcc/ada/terminals.c b/gcc/ada/terminals.c
-index 207b50d..bd3a02c 100644
---- gcc/ada/terminals.c
-+++ gcc/ada/terminals.c
-@@ -1152,7 +1152,7 @@ __gnat_setup_winsize (void *desc, int rows, int columns)
- #if defined (__APPLE__) || defined (BSD)
- #define USE_OPENPTY
- #elif defined (__linux__)
--#define USE_GETPT
-+#define USE_POSIX_OPENPT
- #elif defined (__sun__)
- #define USE_CLONE_DEVICE "/dev/ptmx"
- #elif defined (_AIX)
-@@ -1201,8 +1201,8 @@ allocate_pty_desc (pty_desc **desc) {
-    int  master_fd   = -1;
-    char *slave_name = NULL;
- 
--#ifdef USE_GETPT
--  master_fd = getpt ();
-+#ifdef USE_POSIX_OPENPT
-+  master_fd = posix_openpt(O_RDWR | O_NOCTTY);
- #elif defined (USE_OPENPTY)
-   status = openpty (&master_fd, &slave_fd, NULL, NULL, NULL);
- #elif defined (USE_CLONE_DEVICE)
---- gcc/ada/gcc-interface/Makefile.in
-+++ gcc/ada/gcc-interface/Makefile.in
-@@ -1028,7 +1028,7 @@ ifeq ($(strip $(filter-out %86 linux%,$(target_cpu) $(target_os))),)
+--- gcc/ada/Makefile.rtl	2019-05-14 21:18:45.217455681 +0200
++++ gcc/ada/Makefile.rtl	2019-05-14 21:21:30.686464218 +0200
+@@ -1521,7 +1521,7 @@
    s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
    $(TRASYM_DWARF_UNIX_PAIRS) \
    g-sercom.adb<libgnat/g-sercom__linux.adb \
@@ -177,7 +135,7 @@ index 207b50d..bd3a02c 100644
    a-exetim.adb<libgnarl/a-exetim__posix.adb \
    a-exetim.ads<libgnarl/a-exetim__default.ads \
    s-linux.ads<libgnarl/s-linux.ads \
-@@ -1545,7 +1545,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
+@@ -2073,7 +2073,7 @@
    s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \
    g-sercom.adb<libgnat/g-sercom__linux.adb \
    $(TRASYM_DWARF_UNIX_PAIRS) \
@@ -186,7 +144,7 @@ index 207b50d..bd3a02c 100644
    $(ATOMICS_TARGET_PAIRS) \
    $(ATOMICS_BUILTINS_TARGET_PAIRS) \
    system.ads<libgnat/system-linux-ppc.ads
-@@ -1574,7 +1574,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),)
+@@ -2102,7 +2102,7 @@
  endif
  
  # ARM linux, GNU eabi
@@ -195,7 +153,7 @@ index 207b50d..bd3a02c 100644
    LIBGNAT_TARGET_PAIRS = \
    a-intnam.ads<libgnarl/a-intnam__linux.ads \
    s-inmaop.adb<libgnarl/s-inmaop__posix.adb \
-@@ -1774,7 +1774,7 @@ ifeq ($(strip $(filter-out %ia64 linux%,$(target_cpu) $(target_os))),)
+@@ -2297,7 +2297,7 @@
    s-taspri.ads<libgnarl/s-taspri__posix-noaltstack.ads \
    g-sercom.adb<libgnat/g-sercom__linux.adb \
    $(TRASYM_DWARF_UNIX_PAIRS) \
@@ -204,7 +162,7 @@ index 207b50d..bd3a02c 100644
    $(ATOMICS_TARGET_PAIRS) \
    $(ATOMICS_BUILTINS_TARGET_PAIRS) \
    system.ads<libgnat/system-linux-ia64.ads
-@@ -1871,7 +1871,7 @@ ifeq ($(strip $(filter-out %x86_64 linux%,$(target_cpu) $(target_os))),)
+@@ -2394,7 +2394,7 @@
    s-taspri.ads<libgnarl/s-taspri__posix.ads \
    g-sercom.adb<libgnat/g-sercom__linux.adb \
    $(TRASYM_DWARF_UNIX_PAIRS) \
@@ -213,3 +171,34 @@ index 207b50d..bd3a02c 100644
    $(ATOMICS_TARGET_PAIRS) \
    $(X86_64_TARGET_PAIRS) \
    system.ads<libgnat/system-linux-x86.ads
+--- gcc/ada/terminals.c	2019-01-08 10:54:04.000000000 +0100
++++ gcc/ada/terminals.c	2019-05-15 13:14:09.935742526 +0200
+@@ -1136,7 +1136,7 @@
+ /* POSIX does not specify how to open the master side of a terminal.Several
+    methods are available (system specific):
+       1- using a cloning device (USE_CLONE_DEVICE)
+-      2- getpt                  (USE_GETPT)
++      2- posix_openpt           (USE_POSIX_OPENPT)
+       3- openpty                (USE_OPENPTY)
+ 
+    When using the cloning device method, the macro USE_CLONE_DEVICE should
+@@ -1150,7 +1150,7 @@
+ #if defined (__APPLE__) || defined (BSD)
+ #define USE_OPENPTY
+ #elif defined (__linux__)
+-#define USE_GETPT
++#define USE_POSIX_OPENPT
+ #elif defined (__sun__)
+ #define USE_CLONE_DEVICE "/dev/ptmx"
+ #elif defined (_AIX)
+@@ -1199,8 +1199,8 @@
+    int  master_fd   = -1;
+    char *slave_name = NULL;
+ 
+-#ifdef USE_GETPT
+-  master_fd = getpt ();
++#if defined(USE_POSIX_OPENPT)
++  master_fd = posix_openpt(O_RDWR | O_NOCTTY);
+ #elif defined (USE_OPENPTY)
+   status = openpty (&master_fd, &slave_fd, NULL, NULL, NULL);
+ #elif defined (USE_CLONE_DEVICE)
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 4b8695b0293..c021e0a4979 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -1,25 +1,26 @@
 # Template file for 'gcc'
-_majorver=8.3
+_majorver=9
+_minorver=${_majorver}.1
 _gmp_version=6.1.2
 _mpfr_version=4.0.1
 _mpc_version=1.1.0
 _isl_version=0.19
 
 pkgname=gcc
-version=${_majorver}.0
-revision=2
+version=${_minorver}.0
+revision=1
 short_desc="GNU Compiler Collection"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
 homepage="http://gcc.gnu.org"
 license="GFDL-1.2-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
 # *-musl builders have issues fetching https://ftp.gnu.org/gnu/mpc/mpc-1.1.0.tar.gz
 distfiles="
- https://fossies.org/linux/misc/gcc-${version}.tar.xz
+ ${GNU_SITE}/gcc/gcc-${version}/gcc-${version}.tar.xz
  https://gmplib.org/download/gmp/gmp-${_gmp_version}.tar.xz
  https://www.mpfr.org/mpfr-${_mpfr_version}/mpfr-${_mpfr_version}.tar.xz
- https://fossies.org/linux/misc/mpc-${_mpc_version}.tar.gz
+ ${GNU_SITE}/mpc/mpc-${_mpc_version}.tar.gz
  http://isl.gforge.inria.fr/isl-${_isl_version}.tar.bz2"
-checksum="64baadfe6cc0f4947a84cb12d7f0dfaf45bb58b7e92461639596c21e02d97d2c
+checksum="79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
  87b565e89a9a684fe4ebeeddb8399dce2599f9c9049854ca8c0dfbdea0e21912
  67874a60826303ee2fb6affc6dc0ddd3e749e9bfcb4c8655e3953d0458a6e16e
  6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e
@@ -123,7 +124,7 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 case "$XBPS_TARGET_MACHINE" in
 	mips*) ;;
-	x86_64*|i686) subpackages+=" libitm libitm-devel libmpx libmpx-devel";;
+	x86_64*|i686) subpackages+=" libitm libitm-devel";;
 	*) subpackages+=" libitm libitm-devel";;
 esac
 if [ "$CROSS_BUILD" ]; then
@@ -247,10 +248,6 @@ do_configure() {
 	case "$XBPS_TARGET_MACHINE" in
 		*-musl) _args+=" --disable-symvers"
 			_args+=" libat_cv_have_ifunc=no"
-			if [ "$XBPS_TARGET_MACHINE" = "i686-musl" ]; then
-				# Remove libmpx because it won't compile
-				rm -rf libmpx
-			fi
 			;;
 	esac
 
@@ -355,14 +352,14 @@ do_install() {
 	# Make version a symlink of major version to make all versions
 	# from the same series work automagically.
 	mv ${DESTDIR}/usr/lib/gcc/${_triplet}/${version} \
-		${DESTDIR}/usr/lib/gcc/${_triplet}/${_majorver}
-	ln -sfr ${DESTDIR}/usr/lib/gcc/${_triplet}/${_majorver} \
+		${DESTDIR}/usr/lib/gcc/${_triplet}/${_minorver}
+	ln -sfr ${DESTDIR}/usr/lib/gcc/${_triplet}/${_minorver} \
 		${DESTDIR}/usr/lib/gcc/${_triplet}/${version}
 
 	# Ditto for c++ headers.
 	mv ${DESTDIR}/usr/include/c++/${version} \
-		${DESTDIR}/usr/include/c++/${_majorver}
-	ln -sfr ${DESTDIR}/usr/include/c++/${_majorver} \
+		${DESTDIR}/usr/include/c++/${_minorver}
+	ln -sfr ${DESTDIR}/usr/include/c++/${_minorver} \
 		${DESTDIR}/usr/include/c++/${version}
 
 	# rpcgen wants /lib/cpp, make a symlink
@@ -398,7 +395,7 @@ do_install() {
 
 gcc-ada_package() {
 	lib32disabled=yes
-	depends="gcc>=${_majorver} libada>=${_majorver}"
+	depends="gcc>=${_minorver} libada>=${_minorver}"
 	short_desc+=" - Ada compiler frontend"
 	pkg_install() {
 		for f in gnat{,bind,chop,clean,find,kr,link,ls,make,name,prep,xref}; do
@@ -406,16 +403,17 @@ gcc-ada_package() {
 		done
 	}
 }
+
 gcc-go_package() {
 	lib32disabled=yes
-	depends="gcc>=${_majorver} libgo-devel>=${_majorver}"
+	depends="gcc>=${_minorver} libgo-devel>=${_minorver}"
 	short_desc+=" - Go compiler frontend"
 	pkg_install() {
 		for f in gccgo ${_triplet}-gccgo; do
 			vmove usr/bin/${f}
 		done
 		for f in buildid cgo go1 test2json vet; do
-			vmove usr/lib/gcc/${_triplet}/${_majorver}/${f}
+			vmove usr/lib/gcc/${_triplet}/${_minorver}/${f}
 		done
 		vmove usr/share/info/gccgo.info
 		touch ${PKGDESTDIR}/usr/share/info/dir
@@ -423,9 +421,10 @@ gcc-go_package() {
 		vmove usr/lib/go
 	}
 }
+
 gcc-go-tools_package() {
 	lib32disabled=yes
-	depends="gcc-go>=${_majorver}"
+	depends="gcc-go>=${_minorver}"
 	short_desc+=" - Go tools"
 	conflicts="go>=0"
 	pkg_install() {
@@ -435,22 +434,23 @@ gcc-go-tools_package() {
 		vmove usr/share/man/man1/gofmt.1
 	}
 }
+
 gcc-fortran_package() {
 	lib32disabled=yes
-	depends="gcc>=${_majorver} libgfortran-devel>=${_majorver}"
+	depends="gcc>=${_minorver} libgfortran-devel>=${_minorver}"
 	short_desc+=" - Fortran compiler frontend"
 	pkg_install() {
 		for f in gfortran ${_triplet}-gfortran; do
 			vmove usr/bin/${f}
 		done
-		vmove usr/lib/gcc/${_triplet}/${_majorver}/f951
-		vmove usr/lib/gcc/${_triplet}/${_majorver}/libcaf_single.a
-		vmove usr/lib/gcc/${_triplet}/${_majorver}/finclude
+		vmove usr/lib/gcc/${_triplet}/${_minorver}/f951
+		vmove usr/lib/gcc/${_triplet}/${_minorver}/libcaf_single.a
+		vmove usr/lib/gcc/${_triplet}/${_minorver}/finclude
 		if [ "$CROSS_BUILD" ]; then
 			# A number of OMP modules are not built when cross
 			# compiling gcc. Copy them from the cross compiler.
 			local src="/usr/lib/gcc/${_triplet}/${version}/finclude"
-			local dst="usr/lib/gcc/${_triplet}/${_majorver}/finclude"
+			local dst="usr/lib/gcc/${_triplet}/${_minorver}/finclude"
 			for f in omp_lib.f90 omp_lib.h omp_lib.mod omp_lib_kinds.mod \
 				openacc.f90 openacc.mod openacc_kinds.mod openacc_lib.h; do
 				vinstall ${src}/${f} 644 ${dst}/
@@ -461,60 +461,67 @@ gcc-fortran_package() {
 		vmove usr/share/man/man1/gfortran.1
 	}
 }
+
 gcc-objc++_package() {
 	lib32disabled=yes
-	depends="gcc-objc>=${_majorver}"
+	depends="gcc-objc>=${_minorver}"
 	short_desc+=" - Objective-C++ support"
 	pkg_install() {
-		vmove usr/lib/gcc/${_triplet}/${_majorver}/cc1objplus
+		vmove usr/lib/gcc/${_triplet}/${_minorver}/cc1objplus
 	}
 }
+
 gcc-objc_package() {
 	lib32disabled=yes
-	depends="gcc>=${_majorver} libobjc>=${_majorver}"
+	depends="gcc>=${_minorver} libobjc>=${_minorver}"
 	short_desc+=" - Objective-C support"
 	pkg_install() {
-		vmove usr/lib/gcc/${_triplet}/${_majorver}/include/objc
-		vmove usr/lib/gcc/${_triplet}/${_majorver}/cc1obj
+		vmove usr/lib/gcc/${_triplet}/${_minorver}/include/objc
+		vmove usr/lib/gcc/${_triplet}/${_minorver}/cc1obj
 	}
 }
+
 libada-devel_package() {
-	depends="libada>=${_majorver}"
+	depends="libada>=${_minorver}"
 	short_desc+=" - Ada library - development files"
 	pkg_install() {
-		vmove usr/lib/gcc/${_triplet}/${_majorver}/adainclude
-		vmove usr/lib/gcc/${_triplet}/${_majorver}/plugin/include/ada
+		vmove usr/lib/gcc/${_triplet}/${_minorver}/adainclude
+		vmove usr/lib/gcc/${_triplet}/${_minorver}/plugin/include/ada
 	}
 }
+
 libada_package() {
 	short_desc+=" - Ada library"
 	pkg_install() {
-		vmove usr/lib/gcc/${_triplet}/${_majorver}/adalib
-		mv -v ${PKGDESTDIR}/usr/lib/gcc/${_triplet}/${_majorver}/adalib/libgna{rl,t}{,-8}.so \
+		vmove usr/lib/gcc/${_triplet}/${_minorver}/adalib
+		mv -v ${PKGDESTDIR}/usr/lib/gcc/${_triplet}/${_minorver}/adalib/libgna{rl,t}{,-${_majorver}}.so \
 			${PKGDESTDIR}/usr/lib
 	}
 }
+
 libgfortran-devel_package() {
-	depends="libgfortran>=${_majorver}"
+	depends="libgfortran>=${_minorver}"
 	short_desc+=" - Fortran library - development files"
 	pkg_install() {
+		vmove usr/lib/libgfortran.spec
 		vmove usr/lib/libgfortran.a
 		# This does not seem to exist anymore?
-		if [ -f usr/lib/gcc/${_triplet}/${_majorver}/libgfortranbegin.a ]; then
-			vmove usr/lib/gcc/${_triplet}/${_majorver}/libgfortranbegin.a
+		if [ -f usr/lib/gcc/${_triplet}/${_minorver}/libgfortranbegin.a ]; then
+			vmove usr/lib/gcc/${_triplet}/${_minorver}/libgfortranbegin.a
 		fi
 	}
 }
+
 libgfortran_package() {
 	short_desc+=" - Fortran library"
 	pkg_install() {
 		vmove "usr/lib/libgfortran.so*"
-		vmove usr/lib/libgfortran.spec
 		vlicense ${wrksrc}/COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION
 	}
 }
+
 libgo-devel_package() {
-	depends="libgo>=${_majorver}"
+	depends="libgo>=${_minorver}"
 	short_desc+=" - Go library - development files"
 	pkg_install() {
 		vmove usr/lib/libgo.a
@@ -523,6 +530,7 @@ libgo-devel_package() {
 		vmove usr/lib/libgo.so
 	}
 }
+
 libgo_package() {
 	short_desc+=" - Go library"
 	pkg_install() {
@@ -530,13 +538,15 @@ libgo_package() {
 		vlicense ${wrksrc}/COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION
 	}
 }
+
 libobjc-devel_package() {
-	depends="libobjc>=${_majorver}"
+	depends="libobjc>=${_minorver}"
 	short_desc+=" - Objective-C library - development files"
 	pkg_install() {
 		vmove "usr/lib/libobjc.*a"
 	}
 }
+
 libobjc_package() {
 	short_desc+=" - Objective-C library"
 	pkg_install() {
@@ -544,16 +554,18 @@ libobjc_package() {
 		vlicense ${wrksrc}/COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION
 	}
 }
+
 libquadmath-devel_package() {
-	depends="libquadmath>=${_majorver}"
+	depends="libquadmath>=${_minorver}"
 	short_desc+=" - quadmath library - development files"
 	pkg_install() {
-		vmove "usr/lib/gcc/${_triplet}/${_majorver}/include/quadmath*"
+		vmove "usr/lib/gcc/${_triplet}/${_minorver}/include/quadmath*"
 		vmove "usr/lib/libquadmath*.a"
 		vmove usr/share/info/libquadmath.info
 		touch ${PKGDESTDIR}/usr/share/info/dir
 	}
 }
+
 libquadmath_package() {
 	short_desc+=" - quadmath library"
 	pkg_install() {
@@ -561,34 +573,39 @@ libquadmath_package() {
 		vlicense ${wrksrc}/COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION
 	}
 }
+
 libvtv-devel_package() {
-	depends="libvtv>=${_majorver}"
+	depends="libvtv>=${_minorver}"
 	short_desc+=" - Vtable Verification Runtime Library - development files"
 	pkg_install() {
 		vmove usr/lib/libvtv.a
 		vmove usr/lib/libvtv.so
 	}
 }
+
 libvtv_package() {
 	short_desc+=" - Vtable Verification Runtime Library"
 	pkg_install() {
 		vmove usr/lib/libvtv.so.*
 	}
 }
+
 libatomic-devel_package() {
-	depends="libatomic>=${_majorver}"
+	depends="libatomic>=${_minorver}"
 	short_desc+=" - Atomics library - development files"
 	pkg_install() {
 		vmove usr/lib/libatomic.a
 		vmove usr/lib/libatomic.so
 	}
 }
+
 libatomic_package() {
 	short_desc+=" - Atomics library"
 	pkg_install() {
 		vmove usr/lib/libatomic.so.*
 	}
 }
+
 libgcc_package() {
 	short_desc+=" - GCC library"
 	replaces="libgcj<7.2.0 libcilkrts<8.2.0"
@@ -598,20 +615,22 @@ libgcc_package() {
 		vlicense ${wrksrc}/COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION
 	}
 }
+
 libgcc-devel_package() {
 	depends="libgcc-${version}_${revision}"
 	short_desc+=" - GCC library - development files"
 	replaces="libgcj-devel<7.2.0 libcilkrts-devel<8.2.0"
 	pkg_install() {
-		vmove "usr/lib/gcc/${_triplet}/${_majorver}/*.o"
-		vmove "usr/lib/gcc/${_triplet}/${_majorver}/*.a"
+		vmove "usr/lib/gcc/${_triplet}/${_minorver}/*.o"
+		vmove "usr/lib/gcc/${_triplet}/${_minorver}/*.a"
 	}
 }
+
 libgomp-devel_package() {
-	depends="libgomp>=${_majorver}"
+	depends="libgomp>=${_minorver}"
 	short_desc+=" - OpenMP v4.0 library - development files"
 	pkg_install() {
-		vmove usr/lib/gcc/${_triplet}/${_majorver}/include/omp.h
+		vmove usr/lib/gcc/${_triplet}/${_minorver}/include/omp.h
 		vmove usr/lib/libgomp.so
 		vmove usr/lib/libgomp.a
 		vmove usr/lib/libgomp.spec
@@ -619,6 +638,7 @@ libgomp-devel_package() {
 		touch ${PKGDESTDIR}/usr/share/info/dir
 	}
 }
+
 libgomp_package() {
 	short_desc+=" - OpenMP v4.0 library"
 	pkg_install() {
@@ -626,8 +646,9 @@ libgomp_package() {
 		vlicense ${wrksrc}/COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION
 	}
 }
+
 libitm-devel_package() {
-	depends="libitm>=${_majorver}"
+	depends="libitm>=${_minorver}"
 	short_desc+=" - Transactional Memory library - development files"
 	replaces="libitm<4.9.0_1"
 	pkg_install() {
@@ -638,31 +659,16 @@ libitm-devel_package() {
 		touch ${PKGDESTDIR}/usr/share/info/dir
 	}
 }
+
 libitm_package() {
 	short_desc+=" - Transactional Memory library"
 	pkg_install() {
 		vmove "usr/lib/libitm.so.*"
 	}
 }
-libmpx-devel_package() {
-	depends="libmpx>=${_majorver}"
-	short_desc+=" - Intel MPX support - development files"
-	pkg_install() {
-		vmove usr/lib/libmpx.a
-		vmove usr/lib/libmpx.so
-		vmove usr/lib/libmpxwrappers.so
-		vmove usr/lib/libmpxwrappers.a
-	}
-}
-libmpx_package() {
-	short_desc+=" - Intel MPX support"
-	pkg_install() {
-		vmove usr/lib/libmpx.so.*
-		vmove usr/lib/libmpxwrappers.so.*
-	}
-}
+
 libsanitizer-devel_package() {
-	depends="libsanitizer>=${_majorver}"
+	depends="libsanitizer>=${_minorver}"
 	short_desc+=" - Sanitizer libraries - development files"
 	pkg_install() {
 		vmove "usr/lib/lib*san*.so"
@@ -671,20 +677,23 @@ libsanitizer-devel_package() {
 		vmove usr/lib/libsanitizer.spec
 	}
 }
+
 libsanitizer_package() {
 	short_desc+=" - Sanitizer libraries"
 	pkg_install() {
 		vmove "usr/lib/lib*san*.so.*"
 	}
 }
+
 libssp-devel_package() {
-	depends="libssp>=${_majorver}"
+	depends="libssp>=${_minorver}"
 	short_desc+=" - SSP (StackSmashingProtection) library - development files"
 	pkg_install() {
 		vmove "usr/lib/libssp*.a"
-		vmove usr/lib/gcc/${_triplet}/${_majorver}/include/ssp
+		vmove usr/lib/gcc/${_triplet}/${_minorver}/include/ssp
 	}
 }
+
 libssp_package() {
 	short_desc+=" - SSP (StackSmashingProtection) library"
 	pkg_install() {
@@ -692,8 +701,9 @@ libssp_package() {
 		vlicense ${wrksrc}/COPYING.RUNTIME RUNTIME.LIBRARY.EXCEPTION
 	}
 }
+
 libstdc++-devel_package() {
-	depends="libstdc++>=${_majorver}"
+	depends="libstdc++>=${_minorver}"
 	short_desc+=" - Standard C++ Library - development files"
 	pkg_install() {
 		vmove "usr/lib/libstdc++.*a"
@@ -701,6 +711,7 @@ libstdc++-devel_package() {
 		vmove usr/include/c++
 	}
 }
+
 libstdc++_package() {
 	short_desc+=" - Standard C++ Library"
 	pkg_install() {
diff --git a/srcpkgs/libmpx b/srcpkgs/libmpx
deleted file mode 120000
index b08d5af5795..00000000000
--- a/srcpkgs/libmpx
+++ /dev/null
@@ -1 +0,0 @@
-gcc
\ No newline at end of file
diff --git a/srcpkgs/libmpx-devel b/srcpkgs/libmpx-devel
deleted file mode 120000
index b08d5af5795..00000000000
--- a/srcpkgs/libmpx-devel
+++ /dev/null
@@ -1 +0,0 @@
-gcc
\ No newline at end of file

From 62c257177f130d1144f4240cc9f28bd99fda92e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 14 May 2019 11:01:09 +0200
Subject: [PATCH 02/32] glibc: explicitly specify header location

[ci skip]
---
 srcpkgs/glibc/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template
index 90ec126ffab..c84d29888c8 100644
--- a/srcpkgs/glibc/template
+++ b/srcpkgs/glibc/template
@@ -107,6 +107,7 @@ do_configure() {
 		--without-selinux --without-cvs --without-gd \
 		--disable-lock-elision --enable-obsolete-nsl \
 		--enable-stack-protector=strong \
+		--with-headers=${XBPS_CROSS_BASE}/usr/include \
 		--disable-werror \
 		libc_cv_rootsbindir=/usr/bin \
 		libc_cv_rtlddir=${_libdir} libc_cv_slibdir=${_libdir}

From ebeabecfb6e9927b388f55b5d34d8888da2e1111 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 14 May 2019 11:02:01 +0200
Subject: [PATCH 03/32] libmpc: use ${GNU_SITE}

[ci skip]
---
 srcpkgs/libmpc/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libmpc/template b/srcpkgs/libmpc/template
index c427e036468..c7fa7200b10 100644
--- a/srcpkgs/libmpc/template
+++ b/srcpkgs/libmpc/template
@@ -1,4 +1,4 @@
-# Template build file for 'libmpc'
+# Template file for 'libmpc'
 pkgname=libmpc
 version=1.1.0
 revision=2
@@ -9,9 +9,9 @@ configure_args="EGREP=egrep"
 makedepends="gmp-devel mpfr-devel"
 short_desc="C library for the arithmetic of complex numbers"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
+license="LGPL-3.0-or-later"
 homepage="http://www.multiprecision.org"
-license="LGPL-3"
-distfiles="https://ftp.gnu.org/gnu/mpc/mpc-${version}.tar.gz"
+distfiles="${GNU_SITE}/mpc/mpc-${version}.tar.gz"
 checksum=6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e
 
 if [ -z "$CHROOT_READY" ]; then

From 49b1c162ccf371491b1d116c085e337b83d60ca5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 14 May 2019 11:05:10 +0200
Subject: [PATCH 04/32] chroot-distcc: fix build with gcc-9.1.0 bootstrap

[ci skip]
---
 srcpkgs/chroot-distcc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chroot-distcc/template b/srcpkgs/chroot-distcc/template
index ab64e5c44fe..662946af82f 100644
--- a/srcpkgs/chroot-distcc/template
+++ b/srcpkgs/chroot-distcc/template
@@ -6,7 +6,7 @@ wrksrc=distcc
 bootstrap=yes
 build_style=gnu-configure
 configure_args="--with-included-popt --without-avahi --without-gnome
- --without-gtk --disable-Werror --disable-pump-mode"
+ --without-gtk --disable-Werror --disable-pump-mode --without-libiberty"
 make_install_target=install-programs
 makedepends="binutils-devel"
 short_desc="Distributed compilation for faster C/C++ builds -- for xbps-src use"

From 3411e3ecfcfcaaffb074e6bb6e29079f92f58520 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 14 May 2019 22:34:00 +0200
Subject: [PATCH 05/32] pkg-config: fix bootstrap build w/ gcc-9.1.0

[ci skip]
---
 srcpkgs/pkg-config/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/pkg-config/template b/srcpkgs/pkg-config/template
index b8587ed9f51..68a910e6d1e 100644
--- a/srcpkgs/pkg-config/template
+++ b/srcpkgs/pkg-config/template
@@ -21,6 +21,7 @@ alternatives="
 case "$XBPS_TARGET_MACHINE" in
 	mips*|ppc|ppc-musl) configure_args+=" glib_cv_stack_grows=no glib_cv_uscore=no" ;;
 esac
+CFLAGS="-Wno-missing-include-dirs"
 
 post_install() {
 	# Add pkg-config suffix to files that are on alternatives

From 7b5e49abfd4156a53fbb934e0884a13059617954 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 14 May 2019 20:46:19 +0200
Subject: [PATCH 06/32] musl: add -fpie to build getent, getconf, and iconv

[ci skip]
---
 srcpkgs/musl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index 2a101f922da..4a312725d60 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -18,9 +18,9 @@ nostrip_files="libc.so"
 shlib_provides="libc.so"
 
 post_build() {
-	$CC $CFLAGS $LDFLAGS ${FILESDIR}/getent.c -o getent
-	$CC $CFLAGS $LDFLAGS ${FILESDIR}/getconf.c -o getconf
-	$CC $CFLAGS $LDFLAGS ${FILESDIR}/iconv.c -o iconv
+	$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getent.c -o getent
+	$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/getconf.c -o getconf
+	$CC $CFLAGS $LDFLAGS -fpie ${FILESDIR}/iconv.c -o iconv
 }
 do_install() {
 	# Move everything to /usr.

From 7167db17e6bf37a7270c1acfb19e67ffa3610daf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 14 May 2019 16:51:00 +0200
Subject: [PATCH 07/32] cross-vpkg-dummy: update for gcc-9.1.0

[ci skip]
---
 srcpkgs/cross-vpkg-dummy/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-vpkg-dummy/template b/srcpkgs/cross-vpkg-dummy/template
index 69a111628ad..36eb905d71c 100644
--- a/srcpkgs/cross-vpkg-dummy/template
+++ b/srcpkgs/cross-vpkg-dummy/template
@@ -1,6 +1,6 @@
 # Template file for 'cross-vpkg-dummy'
 pkgname=cross-vpkg-dummy
-version=0.30
+version=0.31
 revision=1
 build_style=meta
 short_desc="Dummy meta-pkg for cross building packages with xbps-src"
@@ -42,8 +42,8 @@ conflicts="
 	gcc-ada>=0"
 shlib_provides="
 	libgcc_s.so.1
-	libgnat-8.so
-	libgnarl-8.so
+	libgnat-9.so
+	libgnarl-9.so
 	libgomp.so.1
 	libstdc++.so.6
 	libgfortran.so.5"

From 11a119cb4eb55558071fd60e61cc489d00442869 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 14 May 2019 16:48:46 +0200
Subject: [PATCH 08/32] gcc-multilib: update to 9.1.0

[ci skip]
---
 srcpkgs/gcc-multilib/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gcc-multilib/template b/srcpkgs/gcc-multilib/template
index 4233faeca7c..b6986121cd4 100644
--- a/srcpkgs/gcc-multilib/template
+++ b/srcpkgs/gcc-multilib/template
@@ -1,7 +1,7 @@
 # Template build file for 'gcc-multilib'
 archs="x86_64"
 _triplet="x86_64-unknown-linux-gnu"
-_majorver=8.3
+_majorver=9.1
 
 pkgname=gcc-multilib
 version=${_majorver}.0
@@ -12,7 +12,7 @@ maintainer="Juan RP <xtraeme@voidlinux.org>"
 homepage="http://gcc.gnu.org"
 license="GFDL-1.2, GPL-3, LGPL-2.1"
 distfiles="${GNU_SITE}/gcc/gcc-${version}/gcc-${version}.tar.xz"
-checksum=64baadfe6cc0f4947a84cb12d7f0dfaf45bb58b7e92461639596c21e02d97d2c
+checksum=79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
 
 hostmakedepends="perl flex zip unzip"
 makedepends="zlib-devel libmpc-devel isl15-devel libfl-devel
@@ -24,7 +24,6 @@ depends="
  libssp-devel-32bit>=${_majorver}
  libgomp-devel-32bit>=${_majorver}
  libitm-devel-32bit>=${_majorver}
- libmpx-devel-32bit>=${_majorver}
  libsanitizer-devel-32bit>=${_majorver}
  libatomic-devel-32bit>=${_majorver}
  libvtv-devel-32bit>=${_majorver}

From ea59b840bc1b05f297ca98ceb96d9cc2172cecf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 14 May 2019 17:19:19 +0200
Subject: [PATCH 09/32] cross-aarch64-linux-gnu: update for gcc-9.1.0

[ci skip]
---
 srcpkgs/cross-aarch64-linux-gnu/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template
index 370d1e17dfe..04b757d2497 100644
--- a/srcpkgs/cross-aarch64-linux-gnu/template
+++ b/srcpkgs/cross-aarch64-linux-gnu/template
@@ -1,7 +1,7 @@
 # Template build file for 'cross-aarch64-linux-gnu'
 #
 _binutils_version=2.32
-_gcc_version=8.3.0
+_gcc_version=9.1.0
 _glibc_version=2.29
 _linux_version=4.19
 
@@ -10,8 +10,8 @@ _archflags="-march=armv8-a"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.30
-revision=2
+version=0.31
+revision=1
 short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 homepage="https://www.voidlinux.org/"
@@ -22,7 +22,7 @@ distfiles="
  ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 64baadfe6cc0f4947a84cb12d7f0dfaf45bb58b7e92461639596c21e02d97d2c
+ 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
  f3eeb8d57e25ca9fc13c2af3dae97754f9f643bc69229546828e3a240e2af04b
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
 
@@ -30,7 +30,7 @@ lib32disabled=yes
 nocross=yes
 nopie=yes
 create_wrksrc=yes
-hostmakedepends="flex gcc-ada libada-devel perl python3"
+hostmakedepends="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

From efe25de93d93498535b2494419927c8a8b45d10b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 14 May 2019 18:37:02 +0200
Subject: [PATCH 10/32] cross-aarch64-linux-musl: update for gcc-9.1.0

[ci skip]
---
 srcpkgs/cross-aarch64-linux-musl/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index d5e56ceb190..8bcb80a7da9 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -1,7 +1,7 @@
 # Template build file for 'cross-aarch64-linux-musl'
 #
 _binutils_version=2.32
-_gcc_version=8.3.0
+_gcc_version=9.1.0
 _musl_version=1.1.22
 _linux_version=4.19
 
@@ -10,8 +10,8 @@ _archflags="-march=armv8-a"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.30
-revision=2
+version=0.31
+revision=1
 short_desc="Cross toolchain for ARM64 LE target (musl)"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
 homepage="https://www.voidlinux.org/"
@@ -22,7 +22,7 @@ distfiles="
  http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 64baadfe6cc0f4947a84cb12d7f0dfaf45bb58b7e92461639596c21e02d97d2c
+ 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
  8b0941a48d2f980fd7036cfbd24aa1d414f03d9a0652ecbd5ec5c7ff1bee29e3
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
 
@@ -33,7 +33,7 @@ nodebug=yes
 create_wrksrc=yes
 
 archs="x86_64* ppc64le"
-hostmakedepends="perl flex gcc-ada libada-devel"
+hostmakedepends="flex perl python3"
 makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a"

From e4b196985beb4bd793c9ce0d8a0e721a5860889f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 14 May 2019 17:29:06 +0200
Subject: [PATCH 11/32] cross-arm-linux-gnueabi: update for gcc-9.1.0

[ci skip]
---
 srcpkgs/cross-arm-linux-gnueabi/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template
index c8b55b62693..e7efc8aa89d 100644
--- a/srcpkgs/cross-arm-linux-gnueabi/template
+++ b/srcpkgs/cross-arm-linux-gnueabi/template
@@ -1,7 +1,7 @@
 # Template build file for 'cross-arm-linux-gnueabi'
 #
 _binutils_version=2.32
-_gcc_version=8.3.0
+_gcc_version=9.1.0
 _glibc_version=2.29
 _linux_version=4.19
 
@@ -11,8 +11,8 @@ _archflags="-march=armv5te -msoft-float -mfloat-abi=soft"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.30
-revision=2
+version=0.31
+revision=1
 short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
 homepage="https://www.voidlinux.org/"
@@ -23,7 +23,7 @@ distfiles="
  ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 64baadfe6cc0f4947a84cb12d7f0dfaf45bb58b7e92461639596c21e02d97d2c
+ 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
  f3eeb8d57e25ca9fc13c2af3dae97754f9f643bc69229546828e3a240e2af04b
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
 
@@ -33,7 +33,7 @@ nopie=yes
 nodebug=yes
 create_wrksrc=yes
 
-hostmakedepends="flex gcc-ada libada-devel perl python3"
+hostmakedepends="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

From 7a4c3aab5186a4fb04c7687c16350fd1104697e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 14 May 2019 18:57:32 +0200
Subject: [PATCH 12/32] cross-arm-linux-musleabi: update for gcc-9.1.0

[ci skip]
---
 srcpkgs/cross-arm-linux-musleabi/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index 506e5b639c1..df7b8eaa1f3 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -1,7 +1,7 @@
 # Template build file for 'cross-arm-linux-musleabi'
 #
 _binutils_version=2.32
-_gcc_version=8.3.0
+_gcc_version=9.1.0
 _musl_version=1.1.22
 _linux_version=4.19
 
@@ -11,8 +11,8 @@ _archflags="-march=armv5te -msoft-float -mfloat-abi=soft"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.30
-revision=2
+version=0.31
+revision=1
 short_desc="Cross toolchain for ARMv5 TE target (musl)"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
 homepage="https://www.voidlinux.org/"
@@ -23,7 +23,7 @@ distfiles="
  http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 64baadfe6cc0f4947a84cb12d7f0dfaf45bb58b7e92461639596c21e02d97d2c
+ 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
  8b0941a48d2f980fd7036cfbd24aa1d414f03d9a0652ecbd5ec5c7ff1bee29e3
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
 
@@ -33,7 +33,7 @@ nopie=yes
 nodebug=yes
 create_wrksrc=yes
 
-hostmakedepends="perl flex gcc-ada libada-devel"
+hostmakedepends="flex perl python3"
 makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a"

From 764513047a6e691291800bf727de6b62960f6908 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 14 May 2019 17:29:14 +0200
Subject: [PATCH 13/32] cross-arm-linux-gnueabihf: update for gcc-9.1.0

[ci skip]
---
 srcpkgs/cross-arm-linux-gnueabihf/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template
index c235071734d..e668afbd6d2 100644
--- a/srcpkgs/cross-arm-linux-gnueabihf/template
+++ b/srcpkgs/cross-arm-linux-gnueabihf/template
@@ -1,7 +1,7 @@
 # Template build file for 'cross-arm-linux-gnueabihf'
 #
 _binutils_version=2.32
-_gcc_version=8.3.0
+_gcc_version=9.1.0
 _glibc_version=2.29
 _linux_version=4.19
 
@@ -11,8 +11,8 @@ _archflags="-march=armv6 -mfpu=vfp -mfloat-abi=hard"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.30
-revision=2
+version=0.31
+revision=1
 short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
 homepage="https://www.voidlinux.org/"
@@ -23,7 +23,7 @@ distfiles="
  ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 64baadfe6cc0f4947a84cb12d7f0dfaf45bb58b7e92461639596c21e02d97d2c
+ 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
  f3eeb8d57e25ca9fc13c2af3dae97754f9f643bc69229546828e3a240e2af04b
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
 
@@ -33,7 +33,7 @@ nopie=yes
 nodebug=yes
 create_wrksrc=yes
 
-hostmakedepends="flex gcc-ada libada-devel perl python3"
+hostmakedepends="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

From 78f10ec5ef1344a93e0e5bcef0f1e36d40e75a6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 14 May 2019 18:57:39 +0200
Subject: [PATCH 14/32] cross-arm-linux-musleabihf: update for gcc-9.1.0

[ci skip]
---
 srcpkgs/cross-arm-linux-musleabihf/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index fddddae625c..4cbe27f0fe1 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -1,7 +1,7 @@
 # Template build file for 'cross-arm-linux-musleabihf'
 #
 _binutils_version=2.32
-_gcc_version=8.3.0
+_gcc_version=9.1.0
 _musl_version=1.1.22
 _linux_version=4.19
 
@@ -11,8 +11,8 @@ _archflags="-march=armv6 -mfpu=vfp -mfloat-abi=hard"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.30
-revision=2
+version=0.31
+revision=1
 short_desc="Cross toolchain for ARMv6 LE Hard Float target (musl)"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
 homepage="https://www.voidlinux.org/"
@@ -23,7 +23,7 @@ distfiles="
  http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 64baadfe6cc0f4947a84cb12d7f0dfaf45bb58b7e92461639596c21e02d97d2c
+ 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
  8b0941a48d2f980fd7036cfbd24aa1d414f03d9a0652ecbd5ec5c7ff1bee29e3
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
 
@@ -33,7 +33,7 @@ nopie=yes
 nodebug=yes
 create_wrksrc=yes
 
-hostmakedepends="perl flex gcc-ada libada-devel"
+hostmakedepends="flex perl python3"
 makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a"

From 0ce1fd1f673047ee45496eca7ad8e27b275c09c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 16 May 2019 14:17:30 +0200
Subject: [PATCH 15/32] cross-arm-none-eabi-gcc: update for gcc-9.1.0

[ci skip]
---
 srcpkgs/cross-arm-none-eabi-gcc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cross-arm-none-eabi-gcc/template b/srcpkgs/cross-arm-none-eabi-gcc/template
index 7c26e9fdd66..0e636b75773 100644
--- a/srcpkgs/cross-arm-none-eabi-gcc/template
+++ b/srcpkgs/cross-arm-none-eabi-gcc/template
@@ -2,7 +2,7 @@
 _triplet=arm-none-eabi
 _pkgname=gcc
 pkgname=cross-${_triplet}-${_pkgname}
-version=8.3.0
+version=9.1.0
 revision=1
 wrksrc="${_pkgname}-${version}"
 build_style=gnu-configure
@@ -58,7 +58,7 @@ maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
 license="GFDL-1.2-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://gcc.gnu.org"
 distfiles="${GNU_SITE}/${_pkgname}/${_pkgname}-${version}/${_pkgname}-${version}.tar.xz"
-checksum=64baadfe6cc0f4947a84cb12d7f0dfaf45bb58b7e92461639596c21e02d97d2c
+checksum=79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
 alternatives="arm-none-eabi:/usr/bin/arm-none-eabi-cc:/usr/bin/arm-none-eabi-gcc"
 nocross=yes
 nopie=yes

From 16bc17f17eedc34ecdfda3bd2b9c325b6be39b66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 14 May 2019 17:29:30 +0200
Subject: [PATCH 16/32] cross-armv7l-linux-gnueabihf: update for gcc-9.1.0

[ci skip]
---
 srcpkgs/cross-armv7l-linux-gnueabihf/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-armv7l-linux-gnueabihf/template
index 7de622dcadc..896c53b95a4 100644
--- a/srcpkgs/cross-armv7l-linux-gnueabihf/template
+++ b/srcpkgs/cross-armv7l-linux-gnueabihf/template
@@ -1,7 +1,7 @@
 # Template build file for 'cross-armv7l-linux-gnueabihf'
 #
 _binutils_version=2.32
-_gcc_version=8.3.0
+_gcc_version=9.1.0
 _glibc_version=2.29
 _linux_version=4.19
 
@@ -11,8 +11,8 @@ _archflags="-march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.30
-revision=5
+version=0.31
+revision=1
 short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
 homepage="https://www.voidlinux.org/"
@@ -23,7 +23,7 @@ distfiles="
  http://ftp.gnu.org/gnu/glibc/glibc-${_glibc_version}.tar.xz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 64baadfe6cc0f4947a84cb12d7f0dfaf45bb58b7e92461639596c21e02d97d2c
+ 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
  f3eeb8d57e25ca9fc13c2af3dae97754f9f643bc69229546828e3a240e2af04b
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
 
@@ -33,7 +33,7 @@ nopie=yes
 nodebug=yes
 create_wrksrc=yes
 
-hostmakedepends="flex gcc-ada libada-devel perl python3"
+hostmakedepends="flex 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

From 97077bf29b712535ac4c2afe509e78f5be96d6b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 14 May 2019 18:59:14 +0200
Subject: [PATCH 17/32] cross-armv7l-linux-musleabihf: update for gcc-9.1.0

[ci skip]
---
 srcpkgs/cross-armv7l-linux-musleabihf/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index 52bde98ccfd..a9156b798a7 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -1,7 +1,7 @@
 # Template build file for 'cross-armv7l-linux-musleabihf'
 #
 _binutils_version=2.32
-_gcc_version=8.3.0
+_gcc_version=9.1.0
 _musl_version=1.1.22
 _linux_version=4.19
 
@@ -11,8 +11,8 @@ _archflags="-march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.30
-revision=2
+version=0.31
+revision=1
 short_desc="Cross toolchain for ARMv7 LE Hard Float target (musl)"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
 homepage="https://www.voidlinux.org/"
@@ -23,7 +23,7 @@ distfiles="
  http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 64baadfe6cc0f4947a84cb12d7f0dfaf45bb58b7e92461639596c21e02d97d2c
+ 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
  8b0941a48d2f980fd7036cfbd24aa1d414f03d9a0652ecbd5ec5c7ff1bee29e3
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
 
@@ -33,7 +33,7 @@ nopie=yes
 nodebug=yes
 create_wrksrc=yes
 
-hostmakedepends="perl flex gcc-ada libada-devel"
+hostmakedepends="flex perl python3"
 makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a"

From ceb77fac7bdc6ffa65ba8d67150a8788f36fbe0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 14 May 2019 16:20:45 +0200
Subject: [PATCH 18/32] cross-i686-pc-linux-gnu: update for gcc-9.1.0

[ci skip]
---
 srcpkgs/cross-i686-pc-linux-gnu/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template
index fa6d027ce26..805cedc52f4 100644
--- a/srcpkgs/cross-i686-pc-linux-gnu/template
+++ b/srcpkgs/cross-i686-pc-linux-gnu/template
@@ -1,7 +1,7 @@
 # Template build file for 'cross-i686-pc-linux-gnu'
 #
 _binutils_version=2.32
-_gcc_version=8.3.0
+_gcc_version=9.1.0
 _glibc_version=2.29
 _linux_version=4.19
 
@@ -10,8 +10,8 @@ _archflags="-march=i686 -mtune=generic"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.30
-revision=2
+version=0.31
+revision=1
 short_desc="GNU Cross toolchain for the ${_triplet} target (binutils/gcc/glibc)"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
 homepage="https://www.voidlinux.org/"
@@ -22,7 +22,7 @@ distfiles="
  ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 64baadfe6cc0f4947a84cb12d7f0dfaf45bb58b7e92461639596c21e02d97d2c
+ 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
  f3eeb8d57e25ca9fc13c2af3dae97754f9f643bc69229546828e3a240e2af04b
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
 
@@ -32,7 +32,7 @@ nopie=yes
 nodebug=yes
 lib32disabled=yes
 create_wrksrc=yes
-hostmakedepends="flex gcc-ada libada-devel perl python3"
+hostmakedepends="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

From e49584d9cb9d6936c91dca8a155c26168c8bc27a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 14 May 2019 18:57:59 +0200
Subject: [PATCH 19/32] cross-i686-linux-musl: update for gcc-9.1.0

[ci skip]
---
 srcpkgs/cross-i686-linux-musl/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index c9767293b4f..716b0685de4 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -1,7 +1,7 @@
 # Template build file for 'cross-i686-linux-musl'
 #
 _binutils_version=2.32
-_gcc_version=8.3.0
+_gcc_version=9.1.0
 _musl_version=1.1.22
 _linux_version=4.19
 
@@ -10,8 +10,8 @@ _sysroot="/usr/${_triplet}"
 _archflags="-march=i686"
 
 pkgname=cross-${_triplet}
-version=0.30
-revision=2
+version=0.31
+revision=1
 short_desc="Cross toolchain for i686 target (musl)"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
 homepage="https://www.voidlinux.org/"
@@ -22,7 +22,7 @@ distfiles="
  http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 64baadfe6cc0f4947a84cb12d7f0dfaf45bb58b7e92461639596c21e02d97d2c
+ 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
  8b0941a48d2f980fd7036cfbd24aa1d414f03d9a0652ecbd5ec5c7ff1bee29e3
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
 
@@ -31,7 +31,7 @@ nocross=yes
 nopie=yes
 nodebug=yes
 create_wrksrc=yes
-hostmakedepends="perl flex gcc-ada libada-devel"
+hostmakedepends="flex perl python3"
 makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a"

From 3fb058ae0a73ccb93153ee8ceb9b6dfe7656bf02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 14 May 2019 17:29:56 +0200
Subject: [PATCH 20/32] cross-powerpc-linux-gnu: update for gcc-9.1.0

[ci skip]
---
 srcpkgs/cross-powerpc-linux-gnu/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-powerpc-linux-gnu/template b/srcpkgs/cross-powerpc-linux-gnu/template
index 9423ecb79d6..344d60b001a 100644
--- a/srcpkgs/cross-powerpc-linux-gnu/template
+++ b/srcpkgs/cross-powerpc-linux-gnu/template
@@ -1,7 +1,7 @@
 # Template build file for 'cross-powerpc-linux-gnu'
 #
 _binutils_version=2.32
-_gcc_version=8.3.0
+_gcc_version=9.1.0
 _glibc_version=2.29
 _linux_version=4.19
 
@@ -22,7 +22,7 @@ distfiles="
  ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 64baadfe6cc0f4947a84cb12d7f0dfaf45bb58b7e92461639596c21e02d97d2c
+ 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
  f3eeb8d57e25ca9fc13c2af3dae97754f9f643bc69229546828e3a240e2af04b
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
 
@@ -30,7 +30,7 @@ lib32disabled=yes
 nocross=yes
 nopie=yes
 create_wrksrc=yes
-hostmakedepends="flex gcc-ada libada-devel perl python3"
+hostmakedepends="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

From 2e2a21ea33a0a72d300c9af78c4b7a6d29cd0280 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 23 May 2019 20:55:34 +0200
Subject: [PATCH 21/32] cross-powerpc-linux-musl: update for gcc-9.1.0

[ci skip]
---
 srcpkgs/cross-powerpc-linux-musl/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index cf76b6acd37..f6eb797cbb6 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -1,7 +1,7 @@
 # Template build file for 'cross-powerpc-linux-musl'
 #
 _binutils_version=2.32
-_gcc_version=8.3.0
+_gcc_version=9.1.0
 _musl_version=1.1.22
 _linux_version=4.19
 
@@ -25,7 +25,7 @@ distfiles="
  http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz"
 checksum="
  0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 64baadfe6cc0f4947a84cb12d7f0dfaf45bb58b7e92461639596c21e02d97d2c
+ 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1
  8b0941a48d2f980fd7036cfbd24aa1d414f03d9a0652ecbd5ec5c7ff1bee29e3"
 
@@ -36,7 +36,7 @@ nodebug=yes
 create_wrksrc=yes
 
 archs="x86_64* ppc64*"
-hostmakedepends="perl flex gcc-ada libada-devel"
+hostmakedepends="flex perl python3"
 makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a"

From f60f914cdf7125774498b1e3bb5d122cb1a5144f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 14 May 2019 17:30:05 +0200
Subject: [PATCH 22/32] cross-powerpc64-linux-gnu: update for gcc-9.1.0

[ci skip]
---
 srcpkgs/cross-powerpc64-linux-gnu/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/cross-powerpc64-linux-gnu/template b/srcpkgs/cross-powerpc64-linux-gnu/template
index 3f531d96b26..496a998ec9c 100644
--- a/srcpkgs/cross-powerpc64-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64-linux-gnu/template
@@ -1,6 +1,6 @@
 # Template file for 'cross-powerpc64le-linux-gnu'
 _binutils_version=2.32
-_gcc_version=8.3.0
+_gcc_version=9.1.0
 _glibc_version=2.29
 _linux_version=4.19
 
@@ -8,8 +8,8 @@ _triplet="powerpc64-linux-gnu"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.30
-revision=2
+version=0.31
+revision=1
 short_desc="GNU cross toolchain for the ${_triplet} targets (binutils/gcc/glibc)"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 homepage="https://www.voidlinux.org/"
@@ -20,7 +20,7 @@ distfiles="
  ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 64baadfe6cc0f4947a84cb12d7f0dfaf45bb58b7e92461639596c21e02d97d2c
+ 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
  f3eeb8d57e25ca9fc13c2af3dae97754f9f643bc69229546828e3a240e2af04b
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
 
@@ -29,7 +29,7 @@ nocross=yes
 nopie=yes
 nodebug=yes
 create_wrksrc=yes
-hostmakedepends="flex gcc-ada libada-devel perl python3"
+hostmakedepends="flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a"

From f0aa828afa8b99c1299397863885905080ccdee0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 14 May 2019 18:59:42 +0200
Subject: [PATCH 23/32] cross-powerpc64-linux-musl: update for gcc-9.1.0

[ci skip]
---
 srcpkgs/cross-powerpc64-linux-musl/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index 71b9c0d1499..e58e3d911e7 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -1,6 +1,6 @@
 # Template file for 'cross-powerpc64-linux-musl'
 _binutils_version=2.32
-_gcc_version=8.3.0
+_gcc_version=9.1.0
 _musl_version=1.1.22
 _linux_version=4.19
 
@@ -20,7 +20,7 @@ distfiles="
  http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 64baadfe6cc0f4947a84cb12d7f0dfaf45bb58b7e92461639596c21e02d97d2c
+ 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
  8b0941a48d2f980fd7036cfbd24aa1d414f03d9a0652ecbd5ec5c7ff1bee29e3
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
 
@@ -29,7 +29,7 @@ nocross=yes
 nopie=yes
 nodebug=yes
 create_wrksrc=yes
-hostmakedepends="perl flex gcc-ada libada-devel"
+hostmakedepends="flex perl python3"
 makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a"
@@ -81,10 +81,10 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
 	_apply_patch -p0 ${FILESDIR}/0010-ldbl128-config.patch
 	_apply_patch -p0 ${FILESDIR}/ppc64-pure64.patch
 	_apply_patch -p0 ${FILESDIR}/libgcc-musl-ldbl128-config.patch
+	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
 	_apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch
 
 	sed -i 's/lib64/lib/' gcc/config/rs6000/linux64.h

From 8ea234319944ec62bd83d0deff9bff31498b905a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 14 May 2019 17:30:18 +0200
Subject: [PATCH 24/32] cross-powerpc64le-linux-gnu: update for gcc-9.1.0

[ci skip]
---
 srcpkgs/cross-powerpc64le-linux-gnu/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/template b/srcpkgs/cross-powerpc64le-linux-gnu/template
index bf4520116d4..753b2f8a5b7 100644
--- a/srcpkgs/cross-powerpc64le-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64le-linux-gnu/template
@@ -1,6 +1,6 @@
 # Template file for 'cross-powerpc64le-linux-gnu'
 _binutils_version=2.32
-_gcc_version=8.3.0
+_gcc_version=9.1.0
 _glibc_version=2.29
 _linux_version=4.19
 
@@ -8,8 +8,8 @@ _triplet="powerpc64le-linux-gnu"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.30
-revision=3
+version=0.31
+revision=1
 short_desc="GNU cross toolchain for the ${_triplet} targets (binutils/gcc/glibc)"
 maintainer="q66 <daniel@octaforge.org>"
 homepage="https://www.voidlinux.org/"
@@ -20,7 +20,7 @@ distfiles="
  ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 64baadfe6cc0f4947a84cb12d7f0dfaf45bb58b7e92461639596c21e02d97d2c
+ 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
  f3eeb8d57e25ca9fc13c2af3dae97754f9f643bc69229546828e3a240e2af04b
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
 
@@ -29,7 +29,7 @@ nocross=yes
 nopie=yes
 nodebug=yes
 create_wrksrc=yes
-hostmakedepends="flex gcc-ada libada-devel perl python3"
+hostmakedepends="flex perl python3"
 makedepends="isl15-devel libmpc-devel zlib-devel"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a"

From 97ad50e36a909c16c376306a73c9c2bdc543f80a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 14 May 2019 18:59:56 +0200
Subject: [PATCH 25/32] cross-powerpc64le-linux-musl: update for gcc-9.1.0

[ci skip]
---
 srcpkgs/cross-powerpc64le-linux-musl/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index 8bb44d51b1f..c78c91da303 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -1,6 +1,6 @@
 # Template file for 'cross-powerpc64le-linux-musl'
 _binutils_version=2.32
-_gcc_version=8.3.0
+_gcc_version=9.1.0
 _musl_version=1.1.22
 _linux_version=4.19
 
@@ -20,7 +20,7 @@ distfiles="
  http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 64baadfe6cc0f4947a84cb12d7f0dfaf45bb58b7e92461639596c21e02d97d2c
+ 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
  8b0941a48d2f980fd7036cfbd24aa1d414f03d9a0652ecbd5ec5c7ff1bee29e3
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
 
@@ -29,7 +29,7 @@ nocross=yes
 nopie=yes
 nodebug=yes
 create_wrksrc=yes
-hostmakedepends="perl flex gcc-ada libada-devel"
+hostmakedepends="flex perl python3"
 makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a"
@@ -81,10 +81,10 @@ _gcc_bootstrap() {
 
 	cd ${wrksrc}/gcc-${_gcc_version}
 	_apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch
-	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
 	_apply_patch -p0 ${FILESDIR}/0010-ldbl128-config.patch
 	_apply_patch -p0 ${FILESDIR}/ppc64-pure64.patch
 	_apply_patch -p0 ${FILESDIR}/libgcc-musl-ldbl128-config.patch
+	_apply_patch -p0 ${FILESDIR}/musl-ada.patch
 	_apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch
 
 	sed -i 's/lib64/lib/' gcc/config/rs6000/linux64.h

From c9384e809a0f870a5a45570e38cbed6ff5b384ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 14 May 2019 17:30:55 +0200
Subject: [PATCH 26/32] cross-x86_64-w64-mingw32: update for gcc-9.1.0

[ci skip]
---
 srcpkgs/cross-x86_64-w64-mingw32/template | 24 +++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/cross-x86_64-w64-mingw32/template b/srcpkgs/cross-x86_64-w64-mingw32/template
index 3493bfe54da..64fdd2687b3 100644
--- a/srcpkgs/cross-x86_64-w64-mingw32/template
+++ b/srcpkgs/cross-x86_64-w64-mingw32/template
@@ -1,18 +1,18 @@
 # Template file for 'cross-x86_64-w64-mingw32'
-_gcc_version="8.3.0"
-_binutils_version="2.32"
-_gmp_version="6.1.2"
-_mpfr_version="4.0.1"
-_mpc_version="1.1.0"
-_isl_version="0.19"
-_mingw_version="6.0.0"
+_gcc_version=9.1.0
+_binutils_version=2.32
+_gmp_version=6.1.2
+_mpfr_version=4.0.1
+_mpc_version=1.1.0
+_isl_version=0.19
+_mingw_version=6.0.0
 
 pkgname=cross-x86_64-w64-mingw32
-version="$_mingw_version"
-revision=1
-archs="x86_64* i686*"
+version=$_mingw_version
+revision=2
+archs="x86_64 i686"
 create_wrksrc=yes
-hostmakedepends="perl flex"
+hostmakedepends="flex perl python3"
 makedepends="zlib-devel"
 # it's ok to build with current's -devel packages
 # although it might break the package during compiler updates
@@ -31,7 +31,7 @@ distfiles="
  http://isl.gforge.inria.fr/isl-${_isl_version}.tar.bz2
  ${SOURCEFORGE_SITE}/project/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${_mingw_version}.tar.bz2"
 checksum="de38b15c902eb2725eac6af21183a5f34ea4634cb0bcef19612b50e5ed31072d
- 64baadfe6cc0f4947a84cb12d7f0dfaf45bb58b7e92461639596c21e02d97d2c
+ 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
  6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e
  87b565e89a9a684fe4ebeeddb8399dce2599f9c9049854ca8c0dfbdea0e21912
  67874a60826303ee2fb6affc6dc0ddd3e749e9bfcb4c8655e3953d0458a6e16e

From 1cc02c62dd37345f43cceb43ea002083f01af5a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 14 May 2019 18:58:15 +0200
Subject: [PATCH 27/32] cross-mips-linux-musl: update for gcc-9.1.0

[ci skip]
---
 srcpkgs/cross-mips-linux-musl/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index 8d2c0f85c3f..aa4e4792c07 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -1,7 +1,7 @@
 # Template build file for 'cross-mips-linux-musl'
 #
 _binutils_version=2.32
-_gcc_version=8.3.0
+_gcc_version=9.1.0
 _musl_version=1.1.22
 _linux_version=4.19
 
@@ -11,8 +11,8 @@ _archflags="-march=mips32r2 -msoft-float"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.30
-revision=2
+version=0.31
+revision=1
 short_desc="Cross toolchain for MIPS32r2 BE softfloat target (musl)"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
 homepage="https://www.voidlinux.org/"
@@ -23,7 +23,7 @@ distfiles="
  http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 64baadfe6cc0f4947a84cb12d7f0dfaf45bb58b7e92461639596c21e02d97d2c
+ 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
  8b0941a48d2f980fd7036cfbd24aa1d414f03d9a0652ecbd5ec5c7ff1bee29e3
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
 
@@ -33,7 +33,7 @@ nopie=yes
 nodebug=yes
 create_wrksrc=yes
 
-hostmakedepends="perl flex gcc-ada libada-devel"
+hostmakedepends="flex perl python3"
 makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a"

From c1f537d1d99c55a8de67b39f918ecf66fe58f15b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 14 May 2019 18:58:23 +0200
Subject: [PATCH 28/32] cross-mips-linux-muslhf: update for gcc-9.1.0

[ci skip]
---
 srcpkgs/cross-mips-linux-muslhf/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index 0afcc4ed6a1..6307b0128a6 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -1,7 +1,7 @@
 # Template build file for 'cross-mips-linux-muslhf'
 #
 _binutils_version=2.32
-_gcc_version=8.3.0
+_gcc_version=9.1.0
 _musl_version=1.1.22
 _linux_version=4.19
 
@@ -11,8 +11,8 @@ _archflags="-march=mips32r2 -mhard-float"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.30
-revision=2
+version=0.31
+revision=1
 short_desc="Cross toolchain for MIPS32r2 BE hardfloat target (musl)"
 maintainer="hipperson0 <hipperson0@gmail.com>"
 homepage="https://www.voidlinux.org/"
@@ -23,7 +23,7 @@ distfiles="
  https://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 64baadfe6cc0f4947a84cb12d7f0dfaf45bb58b7e92461639596c21e02d97d2c
+ 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
  8b0941a48d2f980fd7036cfbd24aa1d414f03d9a0652ecbd5ec5c7ff1bee29e3
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
 
@@ -33,7 +33,7 @@ nopie=yes
 nodebug=yes
 create_wrksrc=yes
 
-hostmakedepends="perl flex gcc-ada libada-devel"
+hostmakedepends="flex perl python3"
 makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a"

From 6e9b92c9e376e0110e06f47da143ce75353c703b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 14 May 2019 18:58:36 +0200
Subject: [PATCH 29/32] cross-mipsel-linux-musl: update for gcc-9.1.0

[ci skip]
---
 srcpkgs/cross-mipsel-linux-musl/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index 79f158cf91b..18558434c3c 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -1,7 +1,7 @@
 # Template build file for 'cross-mipsel-linux-musl'
 #
 _binutils_version=2.32
-_gcc_version=8.3.0
+_gcc_version=9.1.0
 _musl_version=1.1.22
 _linux_version=4.19
 
@@ -11,8 +11,8 @@ _archflags="-march=mips32r2 -msoft-float"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.30
-revision=3
+version=0.31
+revision=1
 short_desc="Cross toolchain for MIPS32r2 LE softfloat target (musl)"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
 homepage="https://www.voidlinux.org/"
@@ -23,7 +23,7 @@ distfiles="
  http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 64baadfe6cc0f4947a84cb12d7f0dfaf45bb58b7e92461639596c21e02d97d2c
+ 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
  8b0941a48d2f980fd7036cfbd24aa1d414f03d9a0652ecbd5ec5c7ff1bee29e3
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
 
@@ -33,7 +33,7 @@ nopie=yes
 nodebug=yes
 create_wrksrc=yes
 
-hostmakedepends="perl flex gcc-ada libada-devel"
+hostmakedepends="flex perl python3"
 makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a"

From 05fdfad99418014618b15ade21c51a4432173aef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 14 May 2019 18:58:44 +0200
Subject: [PATCH 30/32] cross-mipsel-linux-muslhf: update for gcc-9.1.0

[ci skip]
---
 srcpkgs/cross-mipsel-linux-muslhf/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index 3475840c6aa..df8f536fef4 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -1,7 +1,7 @@
 # Template build file for 'cross-mipsel-linux-muslhf'
 #
 _binutils_version=2.32
-_gcc_version=8.3.0
+_gcc_version=9.1.0
 _musl_version=1.1.22
 _linux_version=4.19
 
@@ -11,8 +11,8 @@ _archflags="-march=mips32r2 -mhard-float"
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.30
-revision=2
+version=0.31
+revision=1
 short_desc="Cross toolchain for MIPS32r2 LE hardfloat target (musl)"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
 homepage="https://www.voidlinux.org/"
@@ -23,7 +23,7 @@ distfiles="
  http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 64baadfe6cc0f4947a84cb12d7f0dfaf45bb58b7e92461639596c21e02d97d2c
+ 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
  8b0941a48d2f980fd7036cfbd24aa1d414f03d9a0652ecbd5ec5c7ff1bee29e3
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
 
@@ -33,7 +33,7 @@ nopie=yes
 nodebug=yes
 create_wrksrc=yes
 
-hostmakedepends="perl flex gcc-ada libada-devel"
+hostmakedepends="flex perl python3"
 makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a"

From fa6f18d426919b78e0570055fe1c57ca7345297a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Tue, 14 May 2019 19:00:17 +0200
Subject: [PATCH 31/32] cross-x86_64-linux-musl: update for gcc-9.1.0

[ci skip]
---
 srcpkgs/cross-x86_64-linux-musl/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index 4489c5727b0..194175d2d3d 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -1,7 +1,7 @@
 # Template file for 'cross-x86_64-linux-musl'
 #
 _binutils_version=2.32
-_gcc_version=8.3.0
+_gcc_version=9.1.0
 _musl_version=1.1.22
 _linux_version=4.19
 
@@ -9,8 +9,8 @@ _triplet=x86_64-linux-musl
 _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
-version=0.30
-revision=2
+version=0.31
+revision=1
 archs="i686* x86_64 ppc64le"
 short_desc="Cross toolchain for x86_64 with musl"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
@@ -22,7 +22,7 @@ distfiles="
  http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz
  ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz"
 checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04
- 64baadfe6cc0f4947a84cb12d7f0dfaf45bb58b7e92461639596c21e02d97d2c
+ 79a66834e96a6050d8fe78db2c3b32fb285b230b855d0a66288235bc04b327a0
  8b0941a48d2f980fd7036cfbd24aa1d414f03d9a0652ecbd5ec5c7ff1bee29e3
  0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
 
@@ -31,7 +31,7 @@ nocross=yes
 nopie=yes
 nodebug=yes
 create_wrksrc=yes
-hostmakedepends="perl flex gcc-ada libada-devel"
+hostmakedepends="flex perl python3"
 makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel"
 nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a
  libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a"

From 6f5ae7e1afc995daaceeb3f32a71ccd77afd05b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Wed, 15 May 2019 15:21:05 +0200
Subject: [PATCH 32/32] base-chroot: per arch pkgs, disable for *-musl

[ci skip]
---
 srcpkgs/base-chroot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/base-chroot/template b/srcpkgs/base-chroot/template
index aaca5f41dec..2559bb70e1e 100644
--- a/srcpkgs/base-chroot/template
+++ b/srcpkgs/base-chroot/template
@@ -2,7 +2,7 @@
 pkgname=base-chroot
 version=0.65
 revision=6
-archs=noarch
+archs="~*-musl"
 bootstrap=yes
 build_style=meta
 homepage="http://www.voidlinux.org"