picnoir/glibc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

linux: Consolidate Linux setsockopt implementation

Browse source 
This patch consolidates the setsockopt implementation on
sysdeps/unix/sysv/linux/getsockopt.c.  The changes are:

  1. Remove it from auto-generation syscalls.list on all architectures.

  2. Add __ASSUME_SETSOCKOPT_SYSCALL as default and undef if for
     specific kernel versions on some architectures.

This also fix a potential issue where 32-bit time_t ABI should use the
linux setsockopt which overrides the underlying SO_* constants used for
socket timestamping for _TIME_BITS=64.

Checked on x86_64-linux-gnu and i686-linux-gnu.
This commit is contained in:
Adhemerval Zanella 2021-07-05 13:01:24 +00:00
parent 1c46663a70
commit 4b93a93e40
15 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sysdeps/unix/sysv/linux/alpha/syscalls.list
View file

@ -9,7 +9,6 @@ bind - bind i:ipi __bind bind
getpeername - getpeername i:ipp __getpeername getpeername
getsockname - getsockname i:ipp __getsockname getsockname
listen - listen i:ii __listen listen
setsockopt - setsockopt i:iiibn __setsockopt setsockopt
shutdown - shutdown i:ii __shutdown shutdown
socket - socket i:iii __socket socket
socketpair - socketpair i:iiif __socketpair socketpair

1
sysdeps/unix/sysv/linux/arm/syscalls.list
View file

@ -26,7 +26,6 @@ bind - bind i:ipi __bind bind
getpeername - getpeername i:ipp __getpeername getpeername
getsockname - getsockname i:ipp __getsockname getsockname
listen - listen i:ii __listen listen
setsockopt - setsockopt i:iiibn __setsockopt setsockopt
shutdown - shutdown i:ii __shutdown shutdown
socket - socket i:iii __socket socket
socketpair - socketpair i:iiif __socketpair socketpair

1
sysdeps/unix/sysv/linux/generic/syscalls.list
View file

@ -7,5 +7,4 @@ bind - bind i:ipi __bind bind
listen - listen i:ii __listen listen
getsockname - getsockname i:ipp __getsockname getsockname
getpeername - getpeername i:ipp __getpeername getpeername
setsockopt - setsockopt i:iiibn __setsockopt setsockopt
shutdown - shutdown i:ii __shutdown shutdown

1
sysdeps/unix/sysv/linux/hppa/syscalls.list
View file

@ -5,7 +5,6 @@ bind - bind i:ipi __bind bind
getpeername - getpeername i:ipp __getpeername getpeername
getsockname - getsockname i:ipp __getsockname getsockname
listen - listen i:ii __listen listen
setsockopt - setsockopt i:iiibn __setsockopt setsockopt
shutdown - shutdown i:ii __shutdown shutdown
socket - socket i:iii __socket socket
socketpair - socketpair i:iiif __socketpair socketpair

2
sysdeps/unix/sysv/linux/i386/kernel-features.h
View file

@ -23,7 +23,6 @@
# define __ASSUME_SOCKETPAIR_SYSCALL 1
# define __ASSUME_BIND_SYSCALL 1
# define __ASSUME_LISTEN_SYSCALL 1
# define __ASSUME_SETSOCKOPT_SYSCALL 1
# define __ASSUME_GETSOCKNAME_SYSCALL 1
# define __ASSUME_GETPEERNAME_SYSCALL 1
# define __ASSUME_SHUTDOWN_SYSCALL 1
@ -41,6 +40,7 @@
# undef __ASSUME_RECVFROM_SYSCALL
# undef __ASSUME_SENDTO_SYSCALL
# undef __ASSUME_GETSOCKOPT_SYSCALL
# undef __ASSUME_SETSOCKOPT_SYSCALL
#endif
/* i686 only supports ipc syscall before 5.1. */

1
sysdeps/unix/sysv/linux/ia64/syscalls.list
View file

@ -7,7 +7,6 @@ bind - bind i:ipi __bind bind
getpeername - getpeername i:ipp __getpeername getpeername
getsockname - getsockname i:ipp __getsockname getsockname
listen - listen i:ii __listen listen
setsockopt - setsockopt i:iiibn __setsockopt setsockopt
shutdown - shutdown i:ii __shutdown shutdown
socket - socket i:iii __socket socket
socketpair - socketpair i:iiif __socketpair socketpair

1
sysdeps/unix/sysv/linux/kernel-features.h
View file

@ -78,6 +78,7 @@
#define __ASSUME_RECVMMSG_SYSCALL 1
#define __ASSUME_SENDMMSG_SYSCALL 1
#define __ASSUME_GETSOCKOPT_SYSCALL 1
#define __ASSUME_SETSOCKOPT_SYSCALL 1
/* Support for SysV IPC through wired syscalls. All supported architectures
either support ipc syscall and/or all the ipc correspondent syscalls. */

2
sysdeps/unix/sysv/linux/m68k/kernel-features.h
View file

@ -23,7 +23,6 @@
# define __ASSUME_SOCKETPAIR_SYSCALL 1
# define __ASSUME_BIND_SYSCALL 1
# define __ASSUME_LISTEN_SYSCALL 1
# define __ASSUME_SETSOCKOPT_SYSCALL 1
# define __ASSUME_GETSOCKNAME_SYSCALL 1
# define __ASSUME_GETPEERNAME_SYSCALL 1
# define __ASSUME_SHUTDOWN_SYSCALL 1
@ -43,6 +42,7 @@
# undef __ASSUME_RECVFROM_SYSCALL
# undef __ASSUME_SENDTO_SYSCALL
# undef __ASSUME_GETSOCKOPT_SYSCALL
# undef __ASSUME_SETSOCKOPT_SYSCALL
#endif
/* No support for PI futexes or robust mutexes before 3.10 for m68k. */

1
sysdeps/unix/sysv/linux/microblaze/kernel-features.h
View file

@ -28,7 +28,6 @@
#define __ASSUME_SEND_SYSCALL 1
#define __ASSUME_RECV_SYSCALL 1
#define __ASSUME_SHUTDOWN_SYSCALL 1
#define __ASSUME_SETSOCKOPT_SYSCALL 1
#include_next <kernel-features.h>

1
sysdeps/unix/sysv/linux/mips/syscalls.list
View file

@ -16,7 +16,6 @@ bind - bind i:ipi __bind bind
getpeername - getpeername i:ipp __getpeername getpeername
getsockname - getsockname i:ipp __getsockname getsockname
listen - listen i:ii __listen listen
setsockopt - setsockopt i:iiibn __setsockopt setsockopt
shutdown - shutdown i:ii __shutdown shutdown
socket - socket i:iii __socket socket
socketpair - socketpair i:iiif __socketpair socketpair

1
sysdeps/unix/sysv/linux/powerpc/kernel-features.h
View file

@ -28,7 +28,6 @@
#define __ASSUME_SEND_SYSCALL 1
#define __ASSUME_RECV_SYSCALL 1
#define __ASSUME_SHUTDOWN_SYSCALL 1
#define __ASSUME_SETSOCKOPT_SYSCALL 1
/* Define this if your 32-bit syscall API requires 64-bit register
pairs to start with an even-number register. */

2
sysdeps/unix/sysv/linux/s390/kernel-features.h
View file

@ -23,7 +23,6 @@
# define __ASSUME_SOCKETPAIR_SYSCALL 1
# define __ASSUME_BIND_SYSCALL 1
# define __ASSUME_LISTEN_SYSCALL 1
# define __ASSUME_SETSOCKOPT_SYSCALL 1
# define __ASSUME_GETSOCKNAME_SYSCALL 1
# define __ASSUME_GETPEERNAME_SYSCALL 1
# define __ASSUME_SHUTDOWN_SYSCALL 1
@ -43,6 +42,7 @@
# undef __ASSUME_RECVFROM_SYSCALL
# undef __ASSUME_SENDTO_SYSCALL
# undef __ASSUME_GETSOCKOPT_SYSCALL
# undef __ASSUME_SETSOCKOPT_SYSCALL
#endif
/* s390 only supports ipc syscall before 5.1. */

1
sysdeps/unix/sysv/linux/sh/kernel-features.h
View file

@ -33,7 +33,6 @@
#define __ASSUME_SEND_SYSCALL 1
#define __ASSUME_RECV_SYSCALL 1
#define __ASSUME_SHUTDOWN_SYSCALL 1
#define __ASSUME_SETSOCKOPT_SYSCALL 1
#include_next <kernel-features.h>

2
sysdeps/unix/sysv/linux/sparc/kernel-features.h
View file

@ -39,6 +39,7 @@
# undef __ASSUME_RECVFROM_SYSCALL
# undef __ASSUME_SENDTO_SYSCALL
# undef __ASSUME_GETSOCKOPT_SYSCALL
# undef __ASSUME_SETSOCKOPT_SYSCALL
#else
# define __ASSUME_SOCKET_SYSCALL 1
# define __ASSUME_SOCKETPAIR_SYSCALL 1
@ -49,7 +50,6 @@
#if __LINUX_KERNEL_VERSION >= 0x040400
# define __ASSUME_BIND_SYSCALL 1
# define __ASSUME_LISTEN_SYSCALL 1
# define __ASSUME_SETSOCKOPT_SYSCALL 1
#endif
#ifdef __arch64__

1
sysdeps/unix/sysv/linux/x86_64/syscalls.list
View file

@ -10,7 +10,6 @@ bind - bind i:ipi __bind bind
getpeername - getpeername i:ipp __getpeername getpeername
getsockname - getsockname i:ipp __getsockname getsockname
listen - listen i:ii __listen listen
setsockopt - setsockopt i:iiibn __setsockopt setsockopt
shutdown - shutdown i:ii __shutdown shutdown
socket - socket i:iii __socket socket
socketpair - socketpair i:iiif __socketpair socketpair