Auto merge of #2086 - JohnTitor:s390x-musl, r=<try>

Move `s390x-unknown-linux-musl` to build.sh Fixes #2085 r? `@ghost`
rust-lang · Feb 28, 2021 · 05863d9 · 05863d9
2 parents 5fd6540 + 8898ff3
commit 05863d9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/.github/workflows/bors.yml b/.github/workflows/bors.yml
@@ -136,8 +136,6 @@ jobs:
           # FIXME: It seems some items in `src/unix/mod.rs`
           # aren't defined on redox actually.
           # x86_64-unknown-redox,
-          # FIXME: Enable when CI is building a toolchain for this target
-          # s390x-unknown-linux-musl,
         ]
     steps:
       - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master

diff --git a/ci/build.sh b/ci/build.sh
@@ -238,6 +238,7 @@ riscv32imc-unknown-none-elf \
 riscv32gc-unknown-linux-gnu \
 riscv64gc-unknown-none-elf \
 riscv64imac-unknown-none-elf \
+s390x-unknown-linux-musl \
 sparc-unknown-linux-gnu \
 sparc64-unknown-netbsd \
 

diff --git a/src/unix/linux_like/linux/musl/b64/s390x.rs b/src/unix/linux_like/linux/musl/b64/s390x.rs
@@ -6,9 +6,22 @@ pub type nlink_t = u64;
 pub type suseconds_t = i64;
 pub type wchar_t = i32;
 pub type greg_t = u64;
+pub type __rlimit_resource_t = ::c_int;
 pub type __u64 = u64;
 
 s! {
+    pub struct ipc_perm {
+        pub __ipc_perm_key: ::key_t,
+        pub uid: ::uid_t,
+        pub gid: ::gid_t,
+        pub cuid: ::uid_t,
+        pub cgid: ::gid_t,
+        pub mode: ::mode_t,
+        pub __seq: ::c_int,
+        __pad1: ::c_long,
+        __pad2: ::c_long,
+    }
+
     pub struct stat {
         pub st_dev: ::dev_t,
         pub st_ino: ::ino_t,