Skip to content

Commit f5105c6

Browse files
authored
Merge pull request #4335 from 12101111/fix-rv32-musl
Fix constants of RISC-V32 musl
2 parents fdeca3b + 60a445c commit f5105c6

File tree

1 file changed

+28
-32
lines changed
  • src/unix/linux_like/linux/musl/b32/riscv32

1 file changed

+28
-32
lines changed

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

Lines changed: 28 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ s_no_extra_traits! {
111111

112112
//pub const RLIM_INFINITY: crate::rlim_t = !0;
113113
pub const VEOF: usize = 4;
114-
pub const RTLD_DEEPBIND: c_int = 0x8;
115114
//pub const RLIMIT_RSS: crate::__rlimit_resource_t = 5;
116115
//pub const RLIMIT_AS: crate::__rlimit_resource_t = 9;
117116
//pub const RLIMIT_MEMLOCK: crate::__rlimit_resource_t = 8;
@@ -125,7 +124,6 @@ pub const O_NONBLOCK: c_int = 2048;
125124
pub const O_SYNC: c_int = 1052672;
126125
pub const O_RSYNC: c_int = 1052672;
127126
pub const O_DSYNC: c_int = 4096;
128-
pub const O_FSYNC: c_int = 1052672;
129127
pub const MAP_GROWSDOWN: c_int = 256;
130128
pub const EDEADLK: c_int = 35;
131129
pub const ENAMETOOLONG: c_int = 36;
@@ -209,7 +207,7 @@ pub const ERFKILL: c_int = 132;
209207

210208
pub const SOCK_STREAM: c_int = 1;
211209
pub const SOCK_DGRAM: c_int = 2;
212-
pub const SA_ONSTACK: c_int = 8;
210+
pub const SA_ONSTACK: c_int = 0x08000000;
213211
pub const SA_SIGINFO: c_int = 4;
214212
pub const SA_NOCLDWAIT: c_int = 2;
215213
pub const SIGTTIN: c_int = 21;
@@ -346,7 +344,7 @@ pub const EXTPROC: crate::tcflag_t = 65536;
346344
pub const SYS_read: c_long = 63;
347345
pub const SYS_write: c_long = 64;
348346
pub const SYS_close: c_long = 57;
349-
pub const SYS_fstat: c_long = 80;
347+
// RISC-V don't have SYS_fstat, use statx instead.
350348
pub const SYS_lseek: c_long = 62;
351349
pub const SYS_mmap: c_long = 222;
352350
pub const SYS_mprotect: c_long = 226;
@@ -369,7 +367,6 @@ pub const SYS_shmget: c_long = 194;
369367
pub const SYS_shmat: c_long = 196;
370368
pub const SYS_shmctl: c_long = 195;
371369
pub const SYS_dup: c_long = 23;
372-
pub const SYS_nanosleep: c_long = 101;
373370
pub const SYS_getitimer: c_long = 102;
374371
pub const SYS_setitimer: c_long = 103;
375372
pub const SYS_getpid: c_long = 172;
@@ -392,7 +389,7 @@ pub const SYS_getsockopt: c_long = 209;
392389
pub const SYS_clone: c_long = 220;
393390
pub const SYS_execve: c_long = 221;
394391
pub const SYS_exit: c_long = 93;
395-
pub const SYS_wait4: c_long = 260;
392+
// RISC-V don't have wait4, use waitid instead.
396393
pub const SYS_kill: c_long = 129;
397394
pub const SYS_uname: c_long = 160;
398395
pub const SYS_semget: c_long = 190;
@@ -415,8 +412,8 @@ pub const SYS_fchdir: c_long = 50;
415412
pub const SYS_fchmod: c_long = 52;
416413
pub const SYS_fchown: c_long = 55;
417414
pub const SYS_umask: c_long = 166;
418-
pub const SYS_gettimeofday: c_long = 169;
419-
pub const SYS_getrlimit: c_long = 163;
415+
// RISC-V don't have gettimeofday, use clock_gettime64 instead.
416+
// RISC-V don't have getrlimit, use prlimit64 instead.
420417
pub const SYS_getrusage: c_long = 165;
421418
pub const SYS_sysinfo: c_long = 179;
422419
pub const SYS_times: c_long = 153;
@@ -446,7 +443,7 @@ pub const SYS_getsid: c_long = 156;
446443
pub const SYS_capget: c_long = 90;
447444
pub const SYS_capset: c_long = 91;
448445
pub const SYS_rt_sigpending: c_long = 136;
449-
pub const SYS_rt_sigtimedwait: c_long = 137;
446+
pub const SYS_rt_sigtimedwait_time64: c_long = 421;
450447
pub const SYS_rt_sigqueueinfo: c_long = 138;
451448
pub const SYS_rt_sigsuspend: c_long = 133;
452449
pub const SYS_sigaltstack: c_long = 132;
@@ -461,20 +458,19 @@ pub const SYS_sched_setscheduler: c_long = 119;
461458
pub const SYS_sched_getscheduler: c_long = 120;
462459
pub const SYS_sched_get_priority_max: c_long = 125;
463460
pub const SYS_sched_get_priority_min: c_long = 126;
464-
pub const SYS_sched_rr_get_interval: c_long = 127;
461+
pub const SYS_sched_rr_get_interval_time64: c_long = 423;
465462
pub const SYS_mlock: c_long = 228;
466463
pub const SYS_munlock: c_long = 229;
467464
pub const SYS_mlockall: c_long = 230;
468465
pub const SYS_munlockall: c_long = 231;
469466
pub const SYS_vhangup: c_long = 58;
470467
pub const SYS_pivot_root: c_long = 41;
471468
pub const SYS_prctl: c_long = 167;
472-
pub const SYS_adjtimex: c_long = 171;
473-
pub const SYS_setrlimit: c_long = 164;
469+
// RISC-V don't have setrlimit, use prlimit64 instead.
474470
pub const SYS_chroot: c_long = 51;
475471
pub const SYS_sync: c_long = 81;
476472
pub const SYS_acct: c_long = 89;
477-
pub const SYS_settimeofday: c_long = 170;
473+
// RISC-V don't have settimeofday, use clock_settime64 instead.
478474
pub const SYS_mount: c_long = 40;
479475
pub const SYS_umount2: c_long = 39;
480476
pub const SYS_swapon: c_long = 224;
@@ -501,30 +497,30 @@ pub const SYS_removexattr: c_long = 14;
501497
pub const SYS_lremovexattr: c_long = 15;
502498
pub const SYS_fremovexattr: c_long = 16;
503499
pub const SYS_tkill: c_long = 130;
504-
pub const SYS_futex: c_long = 98;
500+
pub const SYS_futex_time64: c_long = 422;
505501
pub const SYS_sched_setaffinity: c_long = 122;
506502
pub const SYS_sched_getaffinity: c_long = 123;
507503
pub const SYS_io_setup: c_long = 0;
508504
pub const SYS_io_destroy: c_long = 1;
509-
pub const SYS_io_getevents: c_long = 4;
505+
pub const SYS_io_pgetevents_time64: c_long = 416;
510506
pub const SYS_io_submit: c_long = 2;
511507
pub const SYS_io_cancel: c_long = 3;
512508
pub const SYS_lookup_dcookie: c_long = 18;
513509
pub const SYS_remap_file_pages: c_long = 234;
514510
pub const SYS_getdents64: c_long = 61;
515511
pub const SYS_set_tid_address: c_long = 96;
516512
pub const SYS_restart_syscall: c_long = 128;
517-
pub const SYS_semtimedop: c_long = 192;
513+
pub const SYS_semtimedop_time64: c_long = 420;
518514
pub const SYS_fadvise64: c_long = 223;
519515
pub const SYS_timer_create: c_long = 107;
520-
pub const SYS_timer_settime: c_long = 110;
521-
pub const SYS_timer_gettime: c_long = 108;
516+
pub const SYS_timer_settime64: c_long = 409;
517+
pub const SYS_timer_gettime64: c_long = 408;
522518
pub const SYS_timer_getoverrun: c_long = 109;
523519
pub const SYS_timer_delete: c_long = 111;
524-
pub const SYS_clock_settime: c_long = 112;
525-
pub const SYS_clock_gettime: c_long = 113;
526-
pub const SYS_clock_getres: c_long = 114;
527-
pub const SYS_clock_nanosleep: c_long = 115;
520+
pub const SYS_clock_settime64: c_long = 404;
521+
pub const SYS_clock_gettime64: c_long = 403;
522+
pub const SYS_clock_getres_time64: c_long = 406;
523+
pub const SYS_clock_nanosleep_time64: c_long = 407;
528524
pub const SYS_exit_group: c_long = 94;
529525
pub const SYS_epoll_ctl: c_long = 21;
530526
pub const SYS_tgkill: c_long = 131;
@@ -533,8 +529,8 @@ pub const SYS_set_mempolicy: c_long = 237;
533529
pub const SYS_get_mempolicy: c_long = 236;
534530
pub const SYS_mq_open: c_long = 180;
535531
pub const SYS_mq_unlink: c_long = 181;
536-
pub const SYS_mq_timedsend: c_long = 182;
537-
pub const SYS_mq_timedreceive: c_long = 183;
532+
pub const SYS_mq_timedsend_time64: c_long = 418;
533+
pub const SYS_mq_timedreceive_time64: c_long = 419;
538534
pub const SYS_mq_notify: c_long = 184;
539535
pub const SYS_mq_getsetattr: c_long = 185;
540536
pub const SYS_kexec_load: c_long = 104;
@@ -551,15 +547,15 @@ pub const SYS_openat: c_long = 56;
551547
pub const SYS_mkdirat: c_long = 34;
552548
pub const SYS_mknodat: c_long = 33;
553549
pub const SYS_fchownat: c_long = 54;
554-
pub const SYS_newfstatat: c_long = 79;
550+
// RISC-V don't have newfstatat, use statx instead.
555551
pub const SYS_unlinkat: c_long = 35;
556552
pub const SYS_linkat: c_long = 37;
557553
pub const SYS_symlinkat: c_long = 36;
558554
pub const SYS_readlinkat: c_long = 78;
559555
pub const SYS_fchmodat: c_long = 53;
560556
pub const SYS_faccessat: c_long = 48;
561-
pub const SYS_pselect6: c_long = 72;
562-
pub const SYS_ppoll: c_long = 73;
557+
pub const SYS_pselect6_time64: c_long = 413;
558+
pub const SYS_ppoll_time64: c_long = 414;
563559
pub const SYS_unshare: c_long = 97;
564560
pub const SYS_set_robust_list: c_long = 99;
565561
pub const SYS_get_robust_list: c_long = 100;
@@ -568,12 +564,12 @@ pub const SYS_tee: c_long = 77;
568564
pub const SYS_sync_file_range: c_long = 84;
569565
pub const SYS_vmsplice: c_long = 75;
570566
pub const SYS_move_pages: c_long = 239;
571-
pub const SYS_utimensat: c_long = 88;
567+
pub const SYS_utimensat_time64: c_long = 412;
572568
pub const SYS_epoll_pwait: c_long = 22;
573569
pub const SYS_timerfd_create: c_long = 85;
574570
pub const SYS_fallocate: c_long = 47;
575-
pub const SYS_timerfd_settime: c_long = 86;
576-
pub const SYS_timerfd_gettime: c_long = 87;
571+
pub const SYS_timerfd_settime64: c_long = 411;
572+
pub const SYS_timerfd_gettime64: c_long = 410;
577573
pub const SYS_accept4: c_long = 242;
578574
pub const SYS_signalfd4: c_long = 74;
579575
pub const SYS_eventfd2: c_long = 19;
@@ -585,13 +581,13 @@ pub const SYS_preadv: c_long = 69;
585581
pub const SYS_pwritev: c_long = 70;
586582
pub const SYS_rt_tgsigqueueinfo: c_long = 240;
587583
pub const SYS_perf_event_open: c_long = 241;
588-
pub const SYS_recvmmsg: c_long = 243;
584+
pub const SYS_recvmmsg_time64: c_long = 417;
589585
pub const SYS_fanotify_init: c_long = 262;
590586
pub const SYS_fanotify_mark: c_long = 263;
591587
pub const SYS_prlimit64: c_long = 261;
592588
pub const SYS_name_to_handle_at: c_long = 264;
593589
pub const SYS_open_by_handle_at: c_long = 265;
594-
pub const SYS_clock_adjtime: c_long = 266;
590+
pub const SYS_clock_adjtime64: c_long = 405;
595591
pub const SYS_syncfs: c_long = 267;
596592
pub const SYS_sendmmsg: c_long = 269;
597593
pub const SYS_setns: c_long = 268;

0 commit comments

Comments
 (0)