Skip to content

Commit 6ac75c1

Browse files
Alexander Polakovroot
Alexander Polakov
authored and
root
committed
Fix mips fallout on new toolchain
1 parent 2cdb21e commit 6ac75c1

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

src/unix/notbsd/linux/mips.rs

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ s! {
6363
}
6464

6565
pub struct sigaction {
66-
pub sa_flags: ::c_uint,
66+
pub sa_flags: ::c_int,
6767
pub sa_sigaction: ::sighandler_t,
6868
pub sa_mask: sigset_t,
6969
_restorer: *mut ::c_void,
@@ -190,18 +190,18 @@ pub const RLIMIT_AS: ::c_int = 6;
190190
pub const RLIMIT_RSS: ::c_int = 7;
191191
pub const RLIMIT_NPROC: ::c_int = 8;
192192
pub const RLIMIT_MEMLOCK: ::c_int = 9;
193-
pub const RLIMIT_NLIMITS: ::c_int = 15;
193+
pub const RLIMIT_NLIMITS: ::c_int = 16;
194194
pub const RLIM_INFINITY: ::rlim_t = 0x7fffffff;
195195

196196
pub const O_APPEND: ::c_int = 8;
197197
pub const O_CREAT: ::c_int = 256;
198198
pub const O_EXCL: ::c_int = 1024;
199199
pub const O_NOCTTY: ::c_int = 2048;
200200
pub const O_NONBLOCK: ::c_int = 128;
201-
pub const O_SYNC: ::c_int = 0x10;
202-
pub const O_RSYNC: ::c_int = 0x10;
201+
pub const O_SYNC: ::c_int = 0x4010;
202+
pub const O_RSYNC: ::c_int = 0x4010;
203203
pub const O_DSYNC: ::c_int = 0x10;
204-
pub const O_FSYNC: ::c_int = 0x10;
204+
pub const O_FSYNC: ::c_int = 0x4010;
205205
pub const O_ASYNC: ::c_int = 0x1000;
206206
pub const O_NDELAY: ::c_int = 0x80;
207207

@@ -357,6 +357,7 @@ pub const SIG_UNBLOCK: ::c_int = 0x2;
357357
pub const PTHREAD_STACK_MIN: ::size_t = 131072;
358358

359359
pub const MS_VERBOSE: ::c_ulong = 0x8000;
360+
pub const MS_RMT_MASK: ::c_ulong = 0x2800051;
360361

361362
pub const ADFS_SUPER_MAGIC: ::c_long = 0x0000adf5;
362363
pub const AFFS_SUPER_MAGIC: ::c_long = 0x0000adff;
@@ -454,7 +455,7 @@ extern {
454455
hostlen: ::socklen_t,
455456
serv: *mut ::c_char,
456457
sevlen: ::socklen_t,
457-
flags: ::c_uint) -> ::c_int;
458-
pub fn eventfd(init: ::c_int, flags: ::c_int) -> ::c_int;
458+
flags: ::c_int) -> ::c_int;
459+
pub fn eventfd(init: ::c_uint, flags: ::c_int) -> ::c_int;
459460
pub fn ptrace(request: ::c_uint, ...) -> ::c_long;
460461
}

src/unix/notbsd/linux/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,6 @@ pub const MS_RELATIME: ::c_ulong = 0x200000;
368368
pub const MS_KERNMOUNT: ::c_ulong = 0x400000;
369369
pub const MS_I_VERSION: ::c_ulong = 0x800000;
370370
pub const MS_STRICTATIME: ::c_ulong = 0x01000000;
371-
pub const MS_RMT_MASK: ::c_ulong = 0x800051;
372371

373372
pub const EPOLLRDHUP: ::c_int = 0x2000;
374373
pub const EPOLLONESHOT: ::c_int = 0x40000000;

src/unix/notbsd/linux/musl.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,7 @@ pub const EPOLLWAKEUP: ::c_int = 0x20000000;
394394

395395
pub const MS_NOSEC: ::c_ulong = 0x10000000;
396396
pub const MS_BORN: ::c_ulong = 0x20000000;
397+
pub const MS_RMT_MASK: ::c_ulong = 0x800051;
397398

398399
pub const MADV_HUGEPAGE: ::c_int = 14;
399400
pub const MADV_NOHUGEPAGE: ::c_int = 15;

src/unix/notbsd/linux/other/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,7 @@ pub const ST_RELATIME: ::c_ulong = 4096;
284284
pub const NI_MAXHOST: ::socklen_t = 1025;
285285

286286
pub const MS_VERBOSE: ::c_ulong = 0x8000;
287+
pub const MS_RMT_MASK: ::c_ulong = 0x800051;
287288

288289
pub const ADFS_SUPER_MAGIC: ::c_long = 0x0000adf5;
289290
pub const AFFS_SUPER_MAGIC: ::c_long = 0x0000adff;

0 commit comments

Comments
 (0)