From 9dfbda254c20cb04dba5038cae4ce6c0d90739ca Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Fri, 20 May 2022 10:16:18 -0700
Subject: [PATCH] Switch to GCC 9 for the GCC tinderbox.

This also adds arm and riscv to the GCC tinderbox.

Reviewed by:	emaste (older version)
Differential Revision:	https://reviews.freebsd.org/D26202
---
 Makefile | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 8bd9e37dc016..5ed2bffb3e77 100644
--- a/Makefile
+++ b/Makefile
@@ -526,11 +526,14 @@ TARGET_ARCHES_${target}?= ${target}
 .endfor
 
 .if defined(USE_GCC_TOOLCHAINS)
-TOOLCHAINS_amd64=	amd64-gcc6
-TOOLCHAINS_arm64=	aarch64-gcc6
-TOOLCHAINS_i386=	i386-gcc6
-TOOLCHAINS_powerpc=	powerpc-gcc6 powerpc64-gcc6
-TOOLCHAIN_powerpc64=	powerpc64-gcc6
+TOOLCHAINS_amd64=	amd64-gcc9
+TOOLCHAINS_arm=		armv6-gcc9 armv7-gcc9
+TOOLCHAIN_armv7=	armv7-gcc9
+TOOLCHAINS_arm64=	aarch64-gcc9
+TOOLCHAINS_i386=	i386-gcc9
+TOOLCHAINS_powerpc=	powerpc-gcc9 powerpc64-gcc9
+TOOLCHAIN_powerpc64=	powerpc64-gcc9
+TOOLCHAINS_riscv=	riscv64-gcc9
 .endif
 
 # If a target is using an external toolchain, set MAKE_PARAMS to enable use