diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index 848fc175cb6..78fcc8a3576 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -11,7 +11,7 @@ _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
 version=0.20
-revision=2
+revision=3
 short_desc="Cross toolchain for ARM64 LE target (musl)"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.voidlinux.eu"
@@ -83,7 +83,7 @@ _gcc_bootstrap() {
 		--enable-languages=c --with-newlib --disable-libssp --disable-nls \
 		--disable-libquadmath --disable-threads --disable-decimal-float \
 		--disable-shared --disable-libmudflap --disable-libgomp \
-		--disable-libatomic
+		--disable-libatomic --disable-symvers libat_cv_have_ifunc=no
 
 	make ${makejobs}
 	make install
@@ -136,7 +136,8 @@ _gcc_build() {
 		--libexecdir=/usr/lib --enable-languages=c,c++,lto \
 		--enable-lto --disable-libsanitizer \
 		--disable-multilib --disable-nls --disable-libquadmath \
-		--disable-libmudflap --enable-shared
+		--disable-libmudflap --enable-shared \
+		--disable-symvers libat_cv_have_ifunc=no
 
 	make ${makejobs}
 
@@ -213,7 +214,7 @@ do_install() {
 
 cross-aarch64-linux-musl-libc_package() {
 	short_desc+=" - libc files"
-	noarch=yes
+	nostrip=yes
 	noshlibprovides=yes
 	noverifyrdeps=yes
 	pkg_install() {
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index 6b8a1c0a26a..af97a0eec4d 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -13,7 +13,7 @@ _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
 version=0.20
-revision=1
+revision=2
 short_desc="Cross toolchain for ARMv5 TE target (musl)"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.voidlinux.eu"
@@ -85,7 +85,8 @@ _gcc_bootstrap() {
 		--enable-languages=c --with-newlib --disable-libssp --disable-nls \
 		--disable-libquadmath --disable-threads --disable-decimal-float \
 		--disable-shared --disable-libmudflap --disable-libgomp \
-		--disable-libatomic ${_fpuflags}
+		--disable-libatomic --disable-symvers \
+		libat_cv_have_ifunc=no ${_fpuflags}
 
 	make ${makejobs}
 	make install
@@ -138,7 +139,8 @@ _gcc_build() {
 		--target=${_triplet} --with-sysroot=${_sysroot} --prefix=/usr \
 		--enable-languages=c,c++,lto --enable-lto --disable-libsanitizer \
 		--disable-multilib --disable-nls --disable-libquadmath \
-		--disable-libmudflap --enable-shared ${_fpuflags}
+		--disable-libmudflap --enable-shared \
+		--disable-symvers libat_cv_have_ifunc=no ${_fpuflags}
 
 	make ${makejobs}
 
@@ -214,7 +216,7 @@ do_install() {
 
 cross-arm-linux-musleabi-libc_package() {
 	short_desc+=" - libc files"
-	noarch=yes
+	nostrip=yes
 	noshlibprovides=yes
 	noverifyrdeps=yes
 	pkg_install() {
diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index 47f5ef75c4a..fd69a1a448c 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
 version=0.20
-revision=2
+revision=3
 short_desc="Cross toolchain for ARMv6 LE Hard Float target (musl)"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.voidlinux.eu"
@@ -84,7 +84,8 @@ _gcc_bootstrap() {
 		--enable-languages=c --with-newlib --disable-libssp --disable-nls \
 		--disable-libquadmath --disable-threads --disable-decimal-float \
 		--disable-shared --disable-libmudflap --disable-libgomp \
-		--disable-libatomic ${_fpuflags}
+		--disable-libatomic --disable-symvers \
+		libat_cv_have_ifunc=no ${_fpuflags}
 
 	make ${makejobs}
 	make install
@@ -137,7 +138,8 @@ _gcc_build() {
 		--target=${_triplet} --with-sysroot=${_sysroot} --prefix=/usr \
 		--enable-languages=c,c++,lto --enable-lto --disable-libsanitizer \
 		--disable-multilib --disable-nls --disable-libquadmath \
-		--disable-libmudflap --enable-shared ${_fpuflags}
+		--disable-libmudflap --enable-shared --disable-symvers \
+		libat_cv_have_ifunc=no ${_fpuflags}
 
 	make ${makejobs}
 
@@ -213,7 +215,7 @@ do_install() {
 
 cross-arm-linux-musleabihf-libc_package() {
 	short_desc+=" - libc files"
-	noarch=yes
+	nostrip=yes
 	noshlibprovides=yes
 	noverifyrdeps=yes
 	pkg_install() {
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index 8d4f434b679..0aa85e77686 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -12,7 +12,7 @@ _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
 version=0.20
-revision=2
+revision=3
 short_desc="Cross toolchain for ARMv7 LE Hard Float target (musl)"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.voidlinux.eu"
@@ -84,7 +84,8 @@ _gcc_bootstrap() {
 		--enable-languages=c --with-newlib --disable-libssp --disable-nls \
 		--disable-libquadmath --disable-threads --disable-decimal-float \
 		--disable-shared --disable-libmudflap --disable-libgomp \
-		--disable-libatomic ${_fpuflags}
+		--disable-libatomic --disable-symvers \
+		libat_cv_have_ifunc=no ${_fpuflags}
 
 	make ${makejobs}
 	make install
@@ -138,7 +139,8 @@ _gcc_build() {
 		--target=${_triplet} --with-sysroot=${_sysroot} --prefix=/usr \
 		--enable-languages=c,c++,lto --enable-lto --disable-libsanitizer \
 		--disable-multilib --disable-nls --disable-libquadmath \
-		--disable-libmudflap --enable-shared ${_fpuflags}
+		--disable-libmudflap --enable-shared --disable-symvers \
+		libat_cv_have_ifunc=no ${_fpuflags}
 
 	make ${makejobs}
 
@@ -214,7 +216,7 @@ do_install() {
 
 cross-armv7l-linux-musleabihf-libc_package() {
 	short_desc+=" - libc files"
-	noarch=yes
+	nostrip=yes
 	noshlibprovides=yes
 	noverifyrdeps=yes
 	pkg_install() {
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index a00ed7d1f34..da90e684429 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -11,7 +11,7 @@ _archflags="-march=i686"
 
 pkgname=cross-${_triplet}
 version=0.20
-revision=2
+revision=3
 short_desc="Cross toolchain for i686 target (musl)"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.voidlinux.eu"
@@ -84,8 +84,9 @@ _gcc_bootstrap() {
 		--enable-languages=c --with-newlib --disable-libssp --disable-nls \
 		--disable-libquadmath --disable-threads --disable-decimal-float \
 		--disable-shared --disable-libmudflap --disable-libgomp \
-		--disable-libatomic ${_fpuflags}
-
+		--disable-libatomic --disable-symvers \
+		libat_cv_have_ifunc=no ${_fpuflags}
+ 
 	make ${makejobs}
 	make install
 
@@ -137,7 +138,8 @@ _gcc_build() {
 	../gcc-${_gcc_version}/configure \
 		--target=${_triplet} --with-sysroot=${_sysroot} --prefix=/usr \
 		--enable-languages=c,c++,lto --enable-lto --disable-libsanitizer \
-		--disable-multilib --disable-libmudflap --enable-shared ${_fpuflags}
+		--disable-multilib --disable-libmudflap --enable-shared \
+		--disable-symvers libat_cv_have_ifunc=no ${_fpuflags}
 
 	make ${makejobs}
 
@@ -219,7 +221,7 @@ do_install() {
 
 cross-i686-linux-musl-libc_package() {
 	short_desc+=" - libc files"
-	noarch=yes
+	nostrip=yes
 	noverifydeps=yes
 	noshlibprovides=yes
 	pkg_install() {
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index e8fd4f468c1..76a22c36056 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -10,7 +10,7 @@ _sysroot="/usr/${_triplet}"
 
 pkgname=cross-${_triplet}
 version=0.20
-revision=2
+revision=3
 short_desc="Cross toolchain for x86_64 with musl"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.voidlinux.eu"
@@ -83,7 +83,8 @@ _gcc_bootstrap() {
 		--enable-languages=c --with-newlib --disable-libssp --disable-nls \
 		--disable-libquadmath --disable-threads --disable-decimal-float \
 		--disable-shared --disable-libmudflap --disable-libgomp \
-		--disable-libatomic ${_fpuflags}
+		--disable-libatomic --disable-symvers \
+		libat_cv_have_ifunc=no ${_fpuflags}
 
 	make ${makejobs}
 	make install
@@ -136,7 +137,8 @@ _gcc_build() {
 	../gcc-${_gcc_version}/configure \
 		--target=${_triplet} --with-sysroot=${_sysroot} --prefix=/usr \
 		--enable-languages=c,c++,lto --enable-lto --disable-libsanitizer \
-		--disable-multilib --disable-libmudflap --enable-shared ${_fpuflags}
+		--disable-multilib --disable-libmudflap --enable-shared \
+		--disable-symvers libat_cv_have_ifunc=no ${_fpuflags}
 
 	make ${makejobs}
 
@@ -218,7 +220,7 @@ do_install() {
 
 cross-x86_64-linux-musl-libc_package() {
 	short_desc+=" - libc files"
-	noarch=yes
+	nostrip=yes
 	noverifydeps=yes
 	noshlibprovides=yes
 	pkg_install() {