mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-25 14:30:06 +00:00
Consolidate Linux sendto implementation
This patch consolidates the sendto Linux syscall implementation on sysdeps/unix/sysv/linux/sendto.c. The changes are: 1. Define __ASSUME_SENDTO_SYSCALL by default. 2. Undef it for architectures that do not support __NR_sendto. Checked on i686-linux-gnu, x86_64-linux-gnu, x86_64-linux-gnux32, aarch64-linux-gnu, arm-linux-gnueabihf, and powerpc64le-linux-gnu. * sysdeps/unix/sysv/linux/alpha/syscalls.list: Remove sendto from auto-generation list. * sysdeps/unix/sysv/linux/arm/syscalls.list: Likewise. * sysdeps/unix/sysv/linux/generic/syscalls.list: Likewise. * sysdeps/unix/sysv/linux/hppa/syscalls.list: Likewise. * sysdeps/unix/sysv/linux/ia64/syscalls.list: Likewise. * sysdeps/unix/sysv/linux/mips/syscalls.list: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list: Likewise. * sysdeps/unix/sysv/linux/x86_64/syscalls.list: Likewise. * sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_SENDTO_SYSCALL): Define by default. * sysdeps/unix/sysv/linux/i386/kernel-features.h (__ASSUME_SENDTO_SYSCALL): Undef it is kernel does not support __NR_sendto. * sysdeps/unix/sysv/linux/m68k/kernel-features.h (__ASSUME_SENDTO_SYSCALL): Likewise. * sysdeps/unix/sysv/linux/s390/kernel-features.h (__ASSUME_SENDTO_SYSCALL): Likewise. * sysdeps/unix/sysv/linux/microblaze/kernel-features.h (__ASSUME_SENDTO_SYSCALL): Remove definition. * sysdeps/unix/sysv/linux/powerpc/kernel-features.h (__ASSUME_SENDTO_SYSCALL): Likewise. * sysdeps/unix/sysv/linux/sh/kernel-features.h: (__ASSUME_SENDTO_SYSCALL): Likewise. * sysdeps/unix/sysv/linux/sendto.c: Simplify includes.
This commit is contained in:
parent
df799d9eb3
commit
06cf371e97
26
ChangeLog
26
ChangeLog
@ -1,5 +1,31 @@
|
||||
2016-03-08 Adhemerval Zanella <adhemerval.zanella@linaro.org>
|
||||
|
||||
* sysdeps/unix/sysv/linux/alpha/syscalls.list: Remove sendto from
|
||||
auto-generation list.
|
||||
* sysdeps/unix/sysv/linux/arm/syscalls.list: Likewise.
|
||||
* sysdeps/unix/sysv/linux/generic/syscalls.list: Likewise.
|
||||
* sysdeps/unix/sysv/linux/hppa/syscalls.list: Likewise.
|
||||
* sysdeps/unix/sysv/linux/ia64/syscalls.list: Likewise.
|
||||
* sysdeps/unix/sysv/linux/mips/syscalls.list: Likewise.
|
||||
* sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list: Likewise.
|
||||
* sysdeps/unix/sysv/linux/x86_64/syscalls.list: Likewise.
|
||||
* sysdeps/unix/sysv/linux/kernel-features.h
|
||||
(__ASSUME_SENDTO_SYSCALL): Define by default.
|
||||
* sysdeps/unix/sysv/linux/i386/kernel-features.h
|
||||
(__ASSUME_SENDTO_SYSCALL): Undef it is kernel does not support
|
||||
__NR_sendto.
|
||||
* sysdeps/unix/sysv/linux/m68k/kernel-features.h
|
||||
(__ASSUME_SENDTO_SYSCALL): Likewise.
|
||||
* sysdeps/unix/sysv/linux/s390/kernel-features.h
|
||||
(__ASSUME_SENDTO_SYSCALL): Likewise.
|
||||
* sysdeps/unix/sysv/linux/microblaze/kernel-features.h
|
||||
(__ASSUME_SENDTO_SYSCALL): Remove definition.
|
||||
* sysdeps/unix/sysv/linux/powerpc/kernel-features.h
|
||||
(__ASSUME_SENDTO_SYSCALL): Likewise.
|
||||
* sysdeps/unix/sysv/linux/sh/kernel-features.h:
|
||||
(__ASSUME_SENDTO_SYSCALL): Likewise.
|
||||
* sysdeps/unix/sysv/linux/sendto.c: Simplify includes.
|
||||
|
||||
* sysdeps/unix/sysv/linux/alpha/syscalls.list: Remove recv from
|
||||
auto-generation list.
|
||||
* sysdeps/unix/sysv/linux/arm/syscalls.list: Likewise.
|
||||
|
@ -11,7 +11,6 @@ getsockname - getsockname i:ipp __getsockname getsockname
|
||||
getsockopt - getsockopt i:iiiBN __getsockopt getsockopt
|
||||
listen - listen i:ii __listen listen
|
||||
send - send Ci:ibni __libc_send __send send
|
||||
sendto - sendto Ci:ibnibn __libc_sendto __sendto sendto
|
||||
setsockopt - setsockopt i:iiibn __setsockopt setsockopt
|
||||
shutdown - shutdown i:ii __shutdown shutdown
|
||||
socket - socket i:iii __socket socket
|
||||
|
@ -28,7 +28,6 @@ getsockname - getsockname i:ipp __getsockname getsockname
|
||||
getsockopt - getsockopt i:iiiBN __getsockopt getsockopt
|
||||
listen - listen i:ii __listen listen
|
||||
send - send Ci:ibni __libc_send __send send
|
||||
sendto - sendto Ci:ibnibn __libc_sendto __sendto sendto
|
||||
setsockopt - setsockopt i:iiibn __setsockopt setsockopt
|
||||
shutdown - shutdown i:ii __shutdown shutdown
|
||||
socket - socket i:iii __socket socket
|
||||
|
@ -7,7 +7,6 @@ bind - bind i:ipi __bind bind
|
||||
listen - listen i:ii __listen listen
|
||||
getsockname - getsockname i:ipp __getsockname getsockname
|
||||
getpeername - getpeername i:ipp __getpeername getpeername
|
||||
sendto - sendto Ci:ibnibn __libc_sendto __sendto sendto
|
||||
setsockopt - setsockopt i:iiibn __setsockopt setsockopt
|
||||
getsockopt - getsockopt i:iiiBN __getsockopt getsockopt
|
||||
shutdown - shutdown i:ii __shutdown shutdown
|
||||
|
@ -7,7 +7,6 @@ getsockname - getsockname i:ipp __getsockname getsockname
|
||||
getsockopt - getsockopt i:iiiBN __getsockopt getsockopt
|
||||
listen - listen i:ii __listen listen
|
||||
send - send Ci:ibni __libc_send __send send
|
||||
sendto - sendto Ci:ibnibn __libc_sendto __sendto sendto
|
||||
setsockopt - setsockopt i:iiibn __setsockopt setsockopt
|
||||
shutdown - shutdown i:ii __shutdown shutdown
|
||||
socket - socket i:iii __socket socket
|
||||
|
@ -36,7 +36,6 @@
|
||||
# define __ASSUME_SETSOCKOPT_SYSCALL 1
|
||||
# define __ASSUME_GETSOCKNAME_SYSCALL 1
|
||||
# define __ASSUME_GETPEERNAME_SYSCALL 1
|
||||
# define __ASSUME_SENDTO_SYSCALL 1
|
||||
# define __ASSUME_SENDTO_FOR_SEND_SYSCALL 1
|
||||
# define __ASSUME_SHUTDOWN_SYSCALL 1
|
||||
#endif
|
||||
@ -51,6 +50,7 @@
|
||||
# undef __ASSUME_RECVMSG_SYSCALL
|
||||
# undef __ASSUME_CONNECT_SYSCALL
|
||||
# undef __ASSUME_RECVFROM_SYSCALL
|
||||
# undef __ASSUME_SENDTO_SYSCALL
|
||||
#endif
|
||||
|
||||
/* i686 only supports ipc syscall. */
|
||||
|
@ -11,7 +11,6 @@ getsockname - getsockname i:ipp __getsockname getsockname
|
||||
getsockopt - getsockopt i:iiiBN __getsockopt getsockopt
|
||||
listen - listen i:ii __listen listen
|
||||
send - send Ci:ibni __libc_send __send send
|
||||
sendto - sendto Ci:ibnibn __libc_sendto __sendto sendto
|
||||
setsockopt - setsockopt i:iiibn __setsockopt setsockopt
|
||||
shutdown - shutdown i:ii __shutdown shutdown
|
||||
socket - socket i:iii __socket socket
|
||||
|
@ -150,6 +150,7 @@
|
||||
#define __ASSUME_ACCEPT_SYSCALL 1
|
||||
#define __ASSUME_CONNECT_SYSCALL 1
|
||||
#define __ASSUME_RECVFROM_SYSCALL 1
|
||||
#define __ASSUME_SENDTO_SYSCALL 1
|
||||
|
||||
/* Support for SysV IPC through wired syscalls. All supported architectures
|
||||
either support ipc syscall and/or all the ipc correspondent syscalls. */
|
||||
|
@ -30,7 +30,6 @@
|
||||
# define __ASSUME_SETSOCKOPT_SYSCALL 1
|
||||
# define __ASSUME_GETSOCKNAME_SYSCALL 1
|
||||
# define __ASSUME_GETPEERNAME_SYSCALL 1
|
||||
# define __ASSUME_SENDTO_SYSCALL 1
|
||||
# define __ASSUME_SENDTO_FOR_SEND_SYSCALL 1
|
||||
# define __ASSUME_SHUTDOWN_SYSCALL 1
|
||||
#endif
|
||||
@ -47,6 +46,7 @@
|
||||
# undef __ASSUME_RECVMSG_SYSCALL
|
||||
# undef __ASSUME_CONNECT_SYSCALL
|
||||
# undef __ASSUME_RECVFROM_SYSCALL
|
||||
# undef __ASSUME_SENDTO_SYSCALL
|
||||
#endif
|
||||
|
||||
/* No support for PI futexes or robust mutexes before 3.10 for m68k. */
|
||||
|
@ -28,7 +28,6 @@
|
||||
#define __ASSUME_GETPEERNAME_SYSCALL 1
|
||||
#define __ASSUME_SOCKETPAIR_SYSCALL 1
|
||||
#define __ASSUME_SEND_SYSCALL 1
|
||||
#define __ASSUME_SENDTO_SYSCALL 1
|
||||
#define __ASSUME_RECV_SYSCALL 1
|
||||
#define __ASSUME_SHUTDOWN_SYSCALL 1
|
||||
#define __ASSUME_GETSOCKOPT_SYSCALL 1
|
||||
|
@ -18,7 +18,6 @@ getsockname - getsockname i:ipp __getsockname getsockname
|
||||
getsockopt - getsockopt i:iiiBN __getsockopt getsockopt
|
||||
listen - listen i:ii __listen listen
|
||||
send - send Ci:ibni __libc_send __send send
|
||||
sendto - sendto Ci:ibnibn __libc_sendto __sendto sendto
|
||||
setsockopt - setsockopt i:iiibn __setsockopt setsockopt
|
||||
shutdown - shutdown i:ii __shutdown shutdown
|
||||
socket - socket i:iii __socket socket
|
||||
|
@ -29,7 +29,6 @@
|
||||
#define __ASSUME_GETPEERNAME_SYSCALL 1
|
||||
#define __ASSUME_SOCKETPAIR_SYSCALL 1
|
||||
#define __ASSUME_SEND_SYSCALL 1
|
||||
#define __ASSUME_SENDTO_SYSCALL 1
|
||||
#define __ASSUME_RECV_SYSCALL 1
|
||||
#define __ASSUME_SHUTDOWN_SYSCALL 1
|
||||
#define __ASSUME_GETSOCKOPT_SYSCALL 1
|
||||
|
@ -30,7 +30,6 @@
|
||||
# define __ASSUME_SETSOCKOPT_SYSCALL 1
|
||||
# define __ASSUME_GETSOCKNAME_SYSCALL 1
|
||||
# define __ASSUME_GETPEERNAME_SYSCALL 1
|
||||
# define __ASSUME_SENDTO_SYSCALL 1
|
||||
# define __ASSUME_SENDTO_FOR_SEND_SYSCALL 1
|
||||
# define __ASSUME_SHUTDOWN_SYSCALL 1
|
||||
#endif
|
||||
@ -47,6 +46,7 @@
|
||||
# undef __ASSUME_RECVMSG_SYSCALL
|
||||
# undef __ASSUME_CONNECT_SYSCALL
|
||||
# undef __ASSUME_RECVFROM_SYSCALL
|
||||
# undef __ASSUME_SENDTO_SYSCALL
|
||||
#endif
|
||||
|
||||
/* s390 only supports ipc syscall. */
|
||||
|
@ -15,14 +15,9 @@
|
||||
License along with the GNU C Library; if not, see
|
||||
<http://www.gnu.org/licenses/>. */
|
||||
|
||||
#include <errno.h>
|
||||
#include <signal.h>
|
||||
#include <sys/socket.h>
|
||||
|
||||
#include <sysdep-cancel.h>
|
||||
#include <socketcall.h>
|
||||
#include <kernel-features.h>
|
||||
#include <sys/syscall.h>
|
||||
|
||||
ssize_t
|
||||
__libc_sendto (int fd, const void *buf, size_t len, int flags,
|
||||
|
@ -32,7 +32,6 @@
|
||||
#define __ASSUME_GETPEERNAME_SYSCALL 1
|
||||
#define __ASSUME_SOCKETPAIR_SYSCALL 1
|
||||
#define __ASSUME_SEND_SYSCALL 1
|
||||
#define __ASSUME_SENDTO_SYSCALL 1
|
||||
#define __ASSUME_RECV_SYSCALL 1
|
||||
#define __ASSUME_SHUTDOWN_SYSCALL 1
|
||||
#define __ASSUME_GETSOCKOPT_SYSCALL 1
|
||||
|
@ -8,7 +8,6 @@ getsockname - getsockname 3 __getsockname getsockname
|
||||
getsockopt - getsockopt 5 __getsockopt getsockopt
|
||||
listen - listen 2 __listen listen
|
||||
send - send C:4 __libc_send __send send
|
||||
sendto - sendto C:6 __libc_sendto __sendto sendto
|
||||
setsockopt - setsockopt 5 __setsockopt setsockopt
|
||||
shutdown - shutdown 2 __shutdown shutdown
|
||||
socketpair - socketpair 4 __socketpair socketpair
|
||||
|
@ -15,7 +15,6 @@ getpeername - getpeername i:ipp __getpeername getpeername
|
||||
getsockname - getsockname i:ipp __getsockname getsockname
|
||||
getsockopt - getsockopt i:iiiBN __getsockopt getsockopt
|
||||
listen - listen i:ii __listen listen
|
||||
sendto - sendto Ci:ibnibn __libc_sendto __sendto sendto
|
||||
setsockopt - setsockopt i:iiibn __setsockopt setsockopt
|
||||
shutdown - shutdown i:ii __shutdown shutdown
|
||||
socket - socket i:iii __socket socket
|
||||
|
Loading…
Reference in New Issue
Block a user