zig

commit e7ee61cd64e8b84f195efbe5b05920d50da1e949 (tree)
parent 0dd99c37cca1894ad7219e5944e7eef25902e44e
Author: Alex Rønne Petersen <alex@alexrp.com>
Date:   Wed, 15 Apr 2026 18:59:10 +0200

musl: fix syscall argument width for mipsn32

https://www.openwall.com/lists/musl/2026/04/16/1

Diffstat:
M
lib/libc/musl/arch/mipsn32/syscall_arch.h
 | 
67
+++++++++++++++++++++++++++++++++++--------------------------------

1 file changed, 35 insertions(+), 32 deletions(-)
diff --git a/lib/libc/musl/arch/mipsn32/syscall_arch.h b/lib/libc/musl/arch/mipsn32/syscall_arch.h
@@ -1,6 +1,9 @@
 #define __SYSCALL_LL_E(x) (x)
 #define __SYSCALL_LL_O(x) (x)
 
+#define __scc(X) sizeof(1?(X):0ULL) < 8 ? (unsigned long) (X) : (long long) (X)
+typedef long long syscall_arg_t;
+
 #define SYSCALL_RLIM_INFINITY (-1UL/2)
 
 #if __mips_isa_rev >= 6
@@ -13,9 +16,9 @@
 	"$14", "$15", "$24", "$25", "hi", "lo", "memory"
 #endif
 
-static inline long __syscall0(long n)
+static inline long __syscall0(long long n)
 {
-	register long r7 __asm__("$7");
+	register long long r7 __asm__("$7");
 	register long r2 __asm__("$2");
 	__asm__ __volatile__ (
 		"daddu $2,$0,%2 ; syscall"
@@ -25,10 +28,10 @@ static inline long __syscall0(long n)
 	return r7 && r2>0 ? -r2 : r2;
 }
 
-static inline long __syscall1(long n, long a)
+static inline long __syscall1(long long n, long long a)
 {
-	register long r4 __asm__("$4") = a;
-	register long r7 __asm__("$7");
+	register long long r4 __asm__("$4") = a;
+	register long long r7 __asm__("$7");
 	register long r2 __asm__("$2");
 	__asm__ __volatile__ (
 		"daddu $2,$0,%2 ; syscall"
@@ -38,11 +41,11 @@ static inline long __syscall1(long n, long a)
 	return r7 && r2>0 ? -r2 : r2;
 }
 
-static inline long __syscall2(long n, long a, long b)
+static inline long __syscall2(long long n, long long a, long long b)
 {
-	register long r4 __asm__("$4") = a;
-	register long r5 __asm__("$5") = b;
-	register long r7 __asm__("$7");
+	register long long r4 __asm__("$4") = a;
+	register long long r5 __asm__("$5") = b;
+	register long long r7 __asm__("$7");
 	register long r2 __asm__("$2");
 
 	__asm__ __volatile__ (
@@ -53,12 +56,12 @@ static inline long __syscall2(long n, long a, long b)
 	return r7 && r2>0 ? -r2 : r2;
 }
 
-static inline long __syscall3(long n, long a, long b, long c)
+static inline long __syscall3(long long n, long long a, long long b, long long c)
 {
-	register long r4 __asm__("$4") = a;
-	register long r5 __asm__("$5") = b;
-	register long r6 __asm__("$6") = c;
-	register long r7 __asm__("$7");
+	register long long r4 __asm__("$4") = a;
+	register long long r5 __asm__("$5") = b;
+	register long long r6 __asm__("$6") = c;
+	register long long r7 __asm__("$7");
 	register long r2 __asm__("$2");
 
 	__asm__ __volatile__ (
@@ -69,12 +72,12 @@ static inline long __syscall3(long n, long a, long b, long c)
 	return r7 && r2>0 ? -r2 : r2;
 }
 
-static inline long __syscall4(long n, long a, long b, long c, long d)
+static inline long __syscall4(long long n, long long a, long long b, long long c, long long d)
 {
-	register long r4 __asm__("$4") = a;
-	register long r5 __asm__("$5") = b;
-	register long r6 __asm__("$6") = c;
-	register long r7 __asm__("$7") = d;
+	register long long r4 __asm__("$4") = a;
+	register long long r5 __asm__("$5") = b;
+	register long long r6 __asm__("$6") = c;
+	register long long r7 __asm__("$7") = d;
 	register long r2 __asm__("$2");
 
 	__asm__ __volatile__ (
@@ -85,13 +88,13 @@ static inline long __syscall4(long n, long a, long b, long c, long d)
 	return r7 && r2>0 ? -r2 : r2;
 }
 
-static inline long __syscall5(long n, long a, long b, long c, long d, long e)
+static inline long __syscall5(long long n, long long a, long long b, long long c, long long d, long long e)
 {
-	register long r4 __asm__("$4") = a;
-	register long r5 __asm__("$5") = b;
-	register long r6 __asm__("$6") = c;
-	register long r7 __asm__("$7") = d;
-	register long r8 __asm__("$8") = e;
+	register long long r4 __asm__("$4") = a;
+	register long long r5 __asm__("$5") = b;
+	register long long r6 __asm__("$6") = c;
+	register long long r7 __asm__("$7") = d;
+	register long long r8 __asm__("$8") = e;
 	register long r2 __asm__("$2");
 
 	__asm__ __volatile__ (
@@ -102,14 +105,14 @@ static inline long __syscall5(long n, long a, long b, long c, long d, long e)
 	return r7 && r2>0 ? -r2 : r2;
 }
 
-static inline long __syscall6(long n, long a, long b, long c, long d, long e, long f)
+static inline long __syscall6(long long n, long long a, long long b, long long c, long long d, long long e, long long f)
 {
-	register long r4 __asm__("$4") = a;
-	register long r5 __asm__("$5") = b;
-	register long r6 __asm__("$6") = c;
-	register long r7 __asm__("$7") = d;
-	register long r8 __asm__("$8") = e;
-	register long r9 __asm__("$9") = f;
+	register long long r4 __asm__("$4") = a;
+	register long long r5 __asm__("$5") = b;
+	register long long r6 __asm__("$6") = c;
+	register long long r7 __asm__("$7") = d;
+	register long long r8 __asm__("$8") = e;
+	register long long r9 __asm__("$9") = f;
 	register long r2 __asm__("$2");
 
 	__asm__ __volatile__ (