Skip to content

Commit 5744793

Browse files
committed
Auto merge of #3220 - JohnTitor:sparc64-2022-12-09, r=JohnTitor
Use the latest Debian for SPARC64
2 parents 890fc93 + 4971a58 commit 5744793

File tree

3 files changed

+2
-6
lines changed

3 files changed

+2
-6
lines changed

ci/docker/sparc64-unknown-linux-gnu/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
# FIXME: Update to 22.04 once Debian image of sparc64 has a newer glibc.
2-
FROM ubuntu:20.04
1+
FROM ubuntu:22.04
32

43
RUN apt-get update && apt-get install -y --no-install-recommends \
54
curl ca-certificates \

ci/linux-sparc64.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -ex
55
mkdir -m 777 /qemu
66
cd /qemu
77

8-
curl --retry 5 -LO https://cdimage.debian.org/cdimage/ports/snapshots/2022-03-28/debian-11.0.0-sparc64-NETINST-1.iso
8+
curl --retry 5 -LO https://cdimage.debian.org/cdimage/ports/snapshots/2022-12-09/debian-11.0.0-sparc64-NETINST-1.iso
99
7z e debian-11.0.0-sparc64-NETINST-1.iso install/initrd.gz
1010
7z e debian-11.0.0-sparc64-NETINST-1.iso install/vmlinux
1111
mv vmlinux kernel

libc-test/build.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3781,9 +3781,6 @@ fn test_linux(target: &str) {
37813781
// https://github.com/gnzlbg/ctest/issues/68
37823782
"lio_listio" if musl => true,
37833783

3784-
// FIXME: the glibc version used by the Sparc64 build jobs
3785-
// which use Debian 10.0 is too old.
3786-
"statx" if sparc64 => true,
37873784
// Needs glibc 2.34 or later.
37883785
"posix_spawn_file_actions_addclosefrom_np" if gnu && sparc64 => true,
37893786
// Needs glibc 2.35 or later.

0 commit comments

Comments
 (0)