[PATCH 09/28] linux: Assume getsockname support
Adhemerval Zanella
adhemerval.zanella@linaro.org
Thu Nov 19 12:56:08 GMT 2020
On 18/11/2020 16:55, Adhemerval Zanella wrote:
> Checked with build for the affected ABI.
> ---
> sysdeps/unix/sysv/linux/alpha/syscalls.list | 1 -
> sysdeps/unix/sysv/linux/arm/syscalls.list | 1 -
> sysdeps/unix/sysv/linux/generic/syscalls.list | 1 -
> sysdeps/unix/sysv/linux/hppa/syscalls.list | 1 -
> sysdeps/unix/sysv/linux/i386/kernel-features.h | 2 +-
> sysdeps/unix/sysv/linux/ia64/syscalls.list | 1 -
> sysdeps/unix/sysv/linux/kernel-features.h | 1 +
> sysdeps/unix/sysv/linux/m68k/kernel-features.h | 2 +-
> sysdeps/unix/sysv/linux/microblaze/kernel-features.h | 1 -
> sysdeps/unix/sysv/linux/mips/syscalls.list | 1 -
> sysdeps/unix/sysv/linux/powerpc/kernel-features.h | 1 -
> sysdeps/unix/sysv/linux/s390/kernel-features.h | 1 -
> sysdeps/unix/sysv/linux/sh/kernel-features.h | 1 -
> sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list | 1 -
> sysdeps/unix/sysv/linux/x86_64/syscalls.list | 1 -
> 15 files changed, 3 insertions(+), 14 deletions(-)
>
> diff --git a/sysdeps/unix/sysv/linux/alpha/syscalls.list b/sysdeps/unix/sysv/linux/alpha/syscalls.list
> index 62d79edd56..26e4070686 100644
> --- a/sysdeps/unix/sysv/linux/alpha/syscalls.list
> +++ b/sysdeps/unix/sysv/linux/alpha/syscalls.list
> @@ -5,7 +5,6 @@ sigstack - sigstack 2 sigstack
> getpriority - getpriority i:ii __getpriority getpriority
>
> # proper socket implementations:
> -getsockname - getsockname i:ipp __getsockname getsockname
> getsockopt - getsockopt i:iiiBN __getsockopt getsockopt
> listen - listen i:ii __listen listen
> setsockopt - setsockopt i:iiibn __setsockopt setsockopt
> diff --git a/sysdeps/unix/sysv/linux/arm/syscalls.list b/sysdeps/unix/sysv/linux/arm/syscalls.list
> index 87e6c6c88d..71e2b99cf5 100644
> --- a/sysdeps/unix/sysv/linux/arm/syscalls.list
> +++ b/sysdeps/unix/sysv/linux/arm/syscalls.list
> @@ -20,7 +20,6 @@ prlimit64 EXTRA prlimit64 i:iipp prlimit64
> fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark
>
> # proper socket implementations:
> -getsockname - getsockname i:ipp __getsockname getsockname
> getsockopt - getsockopt i:iiiBN __getsockopt getsockopt
> listen - listen i:ii __listen listen
> setsockopt - setsockopt i:iiibn __setsockopt setsockopt
> diff --git a/sysdeps/unix/sysv/linux/generic/syscalls.list b/sysdeps/unix/sysv/linux/generic/syscalls.list
> index 3af1893c80..5e4b8f2e29 100644
> --- a/sysdeps/unix/sysv/linux/generic/syscalls.list
> +++ b/sysdeps/unix/sysv/linux/generic/syscalls.list
> @@ -4,7 +4,6 @@
> socket - socket i:iii __socket socket
> socketpair - socketpair i:iiif __socketpair socketpair
> listen - listen i:ii __listen listen
> -getsockname - getsockname i:ipp __getsockname getsockname
> setsockopt - setsockopt i:iiibn __setsockopt setsockopt
> getsockopt - getsockopt i:iiiBN __getsockopt getsockopt
> shutdown - shutdown i:ii __shutdown shutdown
> diff --git a/sysdeps/unix/sysv/linux/hppa/syscalls.list b/sysdeps/unix/sysv/linux/hppa/syscalls.list
> index 0d4e9d5e1c..ec6105c655 100644
> --- a/sysdeps/unix/sysv/linux/hppa/syscalls.list
> +++ b/sysdeps/unix/sysv/linux/hppa/syscalls.list
> @@ -1,7 +1,6 @@
> # File name Caller Syscall name # args Strong name Weak names
>
> # proper socket implementations:
> -getsockname - getsockname i:ipp __getsockname getsockname
> getsockopt - getsockopt i:iiiBN __getsockopt getsockopt
> listen - listen i:ii __listen listen
> setsockopt - setsockopt i:iiibn __setsockopt setsockopt
> diff --git a/sysdeps/unix/sysv/linux/i386/kernel-features.h b/sysdeps/unix/sysv/linux/i386/kernel-features.h
> index 53e9890819..be1cfe94b8 100644
> --- a/sysdeps/unix/sysv/linux/i386/kernel-features.h
> +++ b/sysdeps/unix/sysv/linux/i386/kernel-features.h
> @@ -24,7 +24,6 @@
> # define __ASSUME_LISTEN_SYSCALL 1
> # define __ASSUME_GETSOCKOPT_SYSCALL 1
> # define __ASSUME_SETSOCKOPT_SYSCALL 1
> -# define __ASSUME_GETSOCKNAME_SYSCALL 1
> # define __ASSUME_SHUTDOWN_SYSCALL 1
> #endif
>
> @@ -41,6 +40,7 @@
> # undef __ASSUME_RECVFROM_SYSCALL
> # undef __ASSUME_SENDTO_SYSCALL
> # undef __ASSUME_GETPEERNAME_SYSCALL
> +# undef __ASSUME_GETSOCKNAME_SYSCALL
> #endif
>
> /* i686 only supports ipc syscall before 5.1. */
> diff --git a/sysdeps/unix/sysv/linux/ia64/syscalls.list b/sysdeps/unix/sysv/linux/ia64/syscalls.list
> index 5bb62003d0..748ba3215c 100644
> --- a/sysdeps/unix/sysv/linux/ia64/syscalls.list
> +++ b/sysdeps/unix/sysv/linux/ia64/syscalls.list
> @@ -3,7 +3,6 @@
> getpriority - getpriority i:ii __getpriority getpriority
>
> # proper socket implementations:
> -getsockname - getsockname i:ipp __getsockname getsockname
> getsockopt - getsockopt i:iiiBN __getsockopt getsockopt
> listen - listen i:ii __listen listen
> setsockopt - setsockopt i:iiibn __setsockopt setsockopt
> diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h
> index 9945f4388b..7266f34100 100644
> --- a/sysdeps/unix/sysv/linux/kernel-features.h
> +++ b/sysdeps/unix/sysv/linux/kernel-features.h
> @@ -79,6 +79,7 @@
> #define __ASSUME_RECVMMSG_SYSCALL 1
> #define __ASSUME_SENDMMSG_SYSCALL 1
> #define __ASSUME_GETPEERNAME_SYSCALL 1
> +#define __ASSUME_GETSOCKNAME_SYSCALL 1
>
> /* Support for SysV IPC through wired syscalls. All supported architectures
> either support ipc syscall and/or all the ipc correspondent syscalls. */
> diff --git a/sysdeps/unix/sysv/linux/m68k/kernel-features.h b/sysdeps/unix/sysv/linux/m68k/kernel-features.h
> index e321895ae8..1acdabb637 100644
> --- a/sysdeps/unix/sysv/linux/m68k/kernel-features.h
> +++ b/sysdeps/unix/sysv/linux/m68k/kernel-features.h
> @@ -24,7 +24,6 @@
> # define __ASSUME_LISTEN_SYSCALL 1
> # define __ASSUME_GETSOCKOPT_SYSCALL 1
> # define __ASSUME_SETSOCKOPT_SYSCALL 1
> -# define __ASSUME_GETSOCKNAME_SYSCALL 1
> # define __ASSUME_SHUTDOWN_SYSCALL 1
> #endif
>
> @@ -43,6 +42,7 @@
> # undef __ASSUME_RECVFROM_SYSCALL
> # undef __ASSUME_SENDTO_SYSCALL
> # undef __ASSUME_GETPEERNAME_SYSCALL
> +# undef __ASSUME_GETSOCKNAME_SYSCALL
> #endif
>
> /* No support for PI futexes or robust mutexes before 3.10 for m68k. */
> diff --git a/sysdeps/unix/sysv/linux/microblaze/kernel-features.h b/sysdeps/unix/sysv/linux/microblaze/kernel-features.h
> index 13eba077d6..84c1b144e0 100644
> --- a/sysdeps/unix/sysv/linux/microblaze/kernel-features.h
> +++ b/sysdeps/unix/sysv/linux/microblaze/kernel-features.h
> @@ -21,7 +21,6 @@
> #define __ASSUME_SOCKET_SYSCALL 1
> #define __ASSUME_CONNECT_SYSCALL 1
> #define __ASSUME_LISTEN_SYSCALL 1
> -#define __ASSUME_GETSOCKNAME_SYSCALL 1
> #define __ASSUME_SOCKETPAIR_SYSCALL 1
> #define __ASSUME_SEND_SYSCALL 1
> #define __ASSUME_RECV_SYSCALL 1
> diff --git a/sysdeps/unix/sysv/linux/mips/syscalls.list b/sysdeps/unix/sysv/linux/mips/syscalls.list
> index a9dff10271..e2a6d1ca64 100644
> --- a/sysdeps/unix/sysv/linux/mips/syscalls.list
> +++ b/sysdeps/unix/sysv/linux/mips/syscalls.list
> @@ -12,7 +12,6 @@ sysmips - sysmips i:iiii __sysmips sysmips
> # Socket functions; Linux/MIPS doesn't use the socketcall(2) wrapper;
> # it's provided for compatibility, though.
> #
> -getsockname - getsockname i:ipp __getsockname getsockname
> getsockopt - getsockopt i:iiiBN __getsockopt getsockopt
> listen - listen i:ii __listen listen
> setsockopt - setsockopt i:iiibn __setsockopt setsockopt
> diff --git a/sysdeps/unix/sysv/linux/powerpc/kernel-features.h b/sysdeps/unix/sysv/linux/powerpc/kernel-features.h
> index ed7d75e0a4..40a38ebe4f 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/kernel-features.h
> +++ b/sysdeps/unix/sysv/linux/powerpc/kernel-features.h
> @@ -21,7 +21,6 @@
> #define __ASSUME_SOCKET_SYSCALL 1
> #define __ASSUME_CONNECT_SYSCALL 1
> #define __ASSUME_LISTEN_SYSCALL 1
> -#define __ASSUME_GETSOCKNAME_SYSCALL 1
> #define __ASSUME_SOCKETPAIR_SYSCALL 1
> #define __ASSUME_SEND_SYSCALL 1
> #define __ASSUME_RECV_SYSCALL 1
> diff --git a/sysdeps/unix/sysv/linux/s390/kernel-features.h b/sysdeps/unix/sysv/linux/s390/kernel-features.h
> index 7a7b22ed01..a3bb354246 100644
> --- a/sysdeps/unix/sysv/linux/s390/kernel-features.h
> +++ b/sysdeps/unix/sysv/linux/s390/kernel-features.h
> @@ -24,7 +24,6 @@
> # define __ASSUME_LISTEN_SYSCALL 1
> # define __ASSUME_GETSOCKOPT_SYSCALL 1
> # define __ASSUME_SETSOCKOPT_SYSCALL 1
> -# define __ASSUME_GETSOCKNAME_SYSCALL 1
> # define __ASSUME_SHUTDOWN_SYSCALL 1
> #endif
>
> diff --git a/sysdeps/unix/sysv/linux/sh/kernel-features.h b/sysdeps/unix/sysv/linux/sh/kernel-features.h
> index 34109ae859..ee5b556b7b 100644
> --- a/sysdeps/unix/sysv/linux/sh/kernel-features.h
> +++ b/sysdeps/unix/sysv/linux/sh/kernel-features.h
> @@ -26,7 +26,6 @@
> #define __ASSUME_SOCKET_SYSCALL 1
> #define __ASSUME_CONNECT_SYSCALL 1
> #define __ASSUME_LISTEN_SYSCALL 1
> -#define __ASSUME_GETSOCKNAME_SYSCALL 1
> #define __ASSUME_SOCKETPAIR_SYSCALL 1
> #define __ASSUME_SEND_SYSCALL 1
> #define __ASSUME_RECV_SYSCALL 1
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list b/sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list
> index 2acc8a1437..f20a343840 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list
> @@ -1,6 +1,5 @@
> # File name Caller Syscall name # args Strong name Weak names
>
> -getsockname - getsockname 3 __getsockname getsockname
> getsockopt - getsockopt 5 __getsockopt getsockopt
> shutdown - shutdown 2 __shutdown shutdown
> socketpair - socketpair 4 __socketpair socketpair
It also requires to disable for sparc32 targeting kernel lower than 4.4:
diff --git a/sysdeps/unix/sysv/linux/sparc/kernel-features.h b/sysdeps/unix/sysv/linux/sparc/kernel-features.h
index 6429aaf8c2..6af42a6684 100644
--- a/sysdeps/unix/sysv/linux/sparc/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/sparc/kernel-features.h
@@ -39,6 +39,7 @@
# undef __ASSUME_RECVFROM_SYSCALL
# undef __ASSUME_SENDTO_SYSCALL
# undef __ASSUME_GETPEERNAME_SYSCALL
+# undef __ASSUME_GETSOCKNAME_SYSCALL
#else
# define __ASSUME_SOCKET_SYSCALL 1
# define __ASSUME_SOCKETPAIR_SYSCALL 1
> diff --git a/sysdeps/unix/sysv/linux/x86_64/syscalls.list b/sysdeps/unix/sysv/linux/x86_64/syscalls.list
> index f7612e6545..d9cd71773d 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/syscalls.list
> +++ b/sysdeps/unix/sysv/linux/x86_64/syscalls.list
> @@ -6,7 +6,6 @@ syscall_clock_gettime EXTRA clock_gettime Ei:ip __syscall_clock_gettime
>
>
> # proper socket implementations:
> -getsockname - getsockname i:ipp __getsockname getsockname
> getsockopt - getsockopt i:iiiBN __getsockopt getsockopt
> listen - listen i:ii __listen listen
> setsockopt - setsockopt i:iiibn __setsockopt setsockopt
>
More information about the Libc-alpha
mailing list