summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2014-11-22 21:50:13 -0500
committerRich Felker <dalias@aerifal.cx>2014-11-22 21:50:13 -0500
commit4134c68dd4dc23ed358c8301da56225d21d655d9 (patch)
tree5b1e5a1e38ca31c4b10c6cbe3f99e6a7b9027376 /arch
parent0e971b0e3f4b9c99a7ce67b10d851fc885c188d5 (diff)
downloadmusl-4134c68dd4dc23ed358c8301da56225d21d655d9.tar.gz
musl-4134c68dd4dc23ed358c8301da56225d21d655d9.tar.bz2
musl-4134c68dd4dc23ed358c8301da56225d21d655d9.tar.xz
musl-4134c68dd4dc23ed358c8301da56225d21d655d9.zip
unify non-inline version of syscall code across archs
except powerpc, which still lacks inline syscalls simply because nobody has written the code, these are all fallbacks used to work around a clang bug that probably does not exist in versions of clang that can compile musl. however, it's useful to have the generic non-inline code anyway, as it eases the task of porting to new archs: writing inline syscall code is now optional. this approach could also help support compilers which don't understand inline asm or lack support for the needed register constraints. mips could not be unified because it has special fixup code for broken layout of the kernel's struct stat.
Diffstat (limited to 'arch')
-rw-r--r--arch/microblaze/syscall_arch.h36
-rw-r--r--arch/or1k/syscall_arch.h36
-rw-r--r--arch/powerpc/syscall_arch.h38
3 files changed, 6 insertions, 104 deletions
diff --git a/arch/microblaze/syscall_arch.h b/arch/microblaze/syscall_arch.h
index cab4607d..79f98340 100644
--- a/arch/microblaze/syscall_arch.h
+++ b/arch/microblaze/syscall_arch.h
@@ -100,39 +100,7 @@ static inline long __syscall6(long n, long a, long b, long c, long d, long e, lo
#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)
-{
- return (__syscall)(n, a, b);
-}
-
-static inline long __syscall3(long n, long a, long b, long c)
-{
- return (__syscall)(n, a, b, c);
-}
-
-static inline long __syscall4(long n, long a, long b, long c, long d)
-{
- return (__syscall)(n, a, b, c, d);
-}
-
-static inline long __syscall5(long n, long a, long b, long c, long d, long e)
-{
- return (__syscall)(n, a, b, c, d, e);
-}
-
-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 SYSCALL_NO_INLINE
+#define SYSCALL_NO_INLINE
#endif
diff --git a/arch/or1k/syscall_arch.h b/arch/or1k/syscall_arch.h
index fe664559..3e4650cc 100644
--- a/arch/or1k/syscall_arch.h
+++ b/arch/or1k/syscall_arch.h
@@ -118,39 +118,7 @@ static inline long __syscall6(long n, long a, long b, long c, long d, long e, lo
#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)
-{
- return (__syscall)(n, a, b);
-}
-
-static inline long __syscall3(long n, long a, long b, long c)
-{
- return (__syscall)(n, a, b, c);
-}
-
-static inline long __syscall4(long n, long a, long b, long c, long d)
-{
- return (__syscall)(n, a, b, c, d);
-}
-
-static inline long __syscall5(long n, long a, long b, long c, long d, long e)
-{
- return (__syscall)(n, a, b, c, d, e);
-}
-
-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 SYSCALL_NO_INLINE
+#define SYSCALL_NO_INLINE
#endif
diff --git a/arch/powerpc/syscall_arch.h b/arch/powerpc/syscall_arch.h
index 7a6b6b7b..e7cb1a26 100644
--- a/arch/powerpc/syscall_arch.h
+++ b/arch/powerpc/syscall_arch.h
@@ -3,39 +3,5 @@
((union { long long ll; long l[2]; }){ .ll = x }).l[1]
#define __SYSCALL_LL_O(x) 0, __SYSCALL_LL_E((x))
-long (__syscall)(long, ...);
-
-static inline long __syscall0(long n)
-{
- return (__syscall)(n, 0, 0, 0, 0, 0, 0);
-}
-
-static inline long __syscall1(long n, long a)
-{
- return (__syscall)(n, a, 0, 0, 0, 0, 0);
-}
-
-static inline long __syscall2(long n, long a, long b)
-{
- return (__syscall)(n, a, b, 0, 0, 0, 0);
-}
-
-static inline long __syscall3(long n, long a, long b, long c)
-{
- return (__syscall)(n, a, b, c, 0, 0, 0);
-}
-
-static inline long __syscall4(long n, long a, long b, long c, long d)
-{
- return (__syscall)(n, a, b, c, d, 0, 0);
-}
-
-static inline long __syscall5(long n, long a, long b, long c, long d, long e)
-{
- return (__syscall)(n, a, b, c, d, e, 0);
-}
-
-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 SYSCALL_NO_INLINE
+#define SYSCALL_NO_INLINE