Skip to content

Commit d6159eb

Browse files
authored
Merge pull request #1695 from JohnTitor/s390x
Enable `s390x-unknown-linux-gnu` on CI
2 parents 64b919f + 52270b0 commit d6159eb

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

ci/azure.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ jobs:
7070
TARGET: powerpc64-unknown-linux-gnu
7171
powerpc64le-unknown-linux-gnu:
7272
TARGET: powerpc64le-unknown-linux-gnu
73-
#s390x-unknown-linux-gnu:
74-
# TARGET: s390x-unknown-linux-gnu
73+
s390x-unknown-linux-gnu:
74+
TARGET: s390x-unknown-linux-gnu
7575
#wasm32-wasi
7676
# TARGET: wasm32-wasi
7777
sparc64-unknown-linux-gnu:

ci/linux-s390x.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ mkdir -m 777 /qemu
66
cd /qemu
77

88
curl --retry 5 -LO https://github.com/qemu/qemu/raw/master/pc-bios/s390-ccw.img
9-
curl --retry 5 -LO http://ftp.debian.org/debian/dists/testing/main/installer-s390x/20190410/images/generic/kernel.debian
10-
curl --retry 5 -LO http://ftp.debian.org/debian/dists/testing/main/installer-s390x/20190410/images/generic/initrd.debian
9+
curl --retry 5 -LO http://ftp.debian.org/debian/dists/testing/main/installer-s390x/20191129/images/generic/kernel.debian
10+
curl --retry 5 -LO http://ftp.debian.org/debian/dists/testing/main/installer-s390x/20191129/images/generic/initrd.debian
1111

1212
mv kernel.debian kernel
1313
mv initrd.debian initrd.gz

libc-test/build.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2531,6 +2531,8 @@ fn test_linux(target: &str) {
25312531
"utsname" if mips32 || mips64 => true,
25322532
// FIXME:
25332533
"mcontext_t" if s390x => true,
2534+
// FIXME: This is actually a union.
2535+
"fpreg_t" if s390x => true,
25342536

25352537
"sockaddr_un" | "sembuf" | "ff_constant_effect"
25362538
if mips32 && (gnu || musl) =>

0 commit comments

Comments
 (0)