summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSzabolcs Nagy <nsz@port70.net>2016-01-25 00:52:58 +0000
committerRich Felker <dalias@aerifal.cx>2016-01-26 18:27:44 -0500
commita5e133bf29d42101ba90012b3b03b670bbb949b2 (patch)
tree8aa240312fc786f949451088dcf592e0f34eda3c
parentf9b8df464da02005a1f3296ad5c16582065befbf (diff)
downloadmusl-a5e133bf29d42101ba90012b3b03b670bbb949b2.tar.gz
change the internal socketcall selection logic
only use SYS_socketcall if SYSCALL_USE_SOCKETCALL is defined internally, otherwise use direct syscalls. this commit does not change the current behaviour, it is preparation for adding direct syscall numbers for i386.
-rw-r--r--arch/i386/syscall_arch.h2
-rw-r--r--src/internal/syscall.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/i386/syscall_arch.h b/arch/i386/syscall_arch.h
index ca0ea7fb..4c9d874a 100644
--- a/arch/i386/syscall_arch.h
+++ b/arch/i386/syscall_arch.h
@@ -55,3 +55,5 @@ static inline long __syscall6(long n, long a1, long a2, long a3, long a4, long a
#define VDSO_USEFUL
#define VDSO_CGT_SYM "__vdso_clock_gettime"
#define VDSO_CGT_VER "LINUX_2.6"
+
+#define SYSCALL_USE_SOCKETCALL
diff --git a/src/internal/syscall.h b/src/internal/syscall.h
index 36c772df..ff3cf53a 100644
--- a/src/internal/syscall.h
+++ b/src/internal/syscall.h
@@ -63,7 +63,7 @@ long __syscall_ret(unsigned long), __syscall(syscall_arg_t, ...),
#define __syscall_cp(...) __SYSCALL_DISP(__syscall_cp,__VA_ARGS__)
#define syscall_cp(...) __syscall_ret(__syscall_cp(__VA_ARGS__))
-#ifdef SYS_socket
+#ifndef SYSCALL_USE_SOCKETCALL
#define __socketcall(nm,a,b,c,d,e,f) syscall(SYS_##nm, a, b, c, d, e, f)
#define __socketcall_cp(nm,a,b,c,d,e,f) syscall_cp(SYS_##nm, a, b, c, d, e, f)
#else