diff options
author | Yuki Okushi <huyuumi.dev@gmail.com> | 2020-03-16 02:07:40 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-16 02:07:40 +0900 |
commit | d6159ebccec638ec14df5751663d0b71e87b3418 (patch) | |
tree | 65cf9d6951a50e68a76960955c506f1a1c90b404 | |
parent | 64b919f1d4cf601cf016350673564e4b364b13e5 (diff) | |
parent | 52270b06e21749d38369893b22f301e449db9c01 (diff) | |
download | rust-libc-d6159ebccec638ec14df5751663d0b71e87b3418.tar.gz |
Merge pull request #1695 from JohnTitor/s390x
Enable `s390x-unknown-linux-gnu` on CI
-rw-r--r-- | ci/azure.yml | 4 | ||||
-rw-r--r-- | ci/linux-s390x.sh | 4 | ||||
-rw-r--r-- | libc-test/build.rs | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/ci/azure.yml b/ci/azure.yml index c0f22848ae..6dd0fcecba 100644 --- a/ci/azure.yml +++ b/ci/azure.yml @@ -70,8 +70,8 @@ jobs: TARGET: powerpc64-unknown-linux-gnu powerpc64le-unknown-linux-gnu: TARGET: powerpc64le-unknown-linux-gnu - #s390x-unknown-linux-gnu: - # TARGET: s390x-unknown-linux-gnu + s390x-unknown-linux-gnu: + TARGET: s390x-unknown-linux-gnu #wasm32-wasi # TARGET: wasm32-wasi sparc64-unknown-linux-gnu: diff --git a/ci/linux-s390x.sh b/ci/linux-s390x.sh index 00a7f88180..18c71f45c6 100644 --- a/ci/linux-s390x.sh +++ b/ci/linux-s390x.sh @@ -6,8 +6,8 @@ mkdir -m 777 /qemu cd /qemu curl --retry 5 -LO https://github.com/qemu/qemu/raw/master/pc-bios/s390-ccw.img -curl --retry 5 -LO http://ftp.debian.org/debian/dists/testing/main/installer-s390x/20190410/images/generic/kernel.debian -curl --retry 5 -LO http://ftp.debian.org/debian/dists/testing/main/installer-s390x/20190410/images/generic/initrd.debian +curl --retry 5 -LO http://ftp.debian.org/debian/dists/testing/main/installer-s390x/20191129/images/generic/kernel.debian +curl --retry 5 -LO http://ftp.debian.org/debian/dists/testing/main/installer-s390x/20191129/images/generic/initrd.debian mv kernel.debian kernel mv initrd.debian initrd.gz diff --git a/libc-test/build.rs b/libc-test/build.rs index 2a0f487166..1f7152e42a 100644 --- a/libc-test/build.rs +++ b/libc-test/build.rs @@ -2531,6 +2531,8 @@ fn test_linux(target: &str) { "utsname" if mips32 || mips64 => true, // FIXME: "mcontext_t" if s390x => true, + // FIXME: This is actually a union. + "fpreg_t" if s390x => true, "sockaddr_un" | "sembuf" | "ff_constant_effect" if mips32 && (gnu || musl) => |