remove long-obsolete clang workarounds from mips* syscall_arch.h files

at one point, clang reportedly failed to support the asm register
constraints needed for inline syscalls. versions of clang that old
have much bigger problems that preclude using them to compile musl
libc.

diff --git a/arch/mips/syscall_arch.h b/arch/mips/syscall_arch.h
index 39c0ea32f15152ac87d9c1b2341e8132f11a4387..3ac4da2167f156ad5035a529be21231ae4307e3a 100644 (file)
--- a/arch/mips/syscall_arch.h
+++ b/arch/mips/syscall_arch.h
@@ -20,8 +20,6 @@ static inline void __stat_fix(long p)
 }
 #endif
 
-#ifndef __clang__
-
 static inline long __syscall0(long n)
 {
        register long r7 __asm__("$7");
@@ -105,45 +103,6 @@ static inline long __syscall4(long n, long a, long b, long c, long d)
        return ret;
 }
 
-#else
-
-static inline long __syscall0(long n)
-{
-       return (__syscall)(n);
-}
-
-static inline long __syscall1(long n, long a)
-{
-       return (__syscall)(n, a);
-}
-
-static inline long __syscall2(long n, long a, long b)
-{
-       long r2 = (__syscall)(n, a, b);
-       if (r2 > -4096UL) return r2;
-       if (n == SYS_stat64 || n == SYS_fstat64 || n == SYS_lstat64) __stat_fix(b);
-       return r2;
-}
-
-static inline long __syscall3(long n, long a, long b, long c)
-{
-       long r2 = (__syscall)(n, a, b, c);
-       if (r2 > -4096UL) return r2;
-       if (n == SYS_stat64 || n == SYS_fstat64 || n == SYS_lstat64) __stat_fix(b);
-       return r2;
-}
-
-static inline long __syscall4(long n, long a, long b, long c, long d)
-{
-       long r2 = (__syscall)(n, a, b, c, d);
-       if (r2 > -4096UL) return r2;
-       if (n == SYS_stat64 || n == SYS_fstat64 || n == SYS_lstat64) __stat_fix(b);
-       if (n == SYS_fstatat) __stat_fix(c);
-       return r2;
-}
-
-#endif
-
 static inline long __syscall5(long n, long a, long b, long c, long d, long e)
 {
        long r2 = (__syscall)(n, a, b, c, d, e);

diff --git a/arch/mips64/syscall_arch.h b/arch/mips64/syscall_arch.h
index bb73dc3c52abd91416d1a8831d283c49c7f419bd..5eabdf46b0534ab71fc78d7edfdb0f50d2fc385d 100644 (file)
--- a/arch/mips64/syscall_arch.h
+++ b/arch/mips64/syscall_arch.h
@@ -49,8 +49,6 @@ static void __stat_fix(struct kernel_stat *kst, struct stat *st)
        st->st_blocks = kst->st_blocks;
 }
 
-#ifndef __clang__
-
 static inline long __syscall0(long n)
 {
        register long r7 __asm__("$7");
@@ -176,79 +174,6 @@ static inline long __syscall4(long n, long a, long b, long c, long d)
        return ret;
 }
 
-#else
-
-static inline long __syscall0(long n)
-{
-       return (__syscall)(n);
-}
-
-static inline long __syscall1(long n, long a)
-{
-       return (__syscall)(n, a);
-}
-
-static inline long __syscall2(long n, long a, long b)
-{
-       long r2;
-       long old_b = b;
-       struct kernel_stat kst;
-
-       if (n == SYS_stat || n == SYS_fstat || n == SYS_lstat)
-               b = (long) &kst;
-
-       r2 = (__syscall)(n, a, b);
-       if (r2 > -4096UL) return r2;
-
-       if (n == SYS_stat || n == SYS_fstat || n == SYS_lstat)
-               __stat_fix(&kst, (struct stat *)old_b);
-
-       return r2;
-}
-
-static inline long __syscall3(long n, long a, long b, long c)
-{
-       long r2;
-       long old_b = b;
-       struct kernel_stat kst;
-
-       if (n == SYS_stat || n == SYS_fstat || n == SYS_lstat)
-               b = (long) &kst;
-
-       r2 = (__syscall)(n, a, b, c);
-       if (r2 > -4096UL) return r2;
-
-       if (n == SYS_stat || n == SYS_fstat || n == SYS_lstat)
-               __stat_fix(&kst, (struct stat *)old_b);
-
-       return r2;
-}
-
-static inline long __syscall4(long n, long a, long b, long c, long d)
-{
-       long r2;
-       long old_b = b;
-       long old_c = c;
-       struct kernel_stat kst;
-
-       if (n == SYS_stat || n == SYS_fstat || n == SYS_lstat)
-               b = (long) &kst;
-       if (n == SYS_newfstatat)
-               c = (long) &kst;
-
-       r2 = (__syscall)(n, a, b, c, d);
-       if (r2 > -4096UL) return r2;
-
-       if (n == SYS_stat || n == SYS_fstat || n == SYS_lstat)
-               __stat_fix(&kst, (struct stat *)old_b);
-       if (n == SYS_newfstatat)
-               __stat_fix(&kst, (struct stat *)old_c);
-
-       return r2;
-}
-
-#endif
-
 static inline long __syscall5(long n, long a, long b, long c, long d, long e)
 {
        long r2;

diff --git a/arch/mipsn32/syscall_arch.h b/arch/mipsn32/syscall_arch.h
index 58d2c8bde911a3cd0030a1543d4b165bf53b38f7..37e71a7eec481089fcc1eada0a32be1519666147 100644 (file)
--- a/arch/mipsn32/syscall_arch.h
+++ b/arch/mipsn32/syscall_arch.h
@@ -18,8 +18,6 @@ static inline void __stat_fix(long p)
 }
 #endif
 
-#ifndef __clang__
-
 static inline long __syscall0(long n)
 {
        register long r7 __asm__("$7");
@@ -103,45 +101,6 @@ static inline long __syscall4(long n, long a, long b, long c, long d)
        return ret;
 }
 
-#else
-
-static inline long __syscall0(long n)
-{
-       return (__syscall)(n);
-}
-
-static inline long __syscall1(long n, long a)
-{
-       return (__syscall)(n, a);
-}
-
-static inline long __syscall2(long n, long a, long b)
-{
-       long r2 = (__syscall)(n, a, b);
-       if (r2 > -4096UL) return r2;
-       if (n == SYS_stat || n == SYS_fstat || n == SYS_lstat) __stat_fix(b);
-       return r2;
-}
-
-static inline long __syscall3(long n, long a, long b, long c)
-{
-       long r2 = (__syscall)(n, a, b, c);
-       if (r2 > -4096UL) return r2;
-       if (n == SYS_stat || n == SYS_fstat || n == SYS_lstat) __stat_fix(b);
-       return r2;
-}
-
-static inline long __syscall4(long n, long a, long b, long c, long d)
-{
-       long r2 = (__syscall)(n, a, b, c, d);
-       if (r2 > -4096UL) return r2;
-       if (n == SYS_stat || n == SYS_fstat || n == SYS_lstat) __stat_fix(b);
-       if (n == SYS_fstatat) __stat_fix(c);
-       return r2;
-}
-
-#endif
-
 static inline long __syscall5(long n, long a, long b, long c, long d, long e)
 {
        long r2 = (__syscall)(n, a, b, c, d, e);