From 5e03031b66904bd67688476129d3ded70fd041ab Mon Sep 17 00:00:00 2001 From: Jens Reidel Date: Tue, 16 Dec 2025 08:53:02 +0000 Subject: [PATCH 1/2] libc-test: semver: Move Linux s390x ucontext symbols to GNU symbol list Musl does not provide these. Signed-off-by: Jens Reidel --- libc-test/semver/linux-gnu-s390x.txt | 6 ++++++ libc-test/semver/linux-s390x.txt | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libc-test/semver/linux-gnu-s390x.txt b/libc-test/semver/linux-gnu-s390x.txt index ec90f4184b638..d52ba2a2a1422 100644 --- a/libc-test/semver/linux-gnu-s390x.txt +++ b/libc-test/semver/linux-gnu-s390x.txt @@ -1,4 +1,10 @@ PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP +getcontext +makecontext +mcontext_t +setcontext +swapcontext sysctl +ucontext_t diff --git a/libc-test/semver/linux-s390x.txt b/libc-test/semver/linux-s390x.txt index ac59c8eaee4d2..f2a16a6d8fe62 100644 --- a/libc-test/semver/linux-s390x.txt +++ b/libc-test/semver/linux-s390x.txt @@ -103,11 +103,5 @@ __psw_t flock64 fpreg_t fpregset_t -getcontext greg_t -makecontext -mcontext_t -setcontext -swapcontext termios2 -ucontext_t From a9675b5ff0a377d2880c67cb08816bfcd753de44 Mon Sep 17 00:00:00 2001 From: Jens Reidel Date: Tue, 16 Dec 2025 08:57:28 +0000 Subject: [PATCH 2/2] musl: s390x: Fix definition of SIGSTKSZ/MINSIGSTKSZ These have had the values 10240 and 4096 respectively since the introduction of the s390x port in musl back in 2016. Signed-off-by: Jens Reidel --- src/unix/linux_like/linux/musl/b64/s390x.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/unix/linux_like/linux/musl/b64/s390x.rs b/src/unix/linux_like/linux/musl/b64/s390x.rs index d8ce68e662089..744d148921f12 100644 --- a/src/unix/linux_like/linux/musl/b64/s390x.rs +++ b/src/unix/linux_like/linux/musl/b64/s390x.rs @@ -161,8 +161,8 @@ pub const SA_NOCLDWAIT: c_int = 2; pub const SA_ONSTACK: c_int = 0x08000000; pub const SA_SIGINFO: c_int = 4; pub const SIGBUS: c_int = 7; -pub const SIGSTKSZ: size_t = 0x2000; -pub const MINSIGSTKSZ: size_t = 2048; +pub const SIGSTKSZ: size_t = 10240; +pub const MINSIGSTKSZ: size_t = 4096; pub const SIG_SETMASK: c_int = 2; pub const O_NOCTTY: c_int = 256;