remove LFS64 symbol aliases; replace with dynamic linker remapping

[musl] / arch / mips / syscall_arch.h

diff --git a/arch/mips/syscall_arch.h b/arch/mips/syscall_arch.h
index 2ef8a95..5b7c38d 100644 (file)
--- a/arch/mips/syscall_arch.h
+++ b/arch/mips/syscall_arch.h
@@ -5,16 +5,26 @@
 
 #define SYSCALL_RLIM_INFINITY (-1UL/2)
 
+#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");
        register long r2 __asm__("$2");
        __asm__ __volatile__ (
                "addu $2,$0,%2 ; syscall"
-               : "=&r"(r2), "=r"(r7) : "ir"(n), "0"(r2), "1"(r7)
-               : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13",
-                 "$14", "$15", "$24", "$25", "hi", "lo", "memory");
-       return r7 ? -r2 : r2;
+               : "=&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)
@@ -24,11 +34,10 @@ static inline long __syscall1(long n, long a)
        register long r2 __asm__("$2");
        __asm__ __volatile__ (
                "addu $2,$0,%2 ; syscall"
-               : "=&r"(r2), "=r"(r7) : "ir"(n), "0"(r2), "1"(r7),
-                 "r"(r4)
-               : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13",
-                 "$14", "$15", "$24", "$25", "hi", "lo", "memory");
-       return r7 ? -r2 : r2;
+               : "=&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)
@@ -39,11 +48,10 @@ static inline long __syscall2(long n, long a, long b)
        register long r2 __asm__("$2");
        __asm__ __volatile__ (
                "addu $2,$0,%2 ; syscall"
-               : "=&r"(r2), "=r"(r7) : "ir"(n), "0"(r2), "1"(r7),
-                 "r"(r4), "r"(r5)
-               : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13",
-                 "$14", "$15", "$24", "$25", "hi", "lo", "memory");
-       return r7 ? -r2 : r2;
+               : "=&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)
@@ -55,11 +63,10 @@ static inline long __syscall3(long n, long a, long b, long c)
        register long r2 __asm__("$2");
        __asm__ __volatile__ (
                "addu $2,$0,%2 ; syscall"
-               : "=&r"(r2), "=r"(r7) : "ir"(n), "0"(r2), "1"(r7),
-                 "r"(r4), "r"(r5), "r"(r6)
-               : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13",
-                 "$14", "$15", "$24", "$25", "hi", "lo", "memory");
-       return r7 ? -r2 : r2;
+               : "=&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)
@@ -71,11 +78,10 @@ static inline long __syscall4(long n, long a, long b, long c, long d)
        register long r2 __asm__("$2");
        __asm__ __volatile__ (
                "addu $2,$0,%2 ; syscall"
-               : "=&r"(r2), "=r"(r7) : "ir"(n), "0"(r2), "1"(r7),
-                 "r"(r4), "r"(r5), "r"(r6)
-               : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13",
-                 "$14", "$15", "$24", "$25", "hi", "lo", "memory");
-       return r7 ? -r2 : r2;
+               : "=&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 __syscall5(long n, long a, long b, long c, long d, long e)
@@ -90,11 +96,10 @@ static inline long __syscall5(long n, long a, long b, long c, long d, long e)
                "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), "1"(r7), "r"(r4), "r"(r5), "r"(r6)
-               : "$1", "$3", "$9", "$10", "$11", "$12", "$13",
-                 "$14", "$15", "$24", "$25", "hi", "lo", "memory");
-       return r7 ? -r2 : r2;
+               : "=&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 __syscall6(long n, long a, long b, long c, long d, long e, long f)
@@ -110,11 +115,10 @@ static inline long __syscall6(long n, long a, long b, long c, long d, long e, lo
                "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), "1"(r7), "r"(r4), "r"(r5), "r"(r6)
-               : "$1", "$3", "$10", "$11", "$12", "$13",
-                 "$14", "$15", "$24", "$25", "hi", "lo", "memory");
-       return r7 ? -r2 : r2;
+               : "=&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 __syscall7(long n, long a, long b, long c, long d, long e, long f, long g)
@@ -131,16 +135,19 @@ static inline long __syscall7(long n, long a, long b, long c, long d, long e, lo
                "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), "1"(r7), "r"(r4), "r"(r5), "r"(r6)
-               : "$1", "$3", "$11", "$12", "$13",
-                 "$14", "$15", "$24", "$25", "hi", "lo", "memory");
-       return r7 ? -r2 : r2;
+               : "=&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;
 }
 
 #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
+
+#undef SYS_socketcall