mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-28 00:21:52 +03:00
Remove socket.S implementation
This patch removes the socket.S implementation for all ports and replace it by a C implementation using socketcall. For ports that implement the syscall directly, there is no change. The patch idea is to simplify the socket function implementation that uses the socketcall to be based on C implemetation instead of a pseudo assembly implementation with arch specific parts. The patch then remove the assembly implementatation for the ports which uses socketcall (i386, microblaze, mips, powerpc, sparc, m68k, s390 and sh). I have cross-build GLIBC for afore-mentioned ports and tested on both i386 and ppc32 without regressions.
This commit is contained in:
@ -25,6 +25,7 @@
|
||||
We cannot use an enum here because the values are used in assembler
|
||||
code. */
|
||||
|
||||
#define SOCKOP_invalid -1
|
||||
#define SOCKOP_socket 1
|
||||
#define SOCKOP_bind 2
|
||||
#define SOCKOP_connect 3
|
||||
@ -46,4 +47,58 @@
|
||||
#define SOCKOP_recvmmsg 19
|
||||
#define SOCKOP_sendmmsg 20
|
||||
|
||||
#define __SOCKETCALL1(name, a1) \
|
||||
INLINE_SYSCALL (socketcall, 2, name, \
|
||||
((long int [1]) { (long int) (a1) }))
|
||||
#define __SOCKETCALL2(name, a1, a2) \
|
||||
INLINE_SYSCALL (socketcall, 2, name, \
|
||||
((long int [2]) { (long int) (a1), (long int) (a2) }))
|
||||
#define __SOCKETCALL3(name, a1, a2, a3) \
|
||||
INLINE_SYSCALL (socketcall, 2, name, \
|
||||
((long int [3]) { (long int) (a1), (long int) (a2), (long int) (a3) }))
|
||||
#define __SOCKETCALL4(name, a1, a2, a3, a4) \
|
||||
INLINE_SYSCALL (socketcall, 2, name, \
|
||||
((long int [4]) { (long int) (a1), (long int) (a2), (long int) (a3), \
|
||||
(long int) (a4) }))
|
||||
#define __SOCKETCALL5(name, a1, a2, a3, a4, a5) \
|
||||
INLINE_SYSCALL (socketcall, 2, name, \
|
||||
((long int [5]) { (long int) (a1), (long int) (a2), (long int) (a3), \
|
||||
(long int) (a4), (long int) (a5) }))
|
||||
#define __SOCKETCALL6(name, a1, a2, a3, a4, a5, a6) \
|
||||
INLINE_SYSCALL (socketcall, 2, name, \
|
||||
((long int [6]) { (long int) (a1), (long int) (a2), (long int) (a3), \
|
||||
(long int) (a4), (long int) (a5), (long int) (a6) }))
|
||||
|
||||
#define __SOCKETCALL_NARGS_X(a,b,c,d,e,f,g,h,n,...) n
|
||||
#define __SOCKETCALL_NARGS(...) \
|
||||
__SOCKETCALL_NARGS_X (__VA_ARGS__,7,6,5,4,3,2,1,0,)
|
||||
#define __SOCKETCALL_CONCAT_X(a,b) a##b
|
||||
#define __SOCKETCALL_CONCAT(a,b) __SOCKETCALL_CONCAT_X (a, b)
|
||||
#define __SOCKETCALL_DISP(b,...) \
|
||||
__SOCKETCALL_CONCAT (b,__SOCKETCALL_NARGS(__VA_ARGS__))(__VA_ARGS__)
|
||||
|
||||
#define __SOCKETCALL(...) __SOCKETCALL_DISP (__SOCKETCALL, __VA_ARGS__)
|
||||
|
||||
|
||||
#define SOCKETCALL(name, args...) \
|
||||
({ \
|
||||
long int sc_ret = __SOCKETCALL (SOCKOP_##name, args); \
|
||||
sc_ret; \
|
||||
})
|
||||
|
||||
|
||||
#if IS_IN (libc)
|
||||
# define __pthread_enable_asynccancel __libc_enable_asynccancel
|
||||
# define __pthread_disable_asynccancel __libc_disable_asynccancel
|
||||
#endif
|
||||
|
||||
#define SOCKETCALL_CANCEL(name, args...) \
|
||||
({ \
|
||||
int oldtype = LIBC_CANCEL_ASYNC (); \
|
||||
long int sc_ret = __SOCKETCALL (SOCKOP_##name, args); \
|
||||
LIBC_CANCEL_RESET (oldtype); \
|
||||
sc_ret; \
|
||||
})
|
||||
|
||||
|
||||
#endif /* sys/socketcall.h */
|
||||
|
Reference in New Issue
Block a user