Skip to content

Commit ec384c7

Browse files
bossmcbossmc
committed
Remove all redundant definitions in musl backend
1 parent 491533d commit ec384c7

File tree

9 files changed

+15
-196
lines changed

9 files changed

+15
-196
lines changed

‎src/unix/linux_like/linux/musl/b32/arm/mod.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -112,14 +112,6 @@ s! {
112112
pub f_spare: [::c_ulong; 4],
113113
}
114114

115-
pub struct siginfo_t {
116-
pub si_signo: ::c_int,
117-
pub si_errno: ::c_int,
118-
pub si_code: ::c_int,
119-
pub _pad: [::c_int; 29],
120-
_align: [usize; 0],
121-
}
122-
123115
pub struct statfs64 {
124116
pub f_type: ::c_ulong,
125117
pub f_bsize: ::c_ulong,

‎src/unix/linux_like/linux/musl/b32/hexagon.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,6 @@ s! {
9191
pub f_spare: [::c_ulong; 4],
9292
}
9393

94-
pub struct siginfo_t {
95-
pub si_signo: ::c_int,
96-
pub si_errno: ::c_int,
97-
pub si_code: ::c_int,
98-
pub _pad: [::c_int; 29],
99-
_align: [usize; 0],
100-
}
101-
10294
pub struct statfs64 {
10395
pub f_type: ::c_ulong,
10496
pub f_bsize: ::c_ulong,

‎src/unix/linux_like/linux/musl/b32/mips/mod.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -120,14 +120,6 @@ s! {
120120
pub f_spare: [::c_ulong; 5],
121121
}
122122

123-
pub struct siginfo_t {
124-
pub si_signo: ::c_int,
125-
pub si_code: ::c_int,
126-
pub si_errno: ::c_int,
127-
pub _pad: [::c_int; 29],
128-
_align: [usize; 0],
129-
}
130-
131123
pub struct statfs64 {
132124
pub f_type: ::c_ulong,
133125
pub f_bsize: ::c_ulong,

‎src/unix/linux_like/linux/musl/b32/powerpc.rs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -112,14 +112,6 @@ s! {
112112
pub f_spare: [::c_ulong; 4],
113113
}
114114

115-
pub struct siginfo_t {
116-
pub si_signo: ::c_int,
117-
pub si_errno: ::c_int,
118-
pub si_code: ::c_int,
119-
pub _pad: [::c_int; 29],
120-
_align: [usize; 0],
121-
}
122-
123115
pub struct statfs64 {
124116
pub f_type: ::c_ulong,
125117
pub f_bsize: ::c_ulong,
@@ -361,8 +353,6 @@ pub const SIG_UNBLOCK: ::c_int = 0x01;
361353

362354
pub const EXTPROC: ::tcflag_t = 0x10000000;
363355

364-
pub const MAP_HUGETLB: ::c_int = 0x040000;
365-
366356
pub const F_GETLK: ::c_int = 12;
367357
pub const F_GETOWN: ::c_int = 9;
368358
pub const F_SETLK: ::c_int = 13;

‎src/unix/linux_like/linux/musl/b32/riscv32/mod.rs

Lines changed: 0 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ pub type c_char = u8;
44
pub type wchar_t = ::c_int;
55

66
s! {
7-
pub struct pthread_attr_t {
8-
__size: [::c_ulong; 7],
9-
}
10-
117
pub struct stat {
128
pub st_dev: ::dev_t,
139
pub st_ino: ::ino_t,
@@ -82,34 +78,12 @@ s! {
8278
pub f_spare: [::c_ulong; 4],
8379
}
8480

85-
pub struct siginfo_t {
86-
pub si_signo: ::c_int,
87-
pub si_errno: ::c_int,
88-
pub si_code: ::c_int,
89-
#[doc(hidden)]
90-
#[deprecated(
91-
since="0.2.54",
92-
note="Please leave a comment on \
93-
https://github.com/rust-lang/libc/pull/1316 if you're using \
94-
this field"
95-
)]
96-
pub _pad: [::c_int; 29],
97-
_align: [u64; 0],
98-
}
99-
10081
pub struct stack_t {
10182
pub ss_sp: *mut ::c_void,
10283
pub ss_flags: ::c_int,
10384
pub ss_size: ::size_t,
10485
}
10586

106-
pub struct sigaction {
107-
pub sa_sigaction: ::sighandler_t,
108-
pub sa_mask: ::sigset_t,
109-
pub sa_flags: ::c_int,
110-
pub sa_restorer: ::Option<unsafe extern "C" fn()>,
111-
}
112-
11387
pub struct ipc_perm {
11488
pub __key: ::key_t,
11589
pub uid: ::uid_t,
@@ -158,12 +132,6 @@ s! {
158132
//pub const RLIM_INFINITY: ::rlim_t = !0;
159133
pub const VEOF: usize = 4;
160134
pub const RTLD_DEEPBIND: ::c_int = 0x8;
161-
pub const RTLD_GLOBAL: ::c_int = 0x100;
162-
pub const RTLD_NOLOAD: ::c_int = 0x4;
163-
pub const TIOCGSOFTCAR: ::c_ulong = 21529;
164-
pub const TIOCSSOFTCAR: ::c_ulong = 21530;
165-
pub const TIOCGRS485: ::c_int = 21550;
166-
pub const TIOCSRS485: ::c_int = 21551;
167135
//pub const RLIMIT_RSS: ::__rlimit_resource_t = 5;
168136
//pub const RLIMIT_AS: ::__rlimit_resource_t = 9;
169137
//pub const RLIMIT_MEMLOCK: ::__rlimit_resource_t = 8;
@@ -290,44 +258,17 @@ pub const SIG_UNBLOCK: ::c_int = 1;
290258
pub const POLLWRNORM: ::c_short = 256;
291259
pub const POLLWRBAND: ::c_short = 512;
292260
pub const O_ASYNC: ::c_int = 8192;
293-
pub const O_NDELAY: ::c_int = 2048;
294-
pub const EFD_NONBLOCK: ::c_int = 2048;
295261
pub const F_GETLK: ::c_int = 5;
296262
pub const F_GETOWN: ::c_int = 9;
297263
pub const F_SETOWN: ::c_int = 8;
298-
pub const SFD_NONBLOCK: ::c_int = 2048;
299-
pub const TCSANOW: ::c_int = 0;
300-
pub const TCSADRAIN: ::c_int = 1;
301-
pub const TCSAFLUSH: ::c_int = 2;
302-
pub const TIOCLINUX: ::c_ulong = 21532;
303-
pub const TIOCGSERIAL: ::c_ulong = 21534;
304-
pub const TIOCEXCL: ::c_ulong = 21516;
305-
pub const TIOCNXCL: ::c_ulong = 21517;
306-
pub const TIOCSCTTY: ::c_ulong = 21518;
307-
pub const TIOCSTI: ::c_ulong = 21522;
308-
pub const TIOCMGET: ::c_ulong = 21525;
309-
pub const TIOCMBIS: ::c_ulong = 21526;
310-
pub const TIOCMBIC: ::c_ulong = 21527;
311-
pub const TIOCMSET: ::c_ulong = 21528;
312-
pub const TIOCCONS: ::c_ulong = 21533;
313-
pub const TIOCM_ST: ::c_int = 8;
314-
pub const TIOCM_SR: ::c_int = 16;
315-
pub const TIOCM_CTS: ::c_int = 32;
316-
pub const TIOCM_CAR: ::c_int = 64;
317-
pub const TIOCM_RNG: ::c_int = 128;
318-
pub const TIOCM_DSR: ::c_int = 256;
319264

320-
pub const __SIZEOF_PTHREAD_CONDATTR_T: usize = 4;
321-
pub const __SIZEOF_PTHREAD_MUTEXATTR_T: usize = 4;
322-
pub const __SIZEOF_PTHREAD_BARRIERATTR_T: usize = 4;
323265
pub const O_DIRECT: ::c_int = 16384;
324266
pub const O_DIRECTORY: ::c_int = 65536;
325267
pub const O_NOFOLLOW: ::c_int = 131072;
326268
pub const MAP_HUGETLB: ::c_int = 262144;
327269
pub const MAP_LOCKED: ::c_int = 8192;
328270
pub const MAP_NORESERVE: ::c_int = 16384;
329271
pub const MAP_ANON: ::c_int = 32;
330-
pub const MAP_ANONYMOUS: ::c_int = 32;
331272
pub const MAP_DENYWRITE: ::c_int = 2048;
332273
pub const MAP_EXECUTABLE: ::c_int = 4096;
333274
pub const MAP_POPULATE: ::c_int = 32768;
@@ -340,9 +281,6 @@ pub const ENOTNAM: ::c_int = 118;
340281
pub const ENAVAIL: ::c_int = 119;
341282
pub const EISNAM: ::c_int = 120;
342283
pub const EREMOTEIO: ::c_int = 121;
343-
pub const FIOCLEX: ::c_int = 21585;
344-
pub const FIONCLEX: ::c_int = 21584;
345-
pub const FIONBIO: ::c_int = 21537;
346284
pub const MCL_CURRENT: ::c_int = 1;
347285
pub const MCL_FUTURE: ::c_int = 2;
348286
pub const SIGSTKSZ: ::size_t = 8192;
@@ -398,24 +336,6 @@ pub const BSDLY: ::tcflag_t = 8192;
398336
pub const FFDLY: ::tcflag_t = 32768;
399337
pub const VTDLY: ::tcflag_t = 16384;
400338
pub const XTABS: ::tcflag_t = 6144;
401-
pub const B0: ::speed_t = 0;
402-
pub const B50: ::speed_t = 1;
403-
pub const B75: ::speed_t = 2;
404-
pub const B110: ::speed_t = 3;
405-
pub const B134: ::speed_t = 4;
406-
pub const B150: ::speed_t = 5;
407-
pub const B200: ::speed_t = 6;
408-
pub const B300: ::speed_t = 7;
409-
pub const B600: ::speed_t = 8;
410-
pub const B1200: ::speed_t = 9;
411-
pub const B1800: ::speed_t = 10;
412-
pub const B2400: ::speed_t = 11;
413-
pub const B4800: ::speed_t = 12;
414-
pub const B9600: ::speed_t = 13;
415-
pub const B19200: ::speed_t = 14;
416-
pub const B38400: ::speed_t = 15;
417-
pub const EXTA: ::speed_t = 14;
418-
pub const EXTB: ::speed_t = 15;
419339
pub const B57600: ::speed_t = 4097;
420340
pub const B115200: ::speed_t = 4098;
421341
pub const B230400: ::speed_t = 4099;
@@ -438,27 +358,6 @@ pub const IEXTEN: ::tcflag_t = 32768;
438358
pub const TOSTOP: ::tcflag_t = 256;
439359
pub const FLUSHO: ::tcflag_t = 4096;
440360
pub const EXTPROC: ::tcflag_t = 65536;
441-
pub const TCGETS: ::c_int = 21505;
442-
pub const TCSETS: ::c_int = 21506;
443-
pub const TCSETSW: ::c_int = 21507;
444-
pub const TCSETSF: ::c_int = 21508;
445-
pub const TCGETA: ::c_int = 21509;
446-
pub const TCSETA: ::c_int = 21510;
447-
pub const TCSETAW: ::c_int = 21511;
448-
pub const TCSETAF: ::c_int = 21512;
449-
pub const TCSBRK: ::c_int = 21513;
450-
pub const TCXONC: ::c_int = 21514;
451-
pub const TCFLSH: ::c_int = 21515;
452-
pub const TIOCINQ: ::c_int = 21531;
453-
pub const TIOCGPGRP: ::c_int = 21519;
454-
pub const TIOCSPGRP: ::c_int = 21520;
455-
pub const TIOCOUTQ: ::c_int = 21521;
456-
pub const TIOCGWINSZ: ::c_int = 21523;
457-
pub const TIOCSWINSZ: ::c_int = 21524;
458-
pub const FIONREAD: ::c_int = 21531;
459-
pub const __SIZEOF_PTHREAD_MUTEX_T: usize = 40;
460-
pub const __SIZEOF_PTHREAD_RWLOCK_T: usize = 56;
461-
pub const __SIZEOF_PTHREAD_BARRIER_T: usize = 32;
462361

463362
pub const SYS_read: ::c_long = 63;
464363
pub const SYS_write: ::c_long = 64;

‎src/unix/linux_like/linux/musl/b32/x86/mod.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -116,14 +116,6 @@ s! {
116116
__private: [u32; 22]
117117
}
118118

119-
pub struct siginfo_t {
120-
pub si_signo: ::c_int,
121-
pub si_errno: ::c_int,
122-
pub si_code: ::c_int,
123-
pub _pad: [::c_int; 29],
124-
_align: [usize; 0],
125-
}
126-
127119
pub struct statfs64 {
128120
pub f_type: ::c_ulong,
129121
pub f_bsize: ::c_ulong,

‎src/unix/linux_like/linux/musl/b64/mod.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,6 @@ s! {
105105
pub struct sem_t {
106106
__val: [::c_int; 8],
107107
}
108-
109-
pub struct siginfo_t {
110-
pub si_signo: ::c_int,
111-
pub si_errno: ::c_int,
112-
pub si_code: ::c_int,
113-
pub _pad: [::c_int; 29],
114-
_align: [usize; 0],
115-
}
116108
}
117109

118110
pub const __SIZEOF_PTHREAD_RWLOCK_T: usize = 56;

‎src/unix/linux_like/linux/musl/b64/riscv64/mod.rs

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ pub type __u64 = ::c_ulonglong;
99
pub type __s64 = ::c_longlong;
1010

1111
s! {
12-
pub struct pthread_attr_t {
13-
__size: [::c_ulong; 7],
14-
}
15-
1612
pub struct stat {
1713
pub st_dev: ::dev_t,
1814
pub st_ino: ::ino_t,
@@ -57,34 +53,6 @@ s! {
5753
__unused: [::c_int; 2],
5854
}
5955

60-
pub struct siginfo_t {
61-
pub si_signo: ::c_int,
62-
pub si_errno: ::c_int,
63-
pub si_code: ::c_int,
64-
#[doc(hidden)]
65-
#[deprecated(
66-
since="0.2.54",
67-
note="Please leave a comment on \
68-
https://github.com/rust-lang/libc/pull/1316 if you're using \
69-
this field"
70-
)]
71-
pub _pad: [::c_int; 29],
72-
_align: [u64; 0],
73-
}
74-
75-
pub struct stack_t {
76-
pub ss_sp: *mut ::c_void,
77-
pub ss_flags: ::c_int,
78-
pub ss_size: ::size_t,
79-
}
80-
81-
pub struct sigaction {
82-
pub sa_sigaction: ::sighandler_t,
83-
pub sa_mask: ::sigset_t,
84-
pub sa_flags: ::c_int,
85-
pub sa_restorer: ::Option<unsafe extern "C" fn()>,
86-
}
87-
8856
pub struct ipc_perm {
8957
pub __key: ::key_t,
9058
pub uid: ::uid_t,
@@ -98,19 +66,6 @@ s! {
9866
__unused1: ::c_ulong,
9967
__unused2: ::c_ulong,
10068
}
101-
102-
pub struct shmid_ds {
103-
pub shm_perm: ::ipc_perm,
104-
pub shm_segsz: ::size_t,
105-
pub shm_atime: ::time_t,
106-
pub shm_dtime: ::time_t,
107-
pub shm_ctime: ::time_t,
108-
pub shm_cpid: ::pid_t,
109-
pub shm_lpid: ::pid_t,
110-
pub shm_nattch: ::shmatt_t,
111-
__unused5: ::c_ulong,
112-
__unused6: ::c_ulong,
113-
}
11469
}
11570

11671
pub const SYS_read: ::c_long = 63;

‎src/unix/linux_like/linux/musl/mod.rs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,21 @@ s! {
150150
pub sa_restorer: ::Option<extern fn()>,
151151
}
152152

153+
pub struct siginfo_t {
154+
pub si_signo: ::c_int,
155+
pub si_errno: ::c_int,
156+
pub si_code: ::c_int,
157+
#[doc(hidden)]
158+
#[deprecated(
159+
since="0.2.54",
160+
note="Please leave a comment on \
161+
https://github.com/rust-lang/libc/pull/1316 if you're using \
162+
this field"
163+
)]
164+
pub _pad: [::c_int; 29],
165+
_align: [usize; 0],
166+
}
167+
153168
pub struct statvfs {
154169
pub f_bsize: ::c_ulong,
155170
pub f_frsize: ::c_ulong,

0 commit comments

Comments
 (0)