diff --git a/cross/gcc-aarch64/APKBUILD b/cross/gcc-aarch64/APKBUILD
index 191d1a557..7f3919d84 100644
--- a/cross/gcc-aarch64/APKBUILD
+++ b/cross/gcc-aarch64/APKBUILD
@@ -31,7 +31,7 @@ pkgver=11.2.1_git20211128
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-aarch64
-pkgrel=0
+pkgrel=1
 pkgdesc="Stage2 cross-compiler for aarch64"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -50,6 +50,7 @@ replaces="libstdc++ binutils"
 : "${LANG_GO:=true}"
 : "${LANG_FORTRAN:=true}"
 : "${LANG_ADA:=true}"
+: "${LANG_JIT:=true}"
 
 _libgomp=true
 _libgcc=true
@@ -69,6 +70,7 @@ if [ "$CHOST" != "$CTARGET" ]; then
 	LANG_GO=false
 	LANG_FORTRAN=false
 	LANG_D=false
+	LANG_JIT=false
 	_libgomp=false
 	_libatomic=false
 	_libitm=false
@@ -106,6 +108,7 @@ elif [ "$CBUILD" != "$CHOST" ]; then
 	LANG_GO=false
 	LANG_FORTRAN=false
 	LANG_D=false
+	LANG_JIT=false
 
 	STRIP_FOR_TARGET=${CROSS_COMPILE}strip
 	_builddir="$srcdir/build-cross-native"
@@ -184,6 +187,10 @@ if $LANG_ADA; then
 	[ "$CBUILD" = "$CTARGET" ] && makedepends_build="$makedepends_build gcc-gnat-bootstrap"
 	[ "$CBUILD" != "$CTARGET" ] && makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross"
 fi
+if $LANG_JIT; then
+	subpackages="$subpackages libgccjit:jit libgccjit-dev:jitdev"
+	_languages="$_languages,jit"
+fi
 makedepends="$makedepends_build $makedepends_host"
 
 # when using upstream releases, use this URI template
@@ -270,6 +277,7 @@ build() {
 	local _libc_configure=
 	local _bootstrap_configure=
 	local _symvers=
+	local _jit_configure=
 
 	cd "$_gccdir"
 
@@ -312,6 +320,8 @@ build() {
 	*)	_bootstrap_configure="--enable-shared --enable-threads --enable-tls" ;;
 	esac
 
+	$LANG_JIT && _jit_configure="--enable-host-shared"
+
 	$_libgomp	|| _bootstrap_configure="$_bootstrap_configure --disable-libgomp"
 	$_libatomic	|| _bootstrap_configure="$_bootstrap_configure --disable-libatomic"
 	$_libitm	|| _bootstrap_configure="$_bootstrap_configure --disable-libitm"
@@ -359,6 +369,7 @@ build() {
 		$_libc_configure \
 		$_cross_configure \
 		$_bootstrap_configure \
+		$_jit_configure \
 		--with-system-zlib \
 		$_hash_style_configure
 	make
@@ -506,6 +517,18 @@ gpp() {
 	mv "$pkgdir"/usr/bin/*++ "$subpkgdir"/usr/bin/
 }
 
+jit() {
+	pkgdesc="GCC JIT Library"
+	depends=
+	amove usr/lib/libgccjit.so*
+}
+
+jitdev() {
+	pkgdesc="GCC JIT Library (development files)"
+	depends="libgccjit"
+	amove usr/include/libgccjit*.h
+}
+
 libobjc() {
 	pkgdesc="GNU Objective-C runtime"
 	replaces="objc"
diff --git a/cross/gcc-armhf/APKBUILD b/cross/gcc-armhf/APKBUILD
index 23623b240..45e38726c 100644
--- a/cross/gcc-armhf/APKBUILD
+++ b/cross/gcc-armhf/APKBUILD
@@ -31,7 +31,7 @@ pkgver=11.2.1_git20211128
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-armhf
-pkgrel=0
+pkgrel=1
 pkgdesc="Stage2 cross-compiler for armhf"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -50,6 +50,7 @@ replaces="libstdc++ binutils"
 : "${LANG_GO:=true}"
 : "${LANG_FORTRAN:=true}"
 : "${LANG_ADA:=true}"
+: "${LANG_JIT:=true}"
 
 _libgomp=true
 _libgcc=true
@@ -69,6 +70,7 @@ if [ "$CHOST" != "$CTARGET" ]; then
 	LANG_GO=false
 	LANG_FORTRAN=false
 	LANG_D=false
+	LANG_JIT=false
 	_libgomp=false
 	_libatomic=false
 	_libitm=false
@@ -106,6 +108,7 @@ elif [ "$CBUILD" != "$CHOST" ]; then
 	LANG_GO=false
 	LANG_FORTRAN=false
 	LANG_D=false
+	LANG_JIT=false
 
 	STRIP_FOR_TARGET=${CROSS_COMPILE}strip
 	_builddir="$srcdir/build-cross-native"
@@ -184,6 +187,10 @@ if $LANG_ADA; then
 	[ "$CBUILD" = "$CTARGET" ] && makedepends_build="$makedepends_build gcc-gnat-bootstrap"
 	[ "$CBUILD" != "$CTARGET" ] && makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross"
 fi
+if $LANG_JIT; then
+	subpackages="$subpackages libgccjit:jit libgccjit-dev:jitdev"
+	_languages="$_languages,jit"
+fi
 makedepends="$makedepends_build $makedepends_host"
 
 # when using upstream releases, use this URI template
@@ -270,6 +277,7 @@ build() {
 	local _libc_configure=
 	local _bootstrap_configure=
 	local _symvers=
+	local _jit_configure=
 
 	cd "$_gccdir"
 
@@ -312,6 +320,8 @@ build() {
 	*)	_bootstrap_configure="--enable-shared --enable-threads --enable-tls" ;;
 	esac
 
+	$LANG_JIT && _jit_configure="--enable-host-shared"
+
 	$_libgomp	|| _bootstrap_configure="$_bootstrap_configure --disable-libgomp"
 	$_libatomic	|| _bootstrap_configure="$_bootstrap_configure --disable-libatomic"
 	$_libitm	|| _bootstrap_configure="$_bootstrap_configure --disable-libitm"
@@ -359,6 +369,7 @@ build() {
 		$_libc_configure \
 		$_cross_configure \
 		$_bootstrap_configure \
+		$_jit_configure \
 		--with-system-zlib \
 		$_hash_style_configure
 	make
@@ -506,6 +517,18 @@ gpp() {
 	mv "$pkgdir"/usr/bin/*++ "$subpkgdir"/usr/bin/
 }
 
+jit() {
+	pkgdesc="GCC JIT Library"
+	depends=
+	amove usr/lib/libgccjit.so*
+}
+
+jitdev() {
+	pkgdesc="GCC JIT Library (development files)"
+	depends="libgccjit"
+	amove usr/include/libgccjit*.h
+}
+
 libobjc() {
 	pkgdesc="GNU Objective-C runtime"
 	replaces="objc"
diff --git a/cross/gcc-armv7/APKBUILD b/cross/gcc-armv7/APKBUILD
index 4541d111f..eaa3e7e26 100644
--- a/cross/gcc-armv7/APKBUILD
+++ b/cross/gcc-armv7/APKBUILD
@@ -31,7 +31,7 @@ pkgver=11.2.1_git20211128
 [ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
 
 pkgname=gcc-armv7
-pkgrel=0
+pkgrel=1
 pkgdesc="Stage2 cross-compiler for armv7"
 url="https://gcc.gnu.org"
 arch="x86_64"
@@ -50,6 +50,7 @@ replaces="libstdc++ binutils"
 : "${LANG_GO:=true}"
 : "${LANG_FORTRAN:=true}"
 : "${LANG_ADA:=true}"
+: "${LANG_JIT:=true}"
 
 _libgomp=true
 _libgcc=true
@@ -69,6 +70,7 @@ if [ "$CHOST" != "$CTARGET" ]; then
 	LANG_GO=false
 	LANG_FORTRAN=false
 	LANG_D=false
+	LANG_JIT=false
 	_libgomp=false
 	_libatomic=false
 	_libitm=false
@@ -106,6 +108,7 @@ elif [ "$CBUILD" != "$CHOST" ]; then
 	LANG_GO=false
 	LANG_FORTRAN=false
 	LANG_D=false
+	LANG_JIT=false
 
 	STRIP_FOR_TARGET=${CROSS_COMPILE}strip
 	_builddir="$srcdir/build-cross-native"
@@ -184,6 +187,10 @@ if $LANG_ADA; then
 	[ "$CBUILD" = "$CTARGET" ] && makedepends_build="$makedepends_build gcc-gnat-bootstrap"
 	[ "$CBUILD" != "$CTARGET" ] && makedepends_build="$makedepends_build gcc-gnat gcc-gnat$_cross"
 fi
+if $LANG_JIT; then
+	subpackages="$subpackages libgccjit:jit libgccjit-dev:jitdev"
+	_languages="$_languages,jit"
+fi
 makedepends="$makedepends_build $makedepends_host"
 
 # when using upstream releases, use this URI template
@@ -270,6 +277,7 @@ build() {
 	local _libc_configure=
 	local _bootstrap_configure=
 	local _symvers=
+	local _jit_configure=
 
 	cd "$_gccdir"
 
@@ -312,6 +320,8 @@ build() {
 	*)	_bootstrap_configure="--enable-shared --enable-threads --enable-tls" ;;
 	esac
 
+	$LANG_JIT && _jit_configure="--enable-host-shared"
+
 	$_libgomp	|| _bootstrap_configure="$_bootstrap_configure --disable-libgomp"
 	$_libatomic	|| _bootstrap_configure="$_bootstrap_configure --disable-libatomic"
 	$_libitm	|| _bootstrap_configure="$_bootstrap_configure --disable-libitm"
@@ -359,6 +369,7 @@ build() {
 		$_libc_configure \
 		$_cross_configure \
 		$_bootstrap_configure \
+		$_jit_configure \
 		--with-system-zlib \
 		$_hash_style_configure
 	make
@@ -506,6 +517,18 @@ gpp() {
 	mv "$pkgdir"/usr/bin/*++ "$subpkgdir"/usr/bin/
 }
 
+jit() {
+	pkgdesc="GCC JIT Library"
+	depends=
+	amove usr/lib/libgccjit.so*
+}
+
+jitdev() {
+	pkgdesc="GCC JIT Library (development files)"
+	depends="libgccjit"
+	amove usr/include/libgccjit*.h
+}
+
 libobjc() {
 	pkgdesc="GNU Objective-C runtime"
 	replaces="objc"