internally, define time64 rusage syscalls on x32 as the existing ones

[musl] / arch / x32 / syscall_arch.h

diff --git a/arch/x32/syscall_arch.h b/arch/x32/syscall_arch.h
index 39a0325..e0111cc 100644 (file)
--- a/arch/x32/syscall_arch.h
+++ b/arch/x32/syscall_arch.h
@@ -3,9 +3,6 @@
 
 #define __scc(X) sizeof(1?(X):0ULL) < 8 ? (unsigned long) (X) : (long long) (X)
 typedef long long syscall_arg_t;
-struct __timespec { long long tv_sec; long tv_nsec; };
-struct __timespec_kernel { long long tv_sec; long long tv_nsec; };
-#define __tsc(X) ((struct __timespec*)(unsigned long)(X))
 
 static __inline long __syscall0(long long n)
 {
@@ -24,16 +21,6 @@ static __inline long __syscall1(long long n, long long a1)
 static __inline long __syscall2(long long n, long long a1, long long a2)
 {
        unsigned long ret;
-       struct __timespec *ts2 = 0;
-       switch (n) {
-       case SYS_nanosleep:
-               if(a1) a1 = (unsigned long) (&(struct __timespec_kernel) {
-               .tv_sec = __tsc(a1)->tv_sec, .tv_nsec = __tsc(a1)->tv_nsec});
-               break;
-       case SYS_clock_settime:
-               if(a2) a2 = (unsigned long) (&(struct __timespec_kernel) {
-               .tv_sec = __tsc(a2)->tv_sec, .tv_nsec = __tsc(a2)->tv_nsec});
-       }
        __asm__ __volatile__ ("syscall" : "=a"(ret) : "a"(n), "D"(a1), "S"(a2)
                                        : "rcx", "r11", "memory");
        return ret;
@@ -48,74 +35,59 @@ static __inline long __syscall3(long long n, long long a1, long long a2, long lo
 }
 
 static __inline long __syscall4(long long n, long long a1, long long a2, long long a3,
-                                     long long a4)
+                                     long long a4_)
 {
        unsigned long ret;
-       register long long r10 __asm__("r10") = a4;
-       switch (n) {
-       case SYS_futex:
-               if((a2 & (~128 /* FUTEX_PRIVATE_FLAG */)) == 0 /* FUTEX_WAIT */) {
-                       if(r10) r10 = (unsigned long) (&(struct __timespec_kernel) {
-                       .tv_sec = __tsc(r10)->tv_sec, .tv_nsec = __tsc(r10)->tv_nsec});
-               }
-               break;
-       case SYS_utimensat:
-               if(a3) a3 = (unsigned long) ((struct __timespec_kernel[2]) {
-               [0] = {.tv_sec = __tsc(a3)[0].tv_sec, .tv_nsec = __tsc(a3)[0].tv_nsec},
-               [1] = {.tv_sec = __tsc(a3)[1].tv_sec, .tv_nsec = __tsc(a3)[1].tv_nsec},
-               });
-               break;
-       case SYS_clock_nanosleep:
-       case SYS_rt_sigtimedwait: case SYS_ppoll:
-               if(a3) a3 = (unsigned long) (&(struct __timespec_kernel) {
-               .tv_sec = __tsc(a3)->tv_sec, .tv_nsec = __tsc(a3)->tv_nsec});
-       }
+       register long long a4 __asm__("r10") = a4_;
        __asm__ __volatile__ ("syscall" : "=a"(ret) : "a"(n), "D"(a1), "S"(a2),
-                                         "d"(a3), "r"(r10): "rcx", "r11", "memory");
+                                         "d"(a3), "r"(a4): "rcx", "r11", "memory");
        return ret;
 }
 
 static __inline long __syscall5(long long n, long long a1, long long a2, long long a3,
-                                     long long a4, long long a5)
+                                     long long a4_, long long a5_)
 {
        unsigned long ret;
-       register long long r10 __asm__("r10") = a4;
-       register long long r8 __asm__("r8") = a5;
-       switch (n) {
-       case SYS_futex:
-               if((a2 & (~128 /* FUTEX_PRIVATE_FLAG */)) == 0 /* FUTEX_WAIT */) {
-                       if(r10) r10 = (unsigned long) (&(struct __timespec_kernel) {
-                       .tv_sec = __tsc(r10)->tv_sec, .tv_nsec = __tsc(r10)->tv_nsec});
-               }
-               break;
-       case SYS_mq_timedsend: case SYS_mq_timedreceive:
-               if(r8) r8 = (unsigned long) (&(struct __timespec_kernel) {
-               .tv_sec = __tsc(r8)->tv_sec, .tv_nsec = __tsc(r8)->tv_nsec});
-       }
+       register long long a4 __asm__("r10") = a4_;
+       register long long a5 __asm__("r8") = a5_;
        __asm__ __volatile__ ("syscall" : "=a"(ret) : "a"(n), "D"(a1), "S"(a2),
-                                         "d"(a3), "r"(r10), "r"(r8) : "rcx", "r11", "memory");
+                                         "d"(a3), "r"(a4), "r"(a5) : "rcx", "r11", "memory");
        return ret;
 }
 
 static __inline long __syscall6(long long n, long long a1, long long a2, long long a3,
-                                     long long a4, long long a5, long long a6)
+                                     long long a4_, long long a5_, long long a6_)
 {
        unsigned long ret;
-       register long long r10 __asm__("r10") = a4;
-       register long long r8 __asm__("r8") = a5;
-       register long long r9 __asm__("r9") = a6;
-       switch (n) {
-       case SYS_futex:
-               if((a2 & (~128 /* FUTEX_PRIVATE_FLAG */)) == 0 /* FUTEX_WAIT */) {
-                       if(r10) r10 = (unsigned long) (&(struct __timespec_kernel) {
-                       .tv_sec = __tsc(r10)->tv_sec, .tv_nsec = __tsc(r10)->tv_nsec});
-               }
-               break;
-       case SYS_pselect6:
-               if(r8) r8 = (unsigned long) (&(struct __timespec_kernel) {
-               .tv_sec = __tsc(r8)->tv_sec, .tv_nsec = __tsc(r8)->tv_nsec});
-       }
+       register long long a4 __asm__("r10") = a4_;
+       register long long a5 __asm__("r8") = a5_;
+       register long long a6 __asm__("r9") = a6_;
        __asm__ __volatile__ ("syscall" : "=a"(ret) : "a"(n), "D"(a1), "S"(a2),
-                                         "d"(a3), "r"(r10), "r"(r8), "r"(r9) : "rcx", "r11", "memory");
+                                         "d"(a3), "r"(a4), "r"(a5), "r"(a6) : "rcx", "r11", "memory");
        return ret;
 }
+
+#undef SYS_futimesat
+
+#define SYS_clock_gettime64 SYS_clock_gettime
+#define SYS_clock_settime64 SYS_clock_settime
+#define SYS_clock_adjtime64 SYS_clock_adjtime
+#define SYS_clock_nanosleep_time64 SYS_clock_nanosleep
+#define SYS_timer_gettime64 SYS_timer_gettime
+#define SYS_timer_settime64 SYS_timer_settime
+#define SYS_timerfd_gettime64 SYS_timerfd_gettime
+#define SYS_timerfd_settime64 SYS_timerfd_settime
+#define SYS_utimensat_time64 SYS_utimensat
+#define SYS_pselect6_time64 SYS_pselect6
+#define SYS_ppoll_time64 SYS_ppoll
+#define SYS_recvmmsg_time64 SYS_recvmmsg
+#define SYS_mq_timedsend_time64 SYS_mq_timedsend
+#define SYS_mq_timedreceive_time64 SYS_mq_timedreceive
+#define SYS_semtimedop_time64 SYS_semtimedop
+#define SYS_rt_sigtimedwait_time64 SYS_rt_sigtimedwait
+#define SYS_futex_time64 SYS_futex
+#define SYS_sched_rr_get_interval_time64 SYS_sched_rr_get_interval
+#define SYS_getrusage_time64 SYS_getrusage
+#define SYS_wait4_time64 SYS_wait4
+
+#define IPC_64 0