Skip to content

Commit 1c97b77

Browse files
gnzlbggnzlbg
committed
Correct bugs in mips, mips64 and s390x
1 parent 4f78d5d commit 1c97b77

File tree

12 files changed

+44
-98
lines changed

12 files changed

+44
-98
lines changed

‎src/unix/linux_like/linux/gnu/b32/arm.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ pub const RLIMIT_RSS: ::__rlimit_resource_t = 5;
175175
pub const RLIMIT_AS: ::__rlimit_resource_t = 9;
176176
pub const RLIMIT_MEMLOCK: ::__rlimit_resource_t = 8;
177177

178+
pub const MADV_SOFT_OFFLINE: ::c_int = 101;
178179
pub const MAP_LOCKED: ::c_int = 0x02000;
179180
pub const MAP_NORESERVE: ::c_int = 0x04000;
180181
pub const MAP_ANON: ::c_int = 0x0020;

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ pub type suseconds_t = i32;
1010
pub type ino_t = u32;
1111
pub type off_t = i32;
1212
pub type blkcnt_t = i32;
13-
pub type __fsword_t = i32;
1413

1514
pub type fsblkcnt_t = ::c_ulong;
1615
pub type fsfilcnt_t = ::c_ulong;
@@ -21,10 +20,15 @@ pub type msglen_t = ::c_ulong;
2120
pub type blksize_t = i32;
2221
pub type nlink_t = u32;
2322
pub type __u64 = ::c_ulonglong;
23+
pub type __fsword_t = i32;
2424

2525
s! {
2626
pub struct stat {
27+
#[cfg(not(target_arch = "mips"))]
2728
pub st_dev: ::dev_t,
29+
#[cfg(target_arch = "mips")]
30+
pub st_dev: ::c_ulong,
31+
2832
#[cfg(not(target_arch = "mips"))]
2933
__pad1: ::c_short,
3034
#[cfg(target_arch = "mips")]
@@ -34,7 +38,10 @@ s! {
3438
pub st_nlink: ::nlink_t,
3539
pub st_uid: ::uid_t,
3640
pub st_gid: ::gid_t,
41+
#[cfg(not(target_arch = "mips"))]
3742
pub st_rdev: ::dev_t,
43+
#[cfg(target_arch = "mips")]
44+
pub st_rdev: ::c_ulong,
3845
#[cfg(not(target_arch = "mips"))]
3946
__pad2: ::c_short,
4047
#[cfg(target_arch = "mips")]

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ pub const TIOCM_CAR: ::c_int = 0x040;
176176
pub const TIOCM_RNG: ::c_int = 0x080;
177177
pub const TIOCM_DSR: ::c_int = 0x100;
178178

179+
pub const MADV_SOFT_OFFLINE: ::c_int = 101;
179180
pub const MAP_LOCKED: ::c_int = 0x00080;
180181
pub const MAP_NORESERVE: ::c_int = 0x00040;
181182
pub const MAP_ANON: ::c_int = 0x0020;

‎src/unix/linux_like/linux/gnu/b32/x86.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,7 @@ pub const RLIMIT_MEMLOCK: ::__rlimit_resource_t = 8;
378378

379379
pub const SOL_SOCKET: ::c_int = 1;
380380

381+
pub const MADV_SOFT_OFFLINE: ::c_int = 101;
381382
pub const MAP_LOCKED: ::c_int = 0x02000;
382383
pub const MAP_NORESERVE: ::c_int = 0x04000;
383384
pub const MAP_32BIT: ::c_int = 0x0040;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@ pub const O_NOATIME: ::c_int = 0o1000000;
212212
pub const O_PATH: ::c_int = 0o10000000;
213213
pub const O_TMPFILE: ::c_int = 0o20000000 | O_DIRECTORY;
214214

215+
pub const MADV_SOFT_OFFLINE: ::c_int = 101;
215216
pub const MAP_GROWSDOWN: ::c_int = 0x0100;
216217

217218
pub const EUCLEAN: ::c_int = 117;

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -161,19 +161,6 @@ s! {
161161
__unused5: ::c_ulong
162162
}
163163

164-
pub struct glob64_t {
165-
pub gl_pathc: ::size_t,
166-
pub gl_pathv: *mut *mut ::c_char,
167-
pub gl_offs: ::size_t,
168-
pub gl_flags: ::c_int,
169-
170-
__unused1: *mut ::c_void,
171-
__unused2: *mut ::c_void,
172-
__unused3: *mut ::c_void,
173-
__unused4: *mut ::c_void,
174-
__unused5: *mut ::c_void,
175-
}
176-
177164
pub struct termios2 {
178165
pub c_iflag: ::tcflag_t,
179166
pub c_oflag: ::tcflag_t,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ pub type time_t = i64;
55
pub type ino_t = u64;
66
pub type off_t = i64;
77
pub type blkcnt_t = i64;
8-
pub type __fsword_t = i64;
98
pub type shmatt_t = u64;
109
pub type msgqnum_t = u64;
1110
pub type msglen_t = u64;
1211
pub type fsblkcnt_t = u64;
1312
pub type fsfilcnt_t = u64;
1413
pub type rlim_t = u64;
14+
pub type __fsword_t = i64;
1515

1616
s! {
1717
pub struct sigset_t {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ pub const O_NOATIME: ::c_int = 0o1000000;
196196
pub const O_PATH: ::c_int = 0o10000000;
197197
pub const O_TMPFILE: ::c_int = 0o20000000 | O_DIRECTORY;
198198

199+
pub const MADV_SOFT_OFFLINE: ::c_int = 101;
199200
pub const MAP_GROWSDOWN: ::c_int = 0x0100;
200201
pub const MAP_ANON: ::c_int = 0x0020;
201202
pub const MAP_ANONYMOUS: ::c_int = 0x0020;

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

Lines changed: 1 addition & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,7 @@ pub const O_DIRECT: ::c_int = 0x4000;
368368
pub const O_DIRECTORY: ::c_int = 0x10000;
369369
pub const O_NOFOLLOW: ::c_int = 0x20000;
370370

371+
pub const MADV_SOFT_OFFLINE: ::c_int = 101;
371372
pub const MAP_GROWSDOWN: ::c_int = 0x0100;
372373
pub const MAP_LOCKED: ::c_int = 0x02000;
373374
pub const MAP_NORESERVE: ::c_int = 0x04000;
@@ -496,81 +497,6 @@ pub const SIGPWR: ::c_int = 30;
496497
pub const SIG_BLOCK: ::c_int = 0x000000;
497498
pub const SIG_UNBLOCK: ::c_int = 0x01;
498499

499-
pub const _SC_EQUIV_CLASS_MAX: ::c_int = 41;
500-
pub const _SC_CHARCLASS_NAME_MAX: ::c_int = 45;
501-
pub const _SC_PII: ::c_int = 53;
502-
pub const _SC_PII_XTI: ::c_int = 54;
503-
pub const _SC_PII_SOCKET: ::c_int = 55;
504-
pub const _SC_PII_INTERNET: ::c_int = 56;
505-
pub const _SC_PII_OSI: ::c_int = 57;
506-
pub const _SC_POLL: ::c_int = 58;
507-
pub const _SC_SELECT: ::c_int = 59;
508-
pub const _SC_PII_INTERNET_STREAM: ::c_int = 61;
509-
pub const _SC_PII_INTERNET_DGRAM: ::c_int = 62;
510-
pub const _SC_PII_OSI_COTS: ::c_int = 63;
511-
pub const _SC_PII_OSI_CLTS: ::c_int = 64;
512-
pub const _SC_PII_OSI_M: ::c_int = 65;
513-
pub const _SC_T_IOV_MAX: ::c_int = 66;
514-
pub const _SC_2_C_VERSION: ::c_int = 96;
515-
pub const _SC_CHAR_BIT: ::c_int = 101;
516-
pub const _SC_CHAR_MAX: ::c_int = 102;
517-
pub const _SC_CHAR_MIN: ::c_int = 103;
518-
pub const _SC_INT_MAX: ::c_int = 104;
519-
pub const _SC_INT_MIN: ::c_int = 105;
520-
pub const _SC_LONG_BIT: ::c_int = 106;
521-
pub const _SC_WORD_BIT: ::c_int = 107;
522-
pub const _SC_MB_LEN_MAX: ::c_int = 108;
523-
pub const _SC_SSIZE_MAX: ::c_int = 110;
524-
pub const _SC_SCHAR_MAX: ::c_int = 111;
525-
pub const _SC_SCHAR_MIN: ::c_int = 112;
526-
pub const _SC_SHRT_MAX: ::c_int = 113;
527-
pub const _SC_SHRT_MIN: ::c_int = 114;
528-
pub const _SC_UCHAR_MAX: ::c_int = 115;
529-
pub const _SC_UINT_MAX: ::c_int = 116;
530-
pub const _SC_ULONG_MAX: ::c_int = 117;
531-
pub const _SC_USHRT_MAX: ::c_int = 118;
532-
pub const _SC_NL_ARGMAX: ::c_int = 119;
533-
pub const _SC_NL_LANGMAX: ::c_int = 120;
534-
pub const _SC_NL_MSGMAX: ::c_int = 121;
535-
pub const _SC_NL_NMAX: ::c_int = 122;
536-
pub const _SC_NL_SETMAX: ::c_int = 123;
537-
pub const _SC_NL_TEXTMAX: ::c_int = 124;
538-
pub const _SC_BASE: ::c_int = 134;
539-
pub const _SC_C_LANG_SUPPORT: ::c_int = 135;
540-
pub const _SC_C_LANG_SUPPORT_R: ::c_int = 136;
541-
pub const _SC_DEVICE_IO: ::c_int = 140;
542-
pub const _SC_DEVICE_SPECIFIC: ::c_int = 141;
543-
pub const _SC_DEVICE_SPECIFIC_R: ::c_int = 142;
544-
pub const _SC_FD_MGMT: ::c_int = 143;
545-
pub const _SC_FIFO: ::c_int = 144;
546-
pub const _SC_PIPE: ::c_int = 145;
547-
pub const _SC_FILE_ATTRIBUTES: ::c_int = 146;
548-
pub const _SC_FILE_LOCKING: ::c_int = 147;
549-
pub const _SC_FILE_SYSTEM: ::c_int = 148;
550-
pub const _SC_MULTI_PROCESS: ::c_int = 150;
551-
pub const _SC_SINGLE_PROCESS: ::c_int = 151;
552-
pub const _SC_NETWORKING: ::c_int = 152;
553-
pub const _SC_REGEX_VERSION: ::c_int = 156;
554-
pub const _SC_SIGNALS: ::c_int = 158;
555-
pub const _SC_SYSTEM_DATABASE: ::c_int = 162;
556-
pub const _SC_SYSTEM_DATABASE_R: ::c_int = 163;
557-
pub const _SC_USER_GROUPS: ::c_int = 166;
558-
pub const _SC_USER_GROUPS_R: ::c_int = 167;
559-
pub const _SC_LEVEL1_ICACHE_SIZE: ::c_int = 185;
560-
pub const _SC_LEVEL1_ICACHE_ASSOC: ::c_int = 186;
561-
pub const _SC_LEVEL1_ICACHE_LINESIZE: ::c_int = 187;
562-
pub const _SC_LEVEL1_DCACHE_SIZE: ::c_int = 188;
563-
pub const _SC_LEVEL1_DCACHE_ASSOC: ::c_int = 189;
564-
pub const _SC_LEVEL1_DCACHE_LINESIZE: ::c_int = 190;
565-
pub const _SC_LEVEL2_CACHE_SIZE: ::c_int = 191;
566-
pub const _SC_LEVEL2_CACHE_ASSOC: ::c_int = 192;
567-
pub const _SC_LEVEL2_CACHE_LINESIZE: ::c_int = 193;
568-
pub const _SC_LEVEL3_CACHE_SIZE: ::c_int = 194;
569-
pub const _SC_LEVEL3_CACHE_ASSOC: ::c_int = 195;
570-
pub const _SC_LEVEL3_CACHE_LINESIZE: ::c_int = 196;
571-
pub const _SC_LEVEL4_CACHE_SIZE: ::c_int = 197;
572-
pub const _SC_LEVEL4_CACHE_ASSOC: ::c_int = 198;
573-
pub const _SC_LEVEL4_CACHE_LINESIZE: ::c_int = 199;
574500
pub const O_ASYNC: ::c_int = 0x2000;
575501
pub const O_NDELAY: ::c_int = 0x800;
576502

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,7 @@ pub const O_NOATIME: ::c_int = 0x200000;
209209
pub const O_PATH: ::c_int = 0x1000000;
210210
pub const O_TMPFILE: ::c_int = 0x2000000 | O_DIRECTORY;
211211

212+
pub const MADV_SOFT_OFFLINE: ::c_int = 101;
212213
pub const MAP_GROWSDOWN: ::c_int = 0x0200;
213214
pub const MAP_ANON: ::c_int = 0x0020;
214215
pub const MAP_ANONYMOUS: ::c_int = 0x0020;

0 commit comments

Comments
 (0)