X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=arch%2Fi386%2Fbits%2Fsyscall.h;h=16565eee1e56a5cd0e90a68c10d12f20ae21e680;hb=1c76683cb4377a481dc1085b63170bb276512267;hp=f8429b2750a827aee405e63c95257de9650c4d43;hpb=685e40bb09f5f24a2af54ea09c97328808f76990;p=musl

diff --git a/arch/i386/bits/syscall.h b/arch/i386/bits/syscall.h
index f8429b27..16565eee 100644
--- a/arch/i386/bits/syscall.h
+++ b/arch/i386/bits/syscall.h
@@ -2,103 +2,103 @@
 ((union { long long ll; long l[2]; }){ .ll = x }).l[0], \
 ((union { long long ll; long l[2]; }){ .ll = x }).l[1]
 
-static inline long __syscall0(long n)
+static inline long __syscall0(long __n)
 {
-	unsigned long ret;
-	__asm__ __volatile__ ("int $128" : "=a"(ret) : "a"(n) : "memory");
-	return __syscall_ret(ret);
+	unsigned long __ret;
+	__asm__ __volatile__ ("int $128" : "=a"(__ret) : "a"(__n) : "memory");
+	return __ret;
 }
 
 #ifndef __PIC__
 
-static inline long __syscall1(long n, long a1)
+static inline long __syscall1(long __n, long __a1)
 {
-	unsigned long ret;
-	__asm__ __volatile__ ("int $128" : "=a"(ret) : "a"(n), "b"(a1) : "memory");
-	return ret;
+	unsigned long __ret;
+	__asm__ __volatile__ ("int $128" : "=a"(__ret) : "a"(__n), "b"(__a1) : "memory");
+	return __ret;
 }
 
-static inline long __syscall2(long n, long a1, long a2)
+static inline long __syscall2(long __n, long __a1, long __a2)
 {
-	unsigned long ret;
-	__asm__ __volatile__ ("int $128" : "=a"(ret) : "a"(n), "b"(a1), "c"(a2) : "memory");
-	return ret;
+	unsigned long __ret;
+	__asm__ __volatile__ ("int $128" : "=a"(__ret) : "a"(__n), "b"(__a1), "c"(__a2) : "memory");
+	return __ret;
 }
 
-static inline long __syscall3(long n, long a1, long a2, long a3)
+static inline long __syscall3(long __n, long __a1, long __a2, long __a3)
 {
-	unsigned long ret;
-	__asm__ __volatile__ ("int $128" : "=a"(ret) : "a"(n), "b"(a1), "c"(a2), "d"(a3) : "memory");
-	return ret;
+	unsigned long __ret;
+	__asm__ __volatile__ ("int $128" : "=a"(__ret) : "a"(__n), "b"(__a1), "c"(__a2), "d"(__a3) : "memory");
+	return __ret;
 }
 
-static inline long __syscall4(long n, long a1, long a2, long a3, long a4)
+static inline long __syscall4(long __n, long __a1, long __a2, long __a3, long __a4)
 {
-	unsigned long ret;
-	__asm__ __volatile__ ("int $128" : "=a"(ret) : "a"(n), "b"(a1), "c"(a2), "d"(a3), "S"(a4) : "memory");
-	return ret;
+	unsigned long __ret;
+	__asm__ __volatile__ ("int $128" : "=a"(__ret) : "a"(__n), "b"(__a1), "c"(__a2), "d"(__a3), "S"(__a4) : "memory");
+	return __ret;
 }
 
-static inline long __syscall5(long n, long a1, long a2, long a3, long a4, long a5)
+static inline long __syscall5(long __n, long __a1, long __a2, long __a3, long __a4, long __a5)
 {
-	unsigned long ret;
-	__asm__ __volatile__ ("int $128" : "=a"(ret) : "a"(n), "b"(a1), "c"(a2), "d"(a3), "S"(a4), "D"(a5) : "memory");
-	return ret;
+	unsigned long __ret;
+	__asm__ __volatile__ ("int $128" : "=a"(__ret) : "a"(__n), "b"(__a1), "c"(__a2), "d"(__a3), "S"(__a4), "D"(__a5) : "memory");
+	return __ret;
 }
 
-static inline long __syscall6(long n, long a1, long a2, long a3, long a4, long a5, long a6)
+static inline long __syscall6(long __n, long __a1, long __a2, long __a3, long __a4, long __a5, long __a6)
 {
-	unsigned long ret;
+	unsigned long __ret;
 	__asm__ __volatile__ ("pushl %7 ; pushl %%ebp ; mov 4(%%esp),%%ebp ; int $128 ; popl %%ebp ; popl %%ecx"
-		: "=a"(ret) : "a"(n), "b"(a1), "c"(a2), "d"(a3), "S"(a4), "D"(a5), "g"(a6) : "memory");
-	return ret;
+		: "=a"(__ret) : "a"(__n), "b"(__a1), "c"(__a2), "d"(__a3), "S"(__a4), "D"(__a5), "g"(__a6) : "memory");
+	return __ret;
 }
 
 #else
 
-static inline long __syscall1(long n, long a1)
+static inline long __syscall1(long __n, long __a1)
 {
-	unsigned long ret;
+	unsigned long __ret;
 	__asm__ __volatile__ ("xchg %2,%%ebx ; int $128 ; xchg %2,%%ebx"
-		: "=a"(ret) : "a"(n), "r"(a1) : "memory");
-	return ret;
+		: "=a"(__ret) : "a"(__n), "r"(__a1) : "memory");
+	return __ret;
 }
 
-static inline long __syscall2(long n, long a1, long a2)
+static inline long __syscall2(long __n, long __a1, long __a2)
 {
-	unsigned long ret;
+	unsigned long __ret;
 	__asm__ __volatile__ ("xchg %2,%%ebx ; int $128 ; xchg %2,%%ebx"
-		: "=a"(ret) : "a"(n), "r"(a1), "c"(a2) : "memory");
-	return ret;
+		: "=a"(__ret) : "a"(__n), "r"(__a1), "c"(__a2) : "memory");
+	return __ret;
 }
 
-static inline long __syscall3(long n, long a1, long a2, long a3)
+static inline long __syscall3(long __n, long __a1, long __a2, long __a3)
 {
-	unsigned long ret;
+	unsigned long __ret;
 	__asm__ __volatile__ ("xchg %2,%%ebx ; int $128 ; xchg %2,%%ebx"
-		: "=a"(ret) : "a"(n), "r"(a1), "c"(a2), "d"(a3) : "memory");
-	return ret;
+		: "=a"(__ret) : "a"(__n), "r"(__a1), "c"(__a2), "d"(__a3) : "memory");
+	return __ret;
 }
 
-static inline long __syscall4(long n, long a1, long a2, long a3, long a4)
+static inline long __syscall4(long __n, long __a1, long __a2, long __a3, long __a4)
 {
-	unsigned long ret;
+	unsigned long __ret;
 	__asm__ __volatile__ ("xchg %2,%%ebx ; int $128 ; xchg %2,%%ebx"
-		: "=a"(ret) : "a"(n), "r"(a1), "c"(a2), "d"(a3), "S"(a4) : "memory");
-	return ret;
+		: "=a"(__ret) : "a"(__n), "r"(__a1), "c"(__a2), "d"(__a3), "S"(__a4) : "memory");
+	return __ret;
 }
 
-static inline long __syscall5(long n, long a1, long a2, long a3, long a4, long a5)
+static inline long __syscall5(long __n, long __a1, long __a2, long __a3, long __a4, long __a5)
 {
-	unsigned long ret;
+	unsigned long __ret;
 	__asm__ __volatile__ ("pushl %2 ; pushl %%ebx ; mov 4(%%esp),%%ebx ; int $128 ; popl %%ebx ; popl %%ecx"
-		: "=a"(ret) : "a"(n), "g"(a1), "c"(a2), "d"(a3), "S"(a4), "D"(a5) : "memory");
-	return ret;
+		: "=a"(__ret) : "a"(__n), "g"(__a1), "c"(__a2), "d"(__a3), "S"(__a4), "D"(__a5) : "memory");
+	return __ret;
 }
 
-static inline long __syscall6(long n, long a1, long a2, long a3, long a4, long a5, long a6)
+static inline long __syscall6(long __n, long __a1, long __a2, long __a3, long __a4, long __a5, long __a6)
 {
-	return (__syscall)(n, a1, a2, a3, a4, a5, a6);
+	return (__syscall)(__n, __a1, __a2, __a3, __a4, __a5, __a6);
 }
 
 #endif
@@ -122,7 +122,9 @@ static inline long __syscall6(long n, long a1, long a2, long a3, long a4, long a
 #define __SC_sendmsg     16
 #define __SC_recvmsg     17
 
-#define __socketcall(nm, a, b, c, d, e, f) syscall(SYS_socketcall, __SC_##nm, \
+#define __socketcall(nm,a,b,c,d,e,f) syscall(SYS_socketcall, __SC_##nm, \
+    ((long [6]){ (long)a, (long)b, (long)c, (long)d, (long)e, (long)f }))
+#define __socketcall_cp(nm,a,b,c,d,e,f) syscall_cp(SYS_socketcall, __SC_##nm, \
     ((long [6]){ (long)a, (long)b, (long)c, (long)d, (long)e, (long)f }))
 
 #define __NR_restart_syscall      0
@@ -525,6 +527,8 @@ static inline long __syscall6(long n, long a1, long a2, long a3, long a4, long a
 #define __NR_pread __NR_pread64
 #define __NR_pwrite __NR_pwrite64
 
+#define __NR_fadvise __NR_fadvise64_64
+
 #undef __NR_getrlimit
 #define __NR_getrlimit __NR_ugetrlimit
 
@@ -934,6 +938,8 @@ static inline long __syscall6(long n, long a1, long a2, long a3, long a4, long a
 #define SYS_pread SYS_pread64
 #define SYS_pwrite SYS_pwrite64
 
+#define SYS_fadvise SYS_fadvise64_64
+
 #undef SYS_getrlimit
 #define SYS_getrlimit SYS_ugetrlimit