fix hwcap access in powerpc-sf setjmp/longjmp

[musl] / arch / mips / syscall_arch.h

diff --git a/arch/mips/syscall_arch.h b/arch/mips/syscall_arch.h
index b1e68ff..5b7c38d 100644 (file)
--- a/arch/mips/syscall_arch.h
+++ b/arch/mips/syscall_arch.h
@@ -3,31 +3,41 @@
 ((union { long long ll; long l[2]; }){ .ll = x }).l[1]
 #define __SYSCALL_LL_O(x) 0, __SYSCALL_LL_E((x))
 
-#define __SYSCALL_SSLEN 16
+#define SYSCALL_RLIM_INFINITY (-1UL/2)
 
-#ifndef __clang__
-
-#define __asm_syscall(...) do { \
-       register long r2 __asm__("$2"); \
-       __asm__ __volatile__ ( \
-       "addu $2,$0,%2 ; syscall" \
-       : "=&r"(r2), "=r"(r7) : "ir"(n), __VA_ARGS__, "r"(r2) \
-       : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", \
-         "$14", "$15", "$24", "$25", "hi", "lo", "memory"); \
-       return r7 ? -r2 : r2; \
-       } while (0)
+#if __mips_isa_rev >= 6
+#define SYSCALL_CLOBBERLIST \
+       "$1", "$3", "$11", "$12", "$13", \
+       "$14", "$15", "$24", "$25", "memory"
+#else
+#define SYSCALL_CLOBBERLIST \
+       "$1", "$3", "$11", "$12", "$13", \
+       "$14", "$15", "$24", "$25", "hi", "lo", "memory"
+#endif
 
 static inline long __syscall0(long n)
 {
        register long r7 __asm__("$7");
-       __asm_syscall("i"(0));
+       register long r2 __asm__("$2");
+       __asm__ __volatile__ (
+               "addu $2,$0,%2 ; syscall"
+               : "=&r"(r2), "=r"(r7)
+               : "ir"(n), "0"(r2)
+               : SYSCALL_CLOBBERLIST, "$8", "$9", "$10");
+       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");
-       __asm_syscall("r"(r4));
+       register long r2 __asm__("$2");
+       __asm__ __volatile__ (
+               "addu $2,$0,%2 ; syscall"
+               : "=&r"(r2), "=r"(r7)
+               : "ir"(n), "0"(r2), "r"(r4)
+               : SYSCALL_CLOBBERLIST, "$8", "$9", "$10");
+       return r7 && r2>0 ? -r2 : r2;
 }
 
 static inline long __syscall2(long n, long a, long b)
@@ -35,7 +45,13 @@ 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");
-       __asm_syscall("r"(r4), "r"(r5));
+       register long r2 __asm__("$2");
+       __asm__ __volatile__ (
+               "addu $2,$0,%2 ; syscall"
+               : "=&r"(r2), "=r"(r7)
+               : "ir"(n), "0"(r2), "r"(r4), "r"(r5)
+               : SYSCALL_CLOBBERLIST, "$8", "$9", "$10");
+       return r7 && r2>0 ? -r2 : r2;
 }
 
 static inline long __syscall3(long n, long a, long b, long c)
@@ -44,7 +60,13 @@ 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");
-       __asm_syscall("r"(r4), "r"(r5), "r"(r6));
+       register long r2 __asm__("$2");
+       __asm__ __volatile__ (
+               "addu $2,$0,%2 ; syscall"
+               : "=&r"(r2), "=r"(r7)
+               : "ir"(n), "0"(r2), "r"(r4), "r"(r5), "r"(r6)
+               : SYSCALL_CLOBBERLIST, "$8", "$9", "$10");
+       return r7 && r2>0 ? -r2 : r2;
 }
 
 static inline long __syscall4(long n, long a, long b, long c, long d)
@@ -53,44 +75,79 @@ 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;
-       __asm_syscall("r"(r4), "r"(r5), "r"(r6), "r"(r7));
-}
-
-#else
-
-static inline long __syscall0(long n)
-{
-       return (__syscall)(n);
+       register long r2 __asm__("$2");
+       __asm__ __volatile__ (
+               "addu $2,$0,%2 ; syscall"
+               : "=&r"(r2), "+r"(r7)
+               : "ir"(n), "0"(r2), "r"(r4), "r"(r5), "r"(r6)
+               : SYSCALL_CLOBBERLIST, "$8", "$9", "$10");
+       return r7 && r2>0 ? -r2 : r2;
 }
 
-static inline long __syscall1(long n, long a)
-{
-       return (__syscall)(n, a);
-}
-
-static inline long __syscall2(long n, long a, long b)
+static inline long __syscall5(long n, long a, long b, long c, long d, long e)
 {
-       return (__syscall)(n, a, b);
+       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 r2 __asm__("$2");
+       __asm__ __volatile__ (
+               "subu $sp,$sp,32 ; sw $8,16($sp) ; "
+               "addu $2,$0,%3 ; syscall ;"
+               "addu $sp,$sp,32"
+               : "=&r"(r2), "+r"(r7), "+r"(r8)
+               : "ir"(n), "0"(r2), "r"(r4), "r"(r5), "r"(r6)
+               : SYSCALL_CLOBBERLIST, "$9", "$10");
+       return r7 && r2>0 ? -r2 : r2;
 }
 
-static inline long __syscall3(long n, long a, long b, long c)
+static inline long __syscall6(long n, long a, long b, long c, long d, long e, long f)
 {
-       return (__syscall)(n, a, b, c);
+       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 r2 __asm__("$2");
+       __asm__ __volatile__ (
+               "subu $sp,$sp,32 ; sw $8,16($sp) ; sw $9,20($sp) ; "
+               "addu $2,$0,%4 ; syscall ;"
+               "addu $sp,$sp,32"
+               : "=&r"(r2), "+r"(r7), "+r"(r8), "+r"(r9)
+               : "ir"(n), "0"(r2), "r"(r4), "r"(r5), "r"(r6)
+               : SYSCALL_CLOBBERLIST, "$10");
+       return r7 && r2>0 ? -r2 : r2;
 }
 
-static inline long __syscall4(long n, long a, long b, long c, long d)
+static inline long __syscall7(long n, long a, long b, long c, long d, long e, long f, long g)
 {
-       return (__syscall)(n, a, b, c, 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 r8 __asm__("$8") = e;
+       register long r9 __asm__("$9") = f;
+       register long r10 __asm__("$10") = g;
+       register long r2 __asm__("$2");
+       __asm__ __volatile__ (
+               "subu $sp,$sp,32 ; sw $8,16($sp) ; sw $9,20($sp) ; sw $10,24($sp) ; "
+               "addu $2,$0,%5 ; syscall ;"
+               "addu $sp,$sp,32"
+               : "=&r"(r2), "+r"(r7), "+r"(r8), "+r"(r9), "+r"(r10)
+               : "ir"(n), "0"(r2), "r"(r4), "r"(r5), "r"(r6)
+               : SYSCALL_CLOBBERLIST);
+       return r7 && r2>0 ? -r2 : r2;
 }
 
-#endif
+#define VDSO_USEFUL
+#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"
 
-static inline long __syscall5(long n, long a, long b, long c, long d, long e)
-{
-       return (__syscall)(n, a, b, c, d, e);
-}
+#define SO_SNDTIMEO_OLD 0x1005
+#define SO_RCVTIMEO_OLD 0x1006
 
-static inline long __syscall6(long n, long a, long b, long c, long d, long e, long f)
-{
-       return (__syscall)(n, a, b, c, d, e, f);
-}
+#undef SYS_socketcall