Skip to content

Commit 65f23e6

Browse files
committed
Move s390x into the gnu module
1 parent ce7e3a7 commit 65f23e6

23 files changed

+92
-434
lines changed

src/unix/linux_like/linux/other/b32/mod.rs renamed to src/unix/linux_like/linux/gnu/b32/mod.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,15 @@ s! {
6262
__f_spare: [::c_int; 6],
6363
}
6464

65+
pub struct sigaction {
66+
pub sa_sigaction: ::sighandler_t,
67+
pub sa_mask: ::sigset_t,
68+
#[cfg(target_arch = "sparc64")]
69+
__reserved0: ::c_int,
70+
pub sa_flags: ::c_int,
71+
pub sa_restorer: ::Option<extern fn()>,
72+
}
73+
6574
pub struct pthread_attr_t {
6675
__size: [u32; 9]
6776
}

src/unix/linux_like/linux/other/b64/aarch64.rs renamed to src/unix/linux_like/linux/gnu/b64/aarch64.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,15 @@ pub type suseconds_t = i64;
1212
pub type __u64 = ::c_ulonglong;
1313

1414
s! {
15+
pub struct sigaction {
16+
pub sa_sigaction: ::sighandler_t,
17+
pub sa_mask: ::sigset_t,
18+
#[cfg(target_arch = "sparc64")]
19+
__reserved0: ::c_int,
20+
pub sa_flags: ::c_int,
21+
pub sa_restorer: ::Option<extern fn()>,
22+
}
23+
1524
pub struct stat {
1625
pub st_dev: ::dev_t,
1726
pub st_ino: ::ino_t,

src/unix/linux_like/linux/other/b64/mod.rs renamed to src/unix/linux_like/linux/gnu/b64/mod.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ s! {
5151
__glibc_reserved4: u64,
5252
__glibc_reserved5: u64,
5353
}
54+
5455
}
5556

5657
pub const __SIZEOF_PTHREAD_RWLOCKATTR_T: usize = 8;
@@ -67,6 +68,9 @@ cfg_if! {
6768
} else if #[cfg(any(target_arch = "sparc64"))] {
6869
mod sparc64;
6970
pub use self::sparc64::*;
71+
} else if #[cfg(any(target_arch = "s390x"))] {
72+
mod s390x;
73+
pub use self::s390x::*;
7074
} else if #[cfg(any(target_arch = "x86_64"))] {
7175
mod x86_64;
7276
pub use self::x86_64::*;

src/unix/linux_like/linux/other/b64/not_x32.rs renamed to src/unix/linux_like/linux/gnu/b64/not_x32.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,15 @@ pub type c_long = i64;
44
pub type c_ulong = u64;
55

66
s! {
7+
pub struct sigaction {
8+
pub sa_sigaction: ::sighandler_t,
9+
pub sa_mask: ::sigset_t,
10+
#[cfg(target_arch = "sparc64")]
11+
__reserved0: ::c_int,
12+
pub sa_flags: ::c_int,
13+
pub sa_restorer: ::Option<extern fn()>,
14+
}
15+
716
pub struct statvfs {
817
pub f_bsize: ::c_ulong,
918
pub f_frsize: ::c_ulong,

src/unix/linux_like/linux/other/b64/powerpc64.rs renamed to src/unix/linux_like/linux/gnu/b64/powerpc64.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,15 @@ pub type suseconds_t = i64;
1212
pub type __u64 = ::c_ulong;
1313

1414
s! {
15+
pub struct sigaction {
16+
pub sa_sigaction: ::sighandler_t,
17+
pub sa_mask: ::sigset_t,
18+
#[cfg(target_arch = "sparc64")]
19+
__reserved0: ::c_int,
20+
pub sa_flags: ::c_int,
21+
pub sa_restorer: ::Option<extern fn()>,
22+
}
23+
1524
pub struct stat {
1625
pub st_dev: ::dev_t,
1726
pub st_ino: ::ino_t,

0 commit comments

Comments
 (0)