diff --git a/cross/gcc-aarch64/APKBUILD b/cross/gcc-aarch64/APKBUILD
index fa4619ee9..3d5dfa98b 100644
--- a/cross/gcc-aarch64/APKBUILD
+++ b/cross/gcc-aarch64/APKBUILD
@@ -40,13 +40,17 @@ url="https://gcc.gnu.org"
 arch="x86_64"
 license="GPL-2.0-or-later AND LGPL-2.1-or-later"
 _gccrel=$pkgver-r$pkgrel
-depends="binutils-aarch64 mpc1 so:libc.musl-x86_64.so.1 so:libgcc_s.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libstdc++.so.6 so:libz.so.1"
+depends="binutils-aarch64 mpc1 so:libgcc_s.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libstdc++.so.6 so:libz.so.1"
+
+case "$CARCH" in
+x86_64) depends="$depends so:libc.musl-x86_64.so.1" ;;
+esac
 makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
 makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-aarch64 binutils-aarch64"
 subpackages="g++-aarch64:gpp libstdc++-dev-aarch64:libcxx_dev"
 [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc"
 replaces="libstdc++ binutils"
-options="!strip !tracedeps"
+options="!strip !tracedeps toolchain"
 
 : "${LANG_CXX:=true}"
 : "${LANG_D:=true}"
@@ -581,7 +585,11 @@ gpp() {
 	depends="libstdc++-dev$_target=$_gccrel gcc$_target=$_gccrel musl-dev"
 	[ "$CHOST" = "$CTARGET" ] && depends="$depends libstdc++=$_gccrel"
 
-	depends="$depends so:libc.musl-x86_64.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libz.so.1"
+	depends="$depends so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libz.so.1"
+
+	case "$CARCH" in
+	x86_64) depends="$depends so:libc.musl-x86_64.so.1" ;;
+	esac
 
 	amove $_gcclibexec/cc1plus
 	amove usr/bin/*++
diff --git a/cross/gcc-armhf/APKBUILD b/cross/gcc-armhf/APKBUILD
index 2744998c9..1e4fce113 100644
--- a/cross/gcc-armhf/APKBUILD
+++ b/cross/gcc-armhf/APKBUILD
@@ -37,16 +37,21 @@ pkgname=gcc-armhf
 pkgrel=3
 pkgdesc="Stage2 cross-compiler for armhf"
 url="https://gcc.gnu.org"
-arch="x86_64"
+arch="aarch64 x86_64"
 license="GPL-2.0-or-later AND LGPL-2.1-or-later"
 _gccrel=$pkgver-r$pkgrel
-depends="binutils-armhf mpc1 so:libc.musl-x86_64.so.1 so:libgcc_s.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libstdc++.so.6 so:libz.so.1"
+depends="binutils-armhf mpc1 so:libgcc_s.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libstdc++.so.6 so:libz.so.1"
+
+case "$CARCH" in
+aarch64) depends="$depends so:libc.musl-aarch64.so.1" ;;
+x86_64) depends="$depends so:libc.musl-x86_64.so.1" ;;
+esac
 makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
 makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-armhf binutils-armhf"
 subpackages="g++-armhf:gpp libstdc++-dev-armhf:libcxx_dev"
 [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc"
 replaces="libstdc++ binutils"
-options="!strip !tracedeps"
+options="!strip !tracedeps toolchain"
 
 : "${LANG_CXX:=true}"
 : "${LANG_D:=true}"
@@ -581,7 +586,12 @@ gpp() {
 	depends="libstdc++-dev$_target=$_gccrel gcc$_target=$_gccrel musl-dev"
 	[ "$CHOST" = "$CTARGET" ] && depends="$depends libstdc++=$_gccrel"
 
-	depends="$depends so:libc.musl-x86_64.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libz.so.1"
+	depends="$depends so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libz.so.1"
+
+	case "$CARCH" in
+	aarch64) depends="$depends so:libc.musl-aarch64.so.1" ;;
+	x86_64) depends="$depends so:libc.musl-x86_64.so.1" ;;
+	esac
 
 	amove $_gcclibexec/cc1plus
 	amove usr/bin/*++
diff --git a/cross/gcc-armv7/APKBUILD b/cross/gcc-armv7/APKBUILD
index de6d5d9aa..abfe4eb8d 100644
--- a/cross/gcc-armv7/APKBUILD
+++ b/cross/gcc-armv7/APKBUILD
@@ -37,16 +37,21 @@ pkgname=gcc-armv7
 pkgrel=3
 pkgdesc="Stage2 cross-compiler for armv7"
 url="https://gcc.gnu.org"
-arch="x86_64"
+arch="aarch64 x86_64"
 license="GPL-2.0-or-later AND LGPL-2.1-or-later"
 _gccrel=$pkgver-r$pkgrel
-depends="binutils-armv7 mpc1 so:libc.musl-x86_64.so.1 so:libgcc_s.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libstdc++.so.6 so:libz.so.1"
+depends="binutils-armv7 mpc1 so:libgcc_s.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libstdc++.so.6 so:libz.so.1"
+
+case "$CARCH" in
+aarch64) depends="$depends so:libc.musl-aarch64.so.1" ;;
+x86_64) depends="$depends so:libc.musl-x86_64.so.1" ;;
+esac
 makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
 makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-armv7 binutils-armv7"
 subpackages="g++-armv7:gpp libstdc++-dev-armv7:libcxx_dev"
 [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc"
 replaces="libstdc++ binutils"
-options="!strip !tracedeps"
+options="!strip !tracedeps toolchain"
 
 : "${LANG_CXX:=true}"
 : "${LANG_D:=true}"
@@ -581,7 +586,12 @@ gpp() {
 	depends="libstdc++-dev$_target=$_gccrel gcc$_target=$_gccrel musl-dev"
 	[ "$CHOST" = "$CTARGET" ] && depends="$depends libstdc++=$_gccrel"
 
-	depends="$depends so:libc.musl-x86_64.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libz.so.1"
+	depends="$depends so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libz.so.1"
+
+	case "$CARCH" in
+	aarch64) depends="$depends so:libc.musl-aarch64.so.1" ;;
+	x86_64) depends="$depends so:libc.musl-x86_64.so.1" ;;
+	esac
 
 	amove $_gcclibexec/cc1plus
 	amove usr/bin/*++
diff --git a/cross/gcc-loongarch64/APKBUILD b/cross/gcc-loongarch64/APKBUILD
index ec3a70720..c8ce84e62 100644
--- a/cross/gcc-loongarch64/APKBUILD
+++ b/cross/gcc-loongarch64/APKBUILD
@@ -37,16 +37,21 @@ pkgname=gcc-loongarch64
 pkgrel=3
 pkgdesc="Stage2 cross-compiler for loongarch64"
 url="https://gcc.gnu.org"
-arch="x86_64"
+arch="aarch64 x86_64"
 license="GPL-2.0-or-later AND LGPL-2.1-or-later"
 _gccrel=$pkgver-r$pkgrel
-depends="binutils-loongarch64 mpc1 so:libc.musl-x86_64.so.1 so:libgcc_s.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libstdc++.so.6 so:libz.so.1"
+depends="binutils-loongarch64 mpc1 so:libgcc_s.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libstdc++.so.6 so:libz.so.1"
+
+case "$CARCH" in
+aarch64) depends="$depends so:libc.musl-aarch64.so.1" ;;
+x86_64) depends="$depends so:libc.musl-x86_64.so.1" ;;
+esac
 makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
 makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-loongarch64 binutils-loongarch64"
 subpackages="g++-loongarch64:gpp libstdc++-dev-loongarch64:libcxx_dev"
 [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc"
 replaces="libstdc++ binutils"
-options="!strip !tracedeps"
+options="!strip !tracedeps toolchain"
 
 : "${LANG_CXX:=true}"
 : "${LANG_D:=true}"
@@ -581,7 +586,12 @@ gpp() {
 	depends="libstdc++-dev$_target=$_gccrel gcc$_target=$_gccrel musl-dev"
 	[ "$CHOST" = "$CTARGET" ] && depends="$depends libstdc++=$_gccrel"
 
-	depends="$depends so:libc.musl-x86_64.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libz.so.1"
+	depends="$depends so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libz.so.1"
+
+	case "$CARCH" in
+	aarch64) depends="$depends so:libc.musl-aarch64.so.1" ;;
+	x86_64) depends="$depends so:libc.musl-x86_64.so.1" ;;
+	esac
 
 	amove $_gcclibexec/cc1plus
 	amove usr/bin/*++
diff --git a/cross/gcc-ppc64le/APKBUILD b/cross/gcc-ppc64le/APKBUILD
index f52434b0d..a05e95ce1 100644
--- a/cross/gcc-ppc64le/APKBUILD
+++ b/cross/gcc-ppc64le/APKBUILD
@@ -37,16 +37,21 @@ pkgname=gcc-ppc64le
 pkgrel=3
 pkgdesc="Stage2 cross-compiler for ppc64le"
 url="https://gcc.gnu.org"
-arch="x86_64"
+arch="aarch64 x86_64"
 license="GPL-2.0-or-later AND LGPL-2.1-or-later"
 _gccrel=$pkgver-r$pkgrel
-depends="binutils-ppc64le mpc1 so:libc.musl-x86_64.so.1 so:libgcc_s.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libstdc++.so.6 so:libz.so.1"
+depends="binutils-ppc64le mpc1 so:libgcc_s.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libstdc++.so.6 so:libz.so.1"
+
+case "$CARCH" in
+aarch64) depends="$depends so:libc.musl-aarch64.so.1" ;;
+x86_64) depends="$depends so:libc.musl-x86_64.so.1" ;;
+esac
 makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
 makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-ppc64le binutils-ppc64le"
 subpackages="g++-ppc64le:gpp libstdc++-dev-ppc64le:libcxx_dev"
 [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc"
 replaces="libstdc++ binutils"
-options="!strip !tracedeps"
+options="!strip !tracedeps toolchain"
 
 : "${LANG_CXX:=true}"
 : "${LANG_D:=true}"
@@ -581,7 +586,12 @@ gpp() {
 	depends="libstdc++-dev$_target=$_gccrel gcc$_target=$_gccrel musl-dev"
 	[ "$CHOST" = "$CTARGET" ] && depends="$depends libstdc++=$_gccrel"
 
-	depends="$depends so:libc.musl-x86_64.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libz.so.1"
+	depends="$depends so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libz.so.1"
+
+	case "$CARCH" in
+	aarch64) depends="$depends so:libc.musl-aarch64.so.1" ;;
+	x86_64) depends="$depends so:libc.musl-x86_64.so.1" ;;
+	esac
 
 	amove $_gcclibexec/cc1plus
 	amove usr/bin/*++
diff --git a/cross/gcc-riscv64/APKBUILD b/cross/gcc-riscv64/APKBUILD
index 74ea7a964..c281b81a8 100644
--- a/cross/gcc-riscv64/APKBUILD
+++ b/cross/gcc-riscv64/APKBUILD
@@ -37,16 +37,21 @@ pkgname=gcc-riscv64
 pkgrel=3
 pkgdesc="Stage2 cross-compiler for riscv64"
 url="https://gcc.gnu.org"
-arch="x86_64"
+arch="aarch64 x86_64"
 license="GPL-2.0-or-later AND LGPL-2.1-or-later"
 _gccrel=$pkgver-r$pkgrel
-depends="binutils-riscv64 mpc1 so:libc.musl-x86_64.so.1 so:libgcc_s.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libstdc++.so.6 so:libz.so.1"
+depends="binutils-riscv64 mpc1 so:libgcc_s.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libstdc++.so.6 so:libz.so.1"
+
+case "$CARCH" in
+aarch64) depends="$depends so:libc.musl-aarch64.so.1" ;;
+x86_64) depends="$depends so:libc.musl-x86_64.so.1" ;;
+esac
 makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
 makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-riscv64 binutils-riscv64"
 subpackages="g++-riscv64:gpp libstdc++-dev-riscv64:libcxx_dev"
 [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc"
 replaces="libstdc++ binutils"
-options="!strip !tracedeps"
+options="!strip !tracedeps toolchain"
 
 : "${LANG_CXX:=true}"
 : "${LANG_D:=true}"
@@ -581,7 +586,12 @@ gpp() {
 	depends="libstdc++-dev$_target=$_gccrel gcc$_target=$_gccrel musl-dev"
 	[ "$CHOST" = "$CTARGET" ] && depends="$depends libstdc++=$_gccrel"
 
-	depends="$depends so:libc.musl-x86_64.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libz.so.1"
+	depends="$depends so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libz.so.1"
+
+	case "$CARCH" in
+	aarch64) depends="$depends so:libc.musl-aarch64.so.1" ;;
+	x86_64) depends="$depends so:libc.musl-x86_64.so.1" ;;
+	esac
 
 	amove $_gcclibexec/cc1plus
 	amove usr/bin/*++
diff --git a/cross/gcc-x86/APKBUILD b/cross/gcc-x86/APKBUILD
index b2a432393..e74e14341 100644
--- a/cross/gcc-x86/APKBUILD
+++ b/cross/gcc-x86/APKBUILD
@@ -37,16 +37,21 @@ pkgname=gcc-x86
 pkgrel=3
 pkgdesc="Stage2 cross-compiler for x86"
 url="https://gcc.gnu.org"
-arch="x86_64"
+arch="aarch64 x86_64"
 license="GPL-2.0-or-later AND LGPL-2.1-or-later"
 _gccrel=$pkgver-r$pkgrel
-depends="binutils-x86 mpc1 so:libc.musl-x86_64.so.1 so:libgcc_s.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libstdc++.so.6 so:libz.so.1"
+depends="binutils-x86 mpc1 so:libgcc_s.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libstdc++.so.6 so:libz.so.1"
+
+case "$CARCH" in
+aarch64) depends="$depends so:libc.musl-aarch64.so.1" ;;
+x86_64) depends="$depends so:libc.musl-x86_64.so.1" ;;
+esac
 makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
 makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-x86 binutils-x86"
 subpackages="g++-x86:gpp libstdc++-dev-x86:libcxx_dev"
 [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc"
 replaces="libstdc++ binutils"
-options="!strip !tracedeps"
+options="!strip !tracedeps toolchain"
 
 : "${LANG_CXX:=true}"
 : "${LANG_D:=true}"
@@ -581,7 +586,12 @@ gpp() {
 	depends="libstdc++-dev$_target=$_gccrel gcc$_target=$_gccrel musl-dev"
 	[ "$CHOST" = "$CTARGET" ] && depends="$depends libstdc++=$_gccrel"
 
-	depends="$depends so:libc.musl-x86_64.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libz.so.1"
+	depends="$depends so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libz.so.1"
+
+	case "$CARCH" in
+	aarch64) depends="$depends so:libc.musl-aarch64.so.1" ;;
+	x86_64) depends="$depends so:libc.musl-x86_64.so.1" ;;
+	esac
 
 	amove $_gcclibexec/cc1plus
 	amove usr/bin/*++
diff --git a/cross/gcc-x86_64/APKBUILD b/cross/gcc-x86_64/APKBUILD
index 6e2c234d5..600a6018b 100644
--- a/cross/gcc-x86_64/APKBUILD
+++ b/cross/gcc-x86_64/APKBUILD
@@ -40,13 +40,17 @@ url="https://gcc.gnu.org"
 arch="aarch64"
 license="GPL-2.0-or-later AND LGPL-2.1-or-later"
 _gccrel=$pkgver-r$pkgrel
-depends="binutils-x86_64 mpc1 so:libc.musl-aarch64.so.1 so:libgcc_s.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libstdc++.so.6 so:libz.so.1"
+depends="binutils-x86_64 mpc1 so:libgcc_s.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libstdc++.so.6 so:libz.so.1"
+
+case "$CARCH" in
+aarch64) depends="$depends so:libc.musl-aarch64.so.1" ;;
+esac
 makedepends_build="gcc g++ bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev"
 makedepends_host="linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-x86_64 binutils-x86_64"
 subpackages="g++-x86_64:gpp libstdc++-dev-x86_64:libcxx_dev"
 [ "$CHOST" = "$CTARGET" ] && subpackages="gcc-gdb gcc-doc"
 replaces="libstdc++ binutils"
-options="!strip !tracedeps"
+options="!strip !tracedeps toolchain"
 
 : "${LANG_CXX:=true}"
 : "${LANG_D:=true}"
@@ -581,7 +585,11 @@ gpp() {
 	depends="libstdc++-dev$_target=$_gccrel gcc$_target=$_gccrel musl-dev"
 	[ "$CHOST" = "$CTARGET" ] && depends="$depends libstdc++=$_gccrel"
 
-	depends="$depends so:libc.musl-aarch64.so.1 so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libz.so.1"
+	depends="$depends so:libgmp.so.10 so:libisl.so.23 so:libmpc.so.3 so:libmpfr.so.6 so:libz.so.1"
+
+	case "$CARCH" in
+	aarch64) depends="$depends so:libc.musl-aarch64.so.1" ;;
+	esac
 
 	amove $_gcclibexec/cc1plus
 	amove usr/bin/*++