about summary refs log tree commit diff
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2014-04-17 20:58:17 +0300
committerRich Felker <dalias@aerifal.cx>2014-04-17 14:53:27 -0400
commitfbeadd150feaa7993250d2d6739df670d4539e54 (patch)
tree1bfaf993cf23872cc70d860247d686c8a429bba5
parentde45164effdddf500756e10e8c6f56b79301d82b (diff)
downloadmusl-fbeadd150feaa7993250d2d6739df670d4539e54.tar.gz
musl-fbeadd150feaa7993250d2d6739df670d4539e54.tar.xz
musl-fbeadd150feaa7993250d2d6739df670d4539e54.zip
make socketcall types common as they are same for all architectures
-rw-r--r--arch/i386/syscall_arch.h22
-rw-r--r--arch/powerpc/syscall_arch.h18
-rw-r--r--src/internal/syscall.h23
3 files changed, 23 insertions, 40 deletions
diff --git a/arch/i386/syscall_arch.h b/arch/i386/syscall_arch.h
index b19f27ef..838d0a24 100644
--- a/arch/i386/syscall_arch.h
+++ b/arch/i386/syscall_arch.h
@@ -51,25 +51,3 @@ static inline long __syscall6(long n, long a1, long a2, long a3, long a4, long a
 	__asm__ __volatile__ ("push %6 ; call __vsyscall6 ; add $4,%%esp" : "=a"(__ret) : "a"(n), "d"(a1), "c"(a2), "D"(a3), "S"(a4), "g"(0+(long[]){a5, a6}) : "memory");
 	return __ret;
 }
-
-
-#define __SC_socket      1
-#define __SC_bind        2
-#define __SC_connect     3
-#define __SC_listen      4
-#define __SC_accept      5
-#define __SC_getsockname 6
-#define __SC_getpeername 7
-#define __SC_socketpair  8
-#define __SC_send        9
-#define __SC_recv        10
-#define __SC_sendto      11
-#define __SC_recvfrom    12
-#define __SC_shutdown    13
-#define __SC_setsockopt  14
-#define __SC_getsockopt  15
-#define __SC_sendmsg     16
-#define __SC_recvmsg     17
-#define __SC_accept4     18
-#define __SC_recvmmsg    19
-#define __SC_sendmmsg    20
diff --git a/arch/powerpc/syscall_arch.h b/arch/powerpc/syscall_arch.h
index 21c11347..7a6b6b7b 100644
--- a/arch/powerpc/syscall_arch.h
+++ b/arch/powerpc/syscall_arch.h
@@ -39,21 +39,3 @@ static inline long __syscall6(long n, long a, long b, long c, long d, long e, lo
 {
 	return (__syscall)(n, a, b, c, d, e, f);
 }
-
-#define __SC_socket      1
-#define __SC_bind        2
-#define __SC_connect     3
-#define __SC_listen      4
-#define __SC_accept      5
-#define __SC_getsockname 6
-#define __SC_getpeername 7
-#define __SC_socketpair  8
-#define __SC_send        9
-#define __SC_recv        10
-#define __SC_sendto      11
-#define __SC_recvfrom    12
-#define __SC_shutdown    13
-#define __SC_setsockopt  14
-#define __SC_getsockopt  15
-#define __SC_sendmsg     16
-#define __SC_recvmsg     17
diff --git a/src/internal/syscall.h b/src/internal/syscall.h
index dcfae003..914b0d18 100644
--- a/src/internal/syscall.h
+++ b/src/internal/syscall.h
@@ -164,3 +164,26 @@ long __syscall_ret(unsigned long), __syscall(syscall_arg_t, ...),
 #endif
 
 #endif
+
+/* socketcall calls */
+
+#define __SC_socket      1
+#define __SC_bind        2
+#define __SC_connect     3
+#define __SC_listen      4
+#define __SC_accept      5
+#define __SC_getsockname 6
+#define __SC_getpeername 7
+#define __SC_socketpair  8
+#define __SC_send        9
+#define __SC_recv        10
+#define __SC_sendto      11
+#define __SC_recvfrom    12
+#define __SC_shutdown    13
+#define __SC_setsockopt  14
+#define __SC_getsockopt  15
+#define __SC_sendmsg     16
+#define __SC_recvmsg     17
+#define __SC_accept4     18
+#define __SC_recvmmsg    19
+#define __SC_sendmmsg    20