Skip to content

Commit 46dbf2d

Browse files
committed
Fix siginfo_t in s390x
1 parent 090f873 commit 46dbf2d

File tree

8 files changed

+27
-13
lines changed

8 files changed

+27
-13
lines changed

src/unix/linux_like/linux/gnu/b32/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,8 @@ pub const SO_BUSY_POLL: ::c_int = 46;
133133
pub const SA_ONSTACK: ::c_int = 0x08000000;
134134

135135
pub const PTRACE_DETACH: ::c_uint = 17;
136+
pub const POSIX_FADV_DONTNEED: ::c_int = 4;
137+
pub const POSIX_FADV_NOREUSE: ::c_int = 5;
136138

137139
pub const F_SETLK: ::c_int = 6;
138140
pub const F_SETLKW: ::c_int = 7;

src/unix/linux_like/linux/gnu/b64/aarch64.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,9 @@ pub const ENOTRECOVERABLE: ::c_int = 131;
315315
pub const EHWPOISON: ::c_int = 133;
316316
pub const ERFKILL: ::c_int = 132;
317317

318+
pub const POSIX_FADV_DONTNEED: ::c_int = 4;
319+
pub const POSIX_FADV_NOREUSE: ::c_int = 5;
320+
318321
pub const SOL_SOCKET: ::c_int = 1;
319322

320323
pub const SO_REUSEADDR: ::c_int = 2;

src/unix/linux_like/linux/gnu/b64/mips64.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -600,6 +600,9 @@ pub const SA_RESETHAND: ::c_int = 0x80000000;
600600
pub const SA_RESTART: ::c_int = 0x10000000;
601601
pub const SA_NOCLDSTOP: ::c_int = 0x00000001;
602602

603+
pub const POSIX_FADV_DONTNEED: ::c_int = 4;
604+
pub const POSIX_FADV_NOREUSE: ::c_int = 5;
605+
603606
pub const EPOLL_CLOEXEC: ::c_int = 0x80000;
604607

605608
pub const EFD_CLOEXEC: ::c_int = 0x80000;

src/unix/linux_like/linux/gnu/b64/powerpc64.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,9 @@ s! {
184184
}
185185
}
186186

187+
pub const POSIX_FADV_DONTNEED: ::c_int = 4;
188+
pub const POSIX_FADV_NOREUSE: ::c_int = 5;
189+
187190
pub const RTLD_DEEPBIND: ::c_int = 0x8;
188191
pub const RTLD_GLOBAL: ::c_int = 0x100;
189192
pub const RTLD_NOLOAD: ::c_int = 0x4;

src/unix/linux_like/linux/gnu/b64/s390x.rs

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,8 @@ s! {
4848
pub si_signo: ::c_int,
4949
pub si_errno: ::c_int,
5050
pub si_code: ::c_int,
51-
#[doc(hidden)]
52-
#[deprecated(
53-
since="0.2.54",
54-
note="Please leave a comment on \
55-
https://github.com/rust-lang/libc/pull/1316 if you're using \
56-
this field"
57-
)]
58-
pub _pad: [::c_int; 29],
51+
_pad: ::c_int,
5952
_pad2: [::c_long; 14],
60-
_align: [usize; 0],
6153
}
6254

6355
pub struct stack_t {
@@ -256,6 +248,9 @@ cfg_if! {
256248
}
257249
}
258250

251+
pub const POSIX_FADV_DONTNEED: ::c_int = 6;
252+
pub const POSIX_FADV_NOREUSE: ::c_int = 7;
253+
259254
pub const VEOF: usize = 4;
260255
pub const RTLD_DEEPBIND: ::c_int = 0x8;
261256
pub const RTLD_GLOBAL: ::c_int = 0x100;

src/unix/linux_like/linux/gnu/b64/sparc64.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,9 @@ s! {
197197
}
198198
}
199199

200+
pub const POSIX_FADV_DONTNEED: ::c_int = 4;
201+
pub const POSIX_FADV_NOREUSE: ::c_int = 5;
202+
200203
pub const VEOF: usize = 4;
201204
pub const RTLD_DEEPBIND: ::c_int = 0x8;
202205
pub const RTLD_GLOBAL: ::c_int = 0x100;

src/unix/linux_like/linux/gnu/b64/x86_64/mod.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,9 @@ cfg_if! {
384384
}
385385
}
386386

387+
pub const POSIX_FADV_DONTNEED: ::c_int = 4;
388+
pub const POSIX_FADV_NOREUSE: ::c_int = 5;
389+
387390
pub const VEOF: usize = 4;
388391
pub const RTLD_DEEPBIND: ::c_int = 0x8;
389392
pub const RTLD_GLOBAL: ::c_int = 0x100;

src/unix/linux_like/linux/gnu/mod.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -406,8 +406,6 @@ pub const SIGEV_THREAD_ID: ::c_int = 4;
406406
pub const BUFSIZ: ::c_uint = 8192;
407407
pub const TMP_MAX: ::c_uint = 238328;
408408
pub const FOPEN_MAX: ::c_uint = 16;
409-
pub const POSIX_FADV_DONTNEED: ::c_int = 4;
410-
pub const POSIX_FADV_NOREUSE: ::c_int = 5;
411409
pub const POSIX_MADV_DONTNEED: ::c_int = 4;
412410
pub const _SC_EQUIV_CLASS_MAX: ::c_int = 41;
413411
pub const _SC_CHARCLASS_NAME_MAX: ::c_int = 45;
@@ -914,8 +912,12 @@ pub const STATX_ATTR_ENCRYPTED: ::c_int = 0x0800;
914912
pub const STATX_ATTR_AUTOMOUNT: ::c_int = 0x1000;
915913

916914
cfg_if! {
917-
if #[cfg(any(target_arch = "arm", target_arch = "x86",
918-
target_arch = "x86_64"))] {
915+
if #[cfg(any(
916+
target_arch = "arm",
917+
target_arch = "x86",
918+
target_arch = "x86_64",
919+
target_arch = "s390x"
920+
))] {
919921
pub const PTHREAD_STACK_MIN: ::size_t = 16384;
920922
} else if #[cfg(target_arch = "sparc64")] {
921923
pub const PTHREAD_STACK_MIN: ::size_t = 0x6000;

0 commit comments

Comments
 (0)