fix reversed argument order x86_64 sigsetjmp's call to sigprocmask

[musl] / arch / arm / syscall_arch.h

diff --git a/arch/arm/syscall_arch.h b/arch/arm/syscall_arch.h
index 48b0e36..1d87fae 100644 (file)
--- a/arch/arm/syscall_arch.h
+++ b/arch/arm/syscall_arch.h
@@ -3,7 +3,56 @@
 ((union { long long ll; long l[2]; }){ .ll = x }).l[1]
 #define __SYSCALL_LL_O(x) 0, __SYSCALL_LL_E((x))
 
-#define __SYSCALL_SSLEN 8
+#ifndef __clang__
+
+#define __asm_syscall(...) do { \
+       __asm__ __volatile__ ( "svc 0" \
+       : "=r"(r0) : __VA_ARGS__ : "memory"); \
+       return r0; \
+       } while (0)
+
+static inline long __syscall0(long n)
+{
+       register long r7 __asm__("r7") = n;
+       register long r0 __asm__("r0");
+       __asm_syscall("r"(r7));
+}
+
+static inline long __syscall1(long n, long a)
+{
+       register long r7 __asm__("r7") = n;
+       register long r0 __asm__("r0") = a;
+       __asm_syscall("r"(r7), "0"(r0));
+}
+
+static inline long __syscall2(long n, long a, long b)
+{
+       register long r7 __asm__("r7") = n;
+       register long r0 __asm__("r0") = a;
+       register long r1 __asm__("r1") = b;
+       __asm_syscall("r"(r7), "0"(r0), "r"(r1));
+}
+
+static inline long __syscall3(long n, long a, long b, long c)
+{
+       register long r7 __asm__("r7") = n;
+       register long r0 __asm__("r0") = a;
+       register long r1 __asm__("r1") = b;
+       register long r2 __asm__("r2") = c;
+       __asm_syscall("r"(r7), "0"(r0), "r"(r1), "r"(r2));
+}
+
+static inline long __syscall4(long n, long a, long b, long c, long d)
+{
+       register long r7 __asm__("r7") = n;
+       register long r0 __asm__("r0") = a;
+       register long r1 __asm__("r1") = b;
+       register long r2 __asm__("r2") = c;
+       register long r3 __asm__("r3") = d;
+       __asm_syscall("r"(r7), "0"(r0), "r"(r1), "r"(r2), "r"(r3));
+}
+
+#else
 
 static inline long __syscall0(long n)
 {
@@ -30,6 +79,8 @@ static inline long __syscall4(long n, long a, long b, long c, long d)
        return (__syscall)(n, a, b, c, d);
 }
 
+#endif
+
 static inline long __syscall5(long n, long a, long b, long c, long d, long e)
 {
        return (__syscall)(n, a, b, c, d, e);