diff options
| author | bors <bors@rust-lang.org> | 2023-04-24 19:47:52 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-04-24 19:47:52 +0000 |
| commit | 5744793b48ddd451ed0690e486845f60280150a3 (patch) | |
| tree | 019436ab974aa3a931c836e74c96f3b5df251d35 | |
| parent | 890fc93b7e7daac55d0224cd47ce276f24e51a81 (diff) | |
| parent | 4971a587e62aae730cf17db38947c610095f1b2e (diff) | |
| download | rust-libc-5744793b48ddd451ed0690e486845f60280150a3.tar.gz | |
Auto merge of #3220 - JohnTitor:sparc64-2022-12-09, r=JohnTitor
Use the latest Debian for SPARC64
| -rw-r--r-- | ci/docker/sparc64-unknown-linux-gnu/Dockerfile | 3 | ||||
| -rw-r--r-- | ci/linux-sparc64.sh | 2 | ||||
| -rw-r--r-- | libc-test/build.rs | 3 |
3 files changed, 2 insertions, 6 deletions
diff --git a/ci/docker/sparc64-unknown-linux-gnu/Dockerfile b/ci/docker/sparc64-unknown-linux-gnu/Dockerfile index d45e56195d..ff6810a7fa 100644 --- a/ci/docker/sparc64-unknown-linux-gnu/Dockerfile +++ b/ci/docker/sparc64-unknown-linux-gnu/Dockerfile @@ -1,5 +1,4 @@ -# FIXME: Update to 22.04 once Debian image of sparc64 has a newer glibc. -FROM ubuntu:20.04 +FROM ubuntu:22.04 RUN apt-get update && apt-get install -y --no-install-recommends \ curl ca-certificates \ diff --git a/ci/linux-sparc64.sh b/ci/linux-sparc64.sh index db215cabf6..a42218a62e 100644 --- a/ci/linux-sparc64.sh +++ b/ci/linux-sparc64.sh @@ -5,7 +5,7 @@ set -ex mkdir -m 777 /qemu cd /qemu -curl --retry 5 -LO https://cdimage.debian.org/cdimage/ports/snapshots/2022-03-28/debian-11.0.0-sparc64-NETINST-1.iso +curl --retry 5 -LO https://cdimage.debian.org/cdimage/ports/snapshots/2022-12-09/debian-11.0.0-sparc64-NETINST-1.iso 7z e debian-11.0.0-sparc64-NETINST-1.iso install/initrd.gz 7z e debian-11.0.0-sparc64-NETINST-1.iso install/vmlinux mv vmlinux kernel diff --git a/libc-test/build.rs b/libc-test/build.rs index a4df4571a5..0a8b175c34 100644 --- a/libc-test/build.rs +++ b/libc-test/build.rs @@ -3781,9 +3781,6 @@ fn test_linux(target: &str) { // https://github.com/gnzlbg/ctest/issues/68 "lio_listio" if musl => true, - // FIXME: the glibc version used by the Sparc64 build jobs - // which use Debian 10.0 is too old. - "statx" if sparc64 => true, // Needs glibc 2.34 or later. "posix_spawn_file_actions_addclosefrom_np" if gnu && sparc64 => true, // Needs glibc 2.35 or later. |