semaphores: fix missed wakes from ABA bug in waiter count logic

[musl] / arch / mipsn32 / syscall_arch.h

diff --git a/arch/mipsn32/syscall_arch.h b/arch/mipsn32/syscall_arch.h
index 78b217f..c681905 100644 (file)
--- a/arch/mipsn32/syscall_arch.h
+++ b/arch/mipsn32/syscall_arch.h
@@ -3,33 +3,39 @@
 
 #define SYSCALL_RLIM_INFINITY (-1UL/2)
 
+#if __mips_isa_rev >= 6
+#define SYSCALL_CLOBBERLIST \
+       "$1", "$3", "$10", "$11", "$12", "$13", \
+       "$14", "$15", "$24", "$25", "memory"
+#else
 #define SYSCALL_CLOBBERLIST \
        "$1", "$3", "$10", "$11", "$12", "$13", \
        "$14", "$15", "$24", "$25", "hi", "lo", "memory"
+#endif
 
 static inline long __syscall0(long n)
 {
        register long r7 __asm__("$7");
-       register long r2 __asm__("$2") = n;
+       register long r2 __asm__("$2");
        __asm__ __volatile__ (
-               "syscall"
-               : "+&r"(r2), "=r"(r7)
-               :
+               "daddu $2,$0,%2 ; syscall"
+               : "=&r"(r2), "=r"(r7)
+               : "ir"(n), "0"(r2)
                : SYSCALL_CLOBBERLIST);
-       return r7 ? -r2 : r2;
+       return r7 && r2>0 ? -r2 : r2;
 }
 
 static inline long __syscall1(long n, long a)
 {
        register long r4 __asm__("$4") = a;
        register long r7 __asm__("$7");
-       register long r2 __asm__("$2") = n;
+       register long r2 __asm__("$2");
        __asm__ __volatile__ (
-               "syscall"
-               : "+&r"(r2), "=r"(r7)
-               : "r"(r4)
+               "daddu $2,$0,%2 ; syscall"
+               : "=&r"(r2), "=r"(r7)
+               : "ir"(n), "0"(r2), "r"(r4)
                : SYSCALL_CLOBBERLIST);
-       return r7 ? -r2 : r2;
+       return r7 && r2>0 ? -r2 : r2;
 }
 
 static inline long __syscall2(long n, long a, long b)
@@ -37,13 +43,14 @@ static inline long __syscall2(long n, long a, long b)
        register long r4 __asm__("$4") = a;
        register long r5 __asm__("$5") = b;
        register long r7 __asm__("$7");
-       register long r2 __asm__("$2") = n;
+       register long r2 __asm__("$2");
+
        __asm__ __volatile__ (
-               "syscall"
-               : "+&r"(r2), "=r"(r7)
-               : "r"(r4), "r"(r5)
+               "daddu $2,$0,%2 ; syscall"
+               : "=&r"(r2), "=r"(r7)
+               : "ir"(n), "0"(r2), "r"(r4), "r"(r5)
                : SYSCALL_CLOBBERLIST);
-       return r7 ? -r2 : r2;
+       return r7 && r2>0 ? -r2 : r2;
 }
 
 static inline long __syscall3(long n, long a, long b, long c)
@@ -52,13 +59,14 @@ static inline long __syscall3(long n, long a, long b, long c)
        register long r5 __asm__("$5") = b;
        register long r6 __asm__("$6") = c;
        register long r7 __asm__("$7");
-       register long r2 __asm__("$2") = n;
+       register long r2 __asm__("$2");
+
        __asm__ __volatile__ (
-               "syscall"
-               : "+&r"(r2), "=r"(r7)
-               : "r"(r4), "r"(r5), "r"(r6)
+               "daddu $2,$0,%2 ; syscall"
+               : "=&r"(r2), "=r"(r7)
+               : "ir"(n), "0"(r2), "r"(r4), "r"(r5), "r"(r6)
                : SYSCALL_CLOBBERLIST);
-       return r7 ? -r2 : r2;
+       return r7 && r2>0 ? -r2 : r2;
 }
 
 static inline long __syscall4(long n, long a, long b, long c, long d)
@@ -67,13 +75,14 @@ static inline long __syscall4(long n, long a, long b, long c, long d)
        register long r5 __asm__("$5") = b;
        register long r6 __asm__("$6") = c;
        register long r7 __asm__("$7") = d;
-       register long r2 __asm__("$2") = n;
+       register long r2 __asm__("$2");
+
        __asm__ __volatile__ (
-               "syscall"
-               : "+&r"(r2), "+r"(r7)
-               : "r"(r4), "r"(r5), "r"(r6)
+               "daddu $2,$0,%2 ; syscall"
+               : "=&r"(r2), "+r"(r7)
+               : "ir"(n), "0"(r2), "r"(r4), "r"(r5), "r"(r6)
                : SYSCALL_CLOBBERLIST);
-       return r7 ? -r2 : r2;
+       return r7 && r2>0 ? -r2 : r2;
 }
 
 static inline long __syscall5(long n, long a, long b, long c, long d, long e)
@@ -83,13 +92,14 @@ static inline long __syscall5(long n, long a, long b, long c, long d, long e)
        register long r6 __asm__("$6") = c;
        register long r7 __asm__("$7") = d;
        register long r8 __asm__("$8") = e;
-       register long r2 __asm__("$2") = n;
+       register long r2 __asm__("$2");
+
        __asm__ __volatile__ (
-               "syscall"
-               : "+&r"(r2), "+r"(r7)
-               : "r"(r4), "r"(r5), "r"(r6), "r"(r8)
+               "daddu $2,$0,%2 ; syscall"
+               : "=&r"(r2), "+r"(r7)
+               : "ir"(n), "0"(r2), "r"(r4), "r"(r5), "r"(r6), "r"(r8)
                : SYSCALL_CLOBBERLIST);
-       return r7 ? -r2 : r2;
+       return r7 && r2>0 ? -r2 : r2;
 }
 
 static inline long __syscall6(long n, long a, long b, long c, long d, long e, long f)
@@ -100,15 +110,21 @@ static inline long __syscall6(long n, long a, long b, long c, long d, long e, lo
        register long r7 __asm__("$7") = d;
        register long r8 __asm__("$8") = e;
        register long r9 __asm__("$9") = f;
-       register long r2 __asm__("$2") = n;
+       register long r2 __asm__("$2");
+
        __asm__ __volatile__ (
-               "syscall"
-               : "+&r"(r2), "+r"(r7)
-               : "r"(r4), "r"(r5), "r"(r6), "r"(r8), "r"(r9)
+               "daddu $2,$0,%2 ; syscall"
+               : "=&r"(r2), "+r"(r7)
+               : "ir"(n), "0"(r2), "r"(r4), "r"(r5), "r"(r6), "r"(r8), "r"(r9)
                : SYSCALL_CLOBBERLIST);
-       return r7 ? -r2 : r2;
+       return r7 && r2>0 ? -r2 : r2;
 }
 
 #define VDSO_USEFUL
-#define VDSO_CGT_SYM "__vdso_clock_gettime"
+#define VDSO_CGT32_SYM "__vdso_clock_gettime"
+#define VDSO_CGT32_VER "LINUX_2.6"
+#define VDSO_CGT_SYM "__vdso_clock_gettime64"
 #define VDSO_CGT_VER "LINUX_2.6"
+
+#define SO_SNDTIMEO_OLD 0x1005
+#define SO_RCVTIMEO_OLD 0x1006