From 80535f34aafbf089f201dfb217d659e36a18671a Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Fri, 17 May 2024 09:58:41 -0700 Subject: [PATCH 1/3] Revert "Upgrade Docker images to Ubuntu 23.10" on sparc64 This partially reverts commit 946c348bc7ce61fb8b92c27ea8328c8fbbcecf72. The test binaries were getting a symbol version for `GLIBC_2.38`, but the debian-11 image used for qemu doesn't have that new of glibc. --- ci/docker/sparc64-unknown-linux-gnu/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/docker/sparc64-unknown-linux-gnu/Dockerfile b/ci/docker/sparc64-unknown-linux-gnu/Dockerfile index 99ba40276a568..ff6810a7fac58 100644 --- a/ci/docker/sparc64-unknown-linux-gnu/Dockerfile +++ b/ci/docker/sparc64-unknown-linux-gnu/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:23.10 +FROM ubuntu:22.04 RUN apt-get update && apt-get install -y --no-install-recommends \ curl ca-certificates \ From 73d2004d3e8ed9c15d46fd4e69b5f3f7dbbe86c7 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Fri, 17 May 2024 10:21:53 -0700 Subject: [PATCH 2/3] Skip `SECCOMP_FILTER_FLAG_WAIT_KILLABLE_RECV` on sparc64 --- libc-test/build.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libc-test/build.rs b/libc-test/build.rs index 2b15c958d2d51..2a48af6aff546 100644 --- a/libc-test/build.rs +++ b/libc-test/build.rs @@ -3909,6 +3909,9 @@ fn test_linux(target: &str) { | "SW_CNT" if ppc64 || riscv64 => true, + // FIXME: requires more recent kernel headers on CI + "SECCOMP_FILTER_FLAG_WAIT_KILLABLE_RECV" if sparc64 => true, + // FIXME: Not currently available in headers on ARM and musl. "NETLINK_GET_STRICT_CHK" if arm || musl => true, From 61331df06f425934fa43a506e25217f49a039a7c Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Fri, 17 May 2024 11:27:55 -0700 Subject: [PATCH 3/3] Also skip `MFD_EXEC` and `MFD_NOEXEC_SEAL` on sparc64 --- libc-test/build.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libc-test/build.rs b/libc-test/build.rs index 2a48af6aff546..e7c1b8a2dcf31 100644 --- a/libc-test/build.rs +++ b/libc-test/build.rs @@ -3910,7 +3910,10 @@ fn test_linux(target: &str) { if ppc64 || riscv64 => true, // FIXME: requires more recent kernel headers on CI - "SECCOMP_FILTER_FLAG_WAIT_KILLABLE_RECV" if sparc64 => true, + | "MFD_EXEC" + | "MFD_NOEXEC_SEAL" + | "SECCOMP_FILTER_FLAG_WAIT_KILLABLE_RECV" + if sparc64 => true, // FIXME: Not currently available in headers on ARM and musl. "NETLINK_GET_STRICT_CHK" if arm || musl => true,