Re: [PR PATCH] [Updated] Drop libssp from cross compilers

[oreo639 <oreo639@users.noreply.github.com>]

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

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

https://github.com/oreo639/void-packages vcross
https://github.com/void-linux/void-packages/pull/41229

Drop libssp from cross compilers
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

This fixes an issue introduced by: https://github.com/void-linux/void-packages/commit/b2d670be60b883192d12f79077fa79dff5395554 that was not noticed until now as the glibc cross compilers were never rebuilt until recently.

The above commit caused a symbol redefinition error between glibc and the fallback gcc libssp implementation when compiling qemu-user-static:
```
FAILED: subprojects/libvhost-user/link-test 
aarch64-linux-gnu-gcc  -o subprojects/libvhost-user/link-test subprojects/libvhost-user/link-test.p/link-test.c.o -I/usr/aarch64-linux-gnu/usr/include -L/usr/aarch64-linux-gnu/usr/lib -Wl,--as-needed -Wl,--no-undefined -pie -Wl,--whole-archive -Wl,--start-group subprojects/libvhost-user/libvhost-user.a -Wl,--end-group -Wl,--no-whole-archive -fstack-protector-strong -static-pie -Wl,-z,relro -Wl,-z,now -Wl,--warn-common -fstack-clash-protection -D_FORTIFY_SOURCE=2 -O2 -pipe -march=armv8-a -fdebug-prefix-map=/builddir/qemu-user-static-7.2.0=. -Wl,-z,relro -Wl,-z,now -Wl,--as-needed -pthread
/usr/lib/gcc/aarch64-linux-gnu/12.2.0/../../../../aarch64-linux-gnu/bin/ld: /usr/aarch64-linux-gnu/usr/lib/libc.a(libc-start.o):(.data.rel.ro+0x0): multiple definition of `__stack_chk_guard'; /usr/aarch64-linux-gnu/usr/lib/libssp.a(ssp.o):/builddir/cross-aarch64-linux-gnu-0.35/gcc_build/aarch64-linux-gnu/libssp/../../../gcc-12.2.0/libssp/ssp.c:69: first defined here
collect2: error: ld returned 1 exit status
```

Note: this doesn't affect the ability to use ssp as glibc and musl have their own ssp implementations separate from libssp.
For reference Debian doesn't build libssp although it does manually create libssp_nonshared.a when compiling for musl, Alpine does the same thing: https://salsa.debian.org/toolchain-team/gcc/-/blob/gcc-12-debian/debian/rules2#L233 https://github.com/alpinelinux/aports/blob/6cdeaa93fe90cccc05e39fb4905dee70362892b8/main/musl/APKBUILD#L51-L53 Fedora afaict does build libssp but deletes libssp and libssp_nonshared after compiling: https://src.fedoraproject.org/rpms/gcc/blob/rawhide/f/gcc.spec#_1996

This also doesn't break packages linked against libssp as libssp.so is still provided by the libssp package in gcc. There is a separate PR for that.

[ci skip]

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From f9ec401d06447cbe7357204d998b53062eaa4e1e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 21 Dec 2022 15:09:53 -0800
Subject: [PATCH 01/27] build-style/void-cross: disable libssp

---
 common/build-style/void-cross.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index 4804193d8395..6914c40bc001 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -319,6 +319,12 @@ _void_cross_build_musl() {
 	make ${makejobs}
 	make DESTDIR=${wrksrc}/build_root/usr/${tgt} install
 
+	CFLAGS="-pipe -fPIC ${cross_musl_cflags}" \
+	CPPFLAGS="${cross_musl_cflags}" LDFLAGS="${cross_musl_ldflags}" \
+	${tgt}-gcc $CFLAGS $LDFLAGS -fpie $CPPFLAGS $CFLAGS -c ${XBPS_SRCPKGDIR}/musl/files/__stack_chk_fail_local.c -o __stack_chk_fail_local.o
+	${tgt}-ar r libssp_nonshared.a __stack_chk_fail_local.o
+	cp libssp_nonshared.a ${wrksrc}/build_root/usr/${tgt}/usr/lib
+
 	touch ${wrksrc}/.musl_build_done
 }
 
@@ -417,6 +423,7 @@ _void_cross_build_gcc() {
 		--disable-libvtv \
 		--disable-libsanitizer \
 		--disable-libstdcxx-pch \
+		--disable-libssp \
 		--enable-shared \
 		--enable-threads=posix \
 		--enable-__cxa_atexit \
@@ -425,7 +432,6 @@ _void_cross_build_gcc() {
 		--enable-lto \
 		--enable-default-pie \
 		--enable-default-ssp \
-		--enable-libssp \
 		--with-gnu-ld \
 		--with-gnu-as \
 		--with-linker-hash-style=gnu \
@@ -600,6 +606,8 @@ do_install() {
 		for f in ${DESTDIR}/${sysroot}/usr/lib/ld-musl-*.so.*; do
 			ln -sf libc.so ${f}
 		done
+
+		cp libssp_nonshared.a ${DESTDIR}/${sysroot}/usr/lib/
 	else
 		# Install glibc
 		cd ${wrksrc}/glibc_build

From 77c7a7a8306040b0f76953b8988c88ee7018a4a3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:26:14 -0800
Subject: [PATCH 02/27] musl: add __stack_chk_fail_local

This is necessary for libssp_nonshared.a (only build for cross
compilers for now)
---
 srcpkgs/musl/files/__stack_chk_fail_local.c | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 srcpkgs/musl/files/__stack_chk_fail_local.c

diff --git a/srcpkgs/musl/files/__stack_chk_fail_local.c b/srcpkgs/musl/files/__stack_chk_fail_local.c
new file mode 100644
index 000000000000..2b403a6e046f
--- /dev/null
+++ b/srcpkgs/musl/files/__stack_chk_fail_local.c
@@ -0,0 +1,2 @@
+extern void __stack_chk_fail(void);
+void __attribute__((visibility ("hidden"))) __stack_chk_fail_local(void) { __stack_chk_fail(); }

From 18c720360c4b12f79e850ea01a6144589e1406e0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:18:16 -0800
Subject: [PATCH 03/27] cross-vpkg-dummy: drop libssp from musl cross compilers

---
 srcpkgs/cross-vpkg-dummy/template | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/srcpkgs/cross-vpkg-dummy/template b/srcpkgs/cross-vpkg-dummy/template
index aeafb749dd5f..0825728cb19e 100644
--- a/srcpkgs/cross-vpkg-dummy/template
+++ b/srcpkgs/cross-vpkg-dummy/template
@@ -1,7 +1,7 @@
 # Template file for 'cross-vpkg-dummy'
 pkgname=cross-vpkg-dummy
 version=0.39
-revision=1
+revision=2
 build_style=meta
 short_desc="Dummy meta-pkg for cross building packages with xbps-src"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -61,9 +61,6 @@ shlib_provides="
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	provides+=" musl-9999_1 musl-devel-9999_1"
-	# bundled in musl crosstoolchains but not glibc
-	provides+=" libssp-9999_1 libssp-devel-9999_1"
-	shlib_provides+=" libssp.so.0"
 	conflicts+=" musl>=0"
 	shlib_provides+=" libc.so"
 else

From f65fefedc24f4ab4af7cf6ba9e139c9b3b77e99b Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 04/27] cross-aarch64-linux-gnu: drop libssp from cross
 compilers

---
 srcpkgs/cross-aarch64-linux-gnu/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template
index 0aca566f3978..17ba4ec677a6 100644
--- a/srcpkgs/cross-aarch64-linux-gnu/template
+++ b/srcpkgs/cross-aarch64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
 _linux_version=5.10.4
 pkgname=cross-aarch64-linux-gnu
 version=0.35
-revision=2
+revision=3
 build_style=void-cross
 configure_args="--with-arch=armv8-a"
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"

From 6c12c1ffd656dcb34b781968126c5692c5015ea0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 05/27] cross-aarch64-linux-musl: drop libssp from cross
 compilers

---
 srcpkgs/cross-aarch64-linux-musl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index ba14c96bccea..a05207a8894e 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
 _libucontext_version=1.0
 pkgname=cross-aarch64-linux-musl
 version=0.35
-revision=1
+revision=2
 build_style=void-cross
 configure_args="--with-arch=armv8-a"
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"

From 9da9226e0cfebf1b6745c6499415ddff4d6fc2c0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 06/27] cross-arm-linux-gnueabi: drop libssp from cross
 compilers

---
 srcpkgs/cross-arm-linux-gnueabi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template
index f2d4eabb531d..5aa1383aa8f9 100644
--- a/srcpkgs/cross-arm-linux-gnueabi/template
+++ b/srcpkgs/cross-arm-linux-gnueabi/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
 _linux_version=5.10.4
 pkgname=cross-arm-linux-gnueabi
 version=0.35
-revision=2
+revision=3
 build_style=void-cross
 configure_args="--with-arch=armv5te --with-float=soft"
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"

From 516271b2ae98f399b3a49516eea0400310fad153 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 07/27] cross-arm-linux-gnueabihf: drop libssp from cross
 compilers

---
 srcpkgs/cross-arm-linux-gnueabihf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template
index d631c7ca322f..13a780794378 100644
--- a/srcpkgs/cross-arm-linux-gnueabihf/template
+++ b/srcpkgs/cross-arm-linux-gnueabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
 _glibc_patchver="72-g0f90d6204d"
 pkgname=cross-arm-linux-gnueabihf
 version=0.35
-revision=2
+revision=3
 build_style=void-cross
 configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"

From 279de1d49af9d5b5113c27bf0f24dee8281eba96 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 08/27] cross-arm-linux-musleabi: drop libssp from cross
 compilers

---
 srcpkgs/cross-arm-linux-musleabi/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index 24df78e8fd8e..ce25d306db4b 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
 _libucontext_version=1.0
 pkgname=cross-arm-linux-musleabi
 version=0.35
-revision=1
+revision=2
 build_style=void-cross
 configure_args="--with-arch=armv5te --with-float=soft"
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"

From 2c7d1c977db2fb94adf3cae8d5ed4449ac7c2c15 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 09/27] cross-arm-linux-musleabihf: drop libssp from cross
 compilers

---
 srcpkgs/cross-arm-linux-musleabihf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index 8093700f909c..38baeb2e4df7 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
 _libucontext_version=1.0
 pkgname=cross-arm-linux-musleabihf
 version=0.35
-revision=1
+revision=2
 build_style=void-cross
 configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard"
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"

From 478a1ac54593c817291bae736f1da6a5077e6237 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 10/27] cross-armv7l-linux-gnueabihf: drop libssp from cross
 compilers

---
 srcpkgs/cross-armv7l-linux-gnueabihf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-armv7l-linux-gnueabihf/template
index 7daaf852ac9c..ffb71af5b454 100644
--- a/srcpkgs/cross-armv7l-linux-gnueabihf/template
+++ b/srcpkgs/cross-armv7l-linux-gnueabihf/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
 _linux_version=5.10.4
 pkgname=cross-armv7l-linux-gnueabihf
 version=0.35
-revision=2
+revision=3
 build_style=void-cross
 configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"

From 7608ec35ac372bc849601a5643d1216028e6863a Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 11/27] cross-armv7l-linux-musleabihf: drop libssp from cross
 compilers

---
 srcpkgs/cross-armv7l-linux-musleabihf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index e5af2c9ccbf2..5d7bd4647c49 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
 _libucontext_version=1.0
 pkgname=cross-armv7l-linux-musleabihf
 version=0.35
-revision=1
+revision=2
 build_style=void-cross
 configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"

From 5a1584e6d82dc019e785c63756044ae2ae1ac65d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 12/27] cross-i686-linux-musl: drop libssp from cross compilers

---
 srcpkgs/cross-i686-linux-musl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index d624bb7a3254..2c95f93a8fe1 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
 _libucontext_version=1.0
 pkgname=cross-i686-linux-musl
 version=0.35
-revision=1
+revision=2
 build_style=void-cross
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel

From 06460886baed3e566ac6c65497a68403790d4afe Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 13/27] cross-i686-pc-linux-gnu: drop libssp from cross
 compilers

---
 srcpkgs/cross-i686-pc-linux-gnu/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template
index fd950e0579af..c6f2579c645d 100644
--- a/srcpkgs/cross-i686-pc-linux-gnu/template
+++ b/srcpkgs/cross-i686-pc-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
 _linux_version=5.10.4
 pkgname=cross-i686-pc-linux-gnu
 version=0.35
-revision=2
+revision=3
 build_style=void-cross
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel

From f3987f7baee7b31c81526b2124df3a3c79c94ccb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 14/27] cross-mips-linux-musl: drop libssp from cross compilers

---
 srcpkgs/cross-mips-linux-musl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index 67a5c413396c..aefd2316ad03 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
 _linux_version=5.10.4
 pkgname=cross-mips-linux-musl
 version=0.35
-revision=1
+revision=2
 build_style=void-cross
 configure_args="--with-arch=mips32r2 --with-float=soft
  --with-linker-hash-style=sysv"

From 7b18a84edc1dae500abcd9bc37540db36a2d142d Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 15/27] cross-mips-linux-muslhf: drop libssp from cross
 compilers

---
 srcpkgs/cross-mips-linux-muslhf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index bdf8600ce95b..8308fcb4f0d0 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
 _linux_version=5.10.4
 pkgname=cross-mips-linux-muslhf
 version=0.35
-revision=1
+revision=2
 build_style=void-cross
 configure_args="--with-arch=mips32r2 --with-float=hard
  --with-linker-hash-style=sysv"

From d5e71b495a0b0d3d069e414d50f994876d7969d3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 16/27] cross-mipsel-linux-musl: drop libssp from cross
 compilers

---
 srcpkgs/cross-mipsel-linux-musl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index de49387d517b..3c1825f0d96f 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
 _linux_version=5.10.4
 pkgname=cross-mipsel-linux-musl
 version=0.35
-revision=1
+revision=2
 build_style=void-cross
 configure_args="--with-arch=mips32r2 --with-float=soft
  --with-linker-hash-style=sysv"

From 0db66608574013118551cea2b69bcc68987c2739 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:54 -0800
Subject: [PATCH 17/27] cross-mipsel-linux-muslhf: drop libssp from cross
 compilers

---
 srcpkgs/cross-mipsel-linux-muslhf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index b27ce6475a38..ab199135a246 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
 _linux_version=5.10.4
 pkgname=cross-mipsel-linux-muslhf
 version=0.35
-revision=1
+revision=2
 build_style=void-cross
 configure_args="--with-arch=mips32r2 --with-float=hard
  --with-linker-hash-style=sysv"

From 6f57556afcaf32da0ebca62e90c067cbe2a28364 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 18/27] cross-powerpc-linux-gnu: drop libssp from cross
 compilers

---
 srcpkgs/cross-powerpc-linux-gnu/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cross-powerpc-linux-gnu/template b/srcpkgs/cross-powerpc-linux-gnu/template
index 201c1c966678..c759eda4505a 100644
--- a/srcpkgs/cross-powerpc-linux-gnu/template
+++ b/srcpkgs/cross-powerpc-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
 _linux_version=5.10.4
 pkgname=cross-powerpc-linux-gnu
 version=0.35
-revision=2
+revision=3
 build_style=void-cross
 configure_args="--enable-secureplt --disable-vtable-verify"
 hostmakedepends="texinfo tar gcc-objc flex perl python3"

From 675f6a2196cd9f06c78e63674aa412e22669b013 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 19/27] cross-powerpc-linux-musl: drop libssp from cross
 compilers

---
 srcpkgs/cross-powerpc-linux-musl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index 9bb6acd359b6..692145be3994 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
 _linux_version=5.10.4
 pkgname=cross-powerpc-linux-musl
 version=0.35
-revision=1
+revision=2
 build_style=void-cross
 configure_args="--enable-secureplt --disable-vtable-verify
  --disable-decimal-float"

From c23753b39364b1b079b5aaef2bbed0dc8a815db5 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 20/27] cross-powerpc64-linux-gnu: drop libssp from cross
 compilers

---
 srcpkgs/cross-powerpc64-linux-gnu/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cross-powerpc64-linux-gnu/template b/srcpkgs/cross-powerpc64-linux-gnu/template
index 8f558da423e3..95e6ce653c3d 100644
--- a/srcpkgs/cross-powerpc64-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
 _linux_version=5.10.4
 pkgname=cross-powerpc64-linux-gnu
 version=0.35
-revision=2
+revision=3
 build_style=void-cross
 configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
  --enable-targets=powerpc-linux"

From 390e2de28d8aee3133d274bd36e774944dc1b41e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 21/27] cross-powerpc64-linux-musl: drop libssp from cross
 compilers

---
 srcpkgs/cross-powerpc64-linux-musl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index e0848fe0bff7..4d38c80ff744 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
 _libucontext_version=1.0
 pkgname=cross-powerpc64-linux-musl
 version=0.35
-revision=1
+revision=2
 build_style=void-cross
 configure_args="--enable-secureplt --disable-vtable-verify
  --disable-decimal-float --with-abi=elfv2 --enable-targets=powerpc-linux"

From 09fee075d4aefd5b41a773f94e7c2f5ca7389f05 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 22/27] cross-powerpc64le-linux-gnu: drop libssp from cross
 compilers

---
 srcpkgs/cross-powerpc64le-linux-gnu/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/template b/srcpkgs/cross-powerpc64le-linux-gnu/template
index 5b01d9b65083..f4486e3f229c 100644
--- a/srcpkgs/cross-powerpc64le-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64le-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
 _linux_version=5.10.4
 pkgname=cross-powerpc64le-linux-gnu
 version=0.35
-revision=2
+revision=3
 build_style=void-cross
 configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
  --enable-targets=powerpcle-linux"

From d0c99d3c8d05b51b5f5399cb2c2f06d2ec1dbb99 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 23/27] cross-powerpc64le-linux-musl: drop libssp from cross
 compilers

---
 srcpkgs/cross-powerpc64le-linux-musl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index 0915e524545f..59f8586731a7 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
 _libucontext_version=1.0
 pkgname=cross-powerpc64le-linux-musl
 version=0.35
-revision=1
+revision=2
 build_style=void-cross
 configure_args="--enable-secureplt --disable-vtable-verify
  --disable-decimal-float --with-abi=elfv2 --enable-targets=powerpcle-linux"

From f9da6ba3ada7f74f6bb130a0814eb0d597867fad Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 24/27] cross-powerpcle-linux-gnu: drop libssp from cross
 compilers

---
 srcpkgs/cross-powerpcle-linux-gnu/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cross-powerpcle-linux-gnu/template b/srcpkgs/cross-powerpcle-linux-gnu/template
index 687be8a44c6c..32337f1c37cc 100644
--- a/srcpkgs/cross-powerpcle-linux-gnu/template
+++ b/srcpkgs/cross-powerpcle-linux-gnu/template
@@ -5,7 +5,7 @@ _glibc_version=2.36
 _linux_version=5.10.4
 pkgname=cross-powerpcle-linux-gnu
 version=0.35
-revision=1
+revision=2
 build_style=void-cross
 configure_args="--enable-secureplt --disable-vtable-verify"
 hostmakedepends="texinfo tar gcc-objc flex perl python3"

From c19fe8772aad68f8e2a4f5cd39478da2be1c2301 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 25/27] cross-powerpcle-linux-musl: drop libssp from cross
 compilers

---
 srcpkgs/cross-powerpcle-linux-musl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cross-powerpcle-linux-musl/template b/srcpkgs/cross-powerpcle-linux-musl/template
index bb984b9c42eb..0fdd3285b3f8 100644
--- a/srcpkgs/cross-powerpcle-linux-musl/template
+++ b/srcpkgs/cross-powerpcle-linux-musl/template
@@ -5,7 +5,7 @@ _musl_version=1.1.24
 _linux_version=5.10.4
 pkgname=cross-powerpcle-linux-musl
 version=0.35
-revision=1
+revision=2
 build_style=void-cross
 configure_args="--enable-secureplt --disable-vtable-verify
  --disable-decimal-float"

From e42a8b7feb66c9226f941e3fc24183729c3ac0c2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 26/27] cross-x86_64-linux-gnu: drop libssp from cross
 compilers

---
 srcpkgs/cross-x86_64-linux-gnu/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cross-x86_64-linux-gnu/template b/srcpkgs/cross-x86_64-linux-gnu/template
index bdb59d85cdd5..0f6daea7229c 100644
--- a/srcpkgs/cross-x86_64-linux-gnu/template
+++ b/srcpkgs/cross-x86_64-linux-gnu/template
@@ -6,7 +6,7 @@ _glibc_patchver="72-g0f90d6204d"
 _linux_version=5.10.4
 pkgname=cross-x86_64-linux-gnu
 version=0.35
-revision=2
+revision=3
 build_style=void-cross
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel

From cf7031a7736794a8df6be1657bfcd4ca650e0c79 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Tue, 27 Dec 2022 02:20:55 -0800
Subject: [PATCH 27/27] cross-x86_64-linux-musl: drop libssp from cross
 compilers

---
 srcpkgs/cross-x86_64-linux-musl/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index ac5b1c46ab82..2812f3330130 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -6,7 +6,7 @@ _linux_version=5.10.4
 _libucontext_version=1.0
 pkgname=cross-x86_64-linux-musl
 version=0.35
-revision=1
+revision=2
 build_style=void-cross
 hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3"
 makedepends="isl15-devel libmpc-devel gmp-devel mpfr-devel