[fusl] Remove socketcall abstraction

fusl/src/internal/syscall.h

 #ifndef _INTERNAL_SYSCALL_H
 #define _INTERNAL_SYSCALL_H
 
 #include <sys/syscall.h>
 #include "syscall_arch.h"
 
 #ifndef SYSCALL_RLIM_INFINITY
 #define SYSCALL_RLIM_INFINITY (~0ULL)
 #endif
 
@@ skipping 45 matching lines @@
 #define __SYSCALL_NARGS(...) \
   __SYSCALL_NARGS_X(__VA_ARGS__, 7, 6, 5, 4, 3, 2, 1, 0, )
 #define __SYSCALL_CONCAT_X(a, b) a##b
 #define __SYSCALL_CONCAT(a, b) __SYSCALL_CONCAT_X(a, b)
 #define __SYSCALL_DISP(b, ...) \
   __SYSCALL_CONCAT(b, __SYSCALL_NARGS(__VA_ARGS__))(__VA_ARGS__)
 
 #define __syscall(...) __SYSCALL_DISP(__syscall, __VA_ARGS__)
 #define syscall(...) __syscall_ret(__syscall(__VA_ARGS__))
 
-#define socketcall __socketcall
-#define socketcall_cp __socketcall_cp
-
 #define __syscall_cp0(n) (__syscall_cp)(n, 0, 0, 0, 0, 0, 0)
 #define __syscall_cp1(n, a) (__syscall_cp)(n, __scc(a), 0, 0, 0, 0, 0)
 #define __syscall_cp2(n, a, b) (__syscall_cp)(n, __scc(a), __scc(b), 0, 0, 0, 0)
 #define __syscall_cp3(n, a, b, c) \
   (__syscall_cp)(n, __scc(a), __scc(b), __scc(c), 0, 0, 0)
 #define __syscall_cp4(n, a, b, c, d) \
   (__syscall_cp)(n, __scc(a), __scc(b), __scc(c), __scc(d), 0, 0)
 #define __syscall_cp5(n, a, b, c, d, e) \
   (__syscall_cp)(n, __scc(a), __scc(b), __scc(c), __scc(d), __scc(e), 0)
 #define __syscall_cp6(n, a, b, c, d, e, f) \
   (__syscall_cp)(n, __scc(a), __scc(b), __scc(c), __scc(d), __scc(e), __scc(f))
 
 #define __syscall_cp(...) __SYSCALL_DISP(__syscall_cp, __VA_ARGS__)
 #define syscall_cp(...) __syscall_ret(__syscall_cp(__VA_ARGS__))
 
-#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
-#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}))
-#endif
-
 /* fixup legacy 16-bit junk */
 
 #ifdef SYS_getuid32
 #undef SYS_lchown
 #undef SYS_getuid
 #undef SYS_getgid
 #undef SYS_geteuid
 #undef SYS_getegid
 #undef SYS_setreuid
 #undef SYS_setregid
@@ skipping 105 matching lines @@
 #elif defined(SYS_fadvise64)
 #undef SYS_fadvise
 #define SYS_fadvise SYS_fadvise64
 #endif
 
 #ifdef SYS_sendfile64
 #undef SYS_sendfile
 #define SYS_sendfile SYS_sendfile64
 #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
-
 #ifdef SYS_open
 #define __sys_open2(x, pn, fl) __syscall2(SYS_open, pn, (fl) | O_LARGEFILE)
 #define __sys_open3(x, pn, fl, mo) \
   __syscall3(SYS_open, pn, (fl) | O_LARGEFILE, mo)
 #define __sys_open_cp2(x, pn, fl) \
   __syscall_cp2(SYS_open, pn, (fl) | O_LARGEFILE)
 #define __sys_open_cp3(x, pn, fl, mo) \
   __syscall_cp3(SYS_open, pn, (fl) | O_LARGEFILE, mo)
 #else
 #define __sys_open2(x, pn, fl) \
   __syscall3(SYS_openat, AT_FDCWD, pn, (fl) | O_LARGEFILE)
 #define __sys_open3(x, pn, fl, mo) \
   __syscall4(SYS_openat, AT_FDCWD, pn, (fl) | O_LARGEFILE, mo)
 #define __sys_open_cp2(x, pn, fl) \
   __syscall_cp3(SYS_openat, AT_FDCWD, pn, (fl) | O_LARGEFILE)
 #define __sys_open_cp3(x, pn, fl, mo) \
   __syscall_cp4(SYS_openat, AT_FDCWD, pn, (fl) | O_LARGEFILE, mo)
 #endif
 
 #define __sys_open(...) __SYSCALL_DISP(__sys_open, , __VA_ARGS__)
 #define sys_open(...) __syscall_ret(__sys_open(__VA_ARGS__))
 
 #define __sys_open_cp(...) __SYSCALL_DISP(__sys_open_cp, , __VA_ARGS__)
 #define sys_open_cp(...) __syscall_ret(__sys_open_cp(__VA_ARGS__))
 
 #endif