Linux: Assume and consolidate listen wire-up syscall

And disable if kernel does not support it.

Checked on x86_64-linux-gnu and i686-linux-gnu.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>

diff --git a/sysdeps/unix/sysv/linux/generic/syscalls.list b/sysdeps/unix/sysv/linux/generic/syscalls.list
index 95ed2cbac8c18eb1970670cafea85d5e0c06a3d9..706893f2454d21e3884eea8fd6b081b634d11d85 100644 (file)
--- a/sysdeps/unix/sysv/linux/generic/syscalls.list
+++ b/sysdeps/unix/sysv/linux/generic/syscalls.list
@@ -1,7 +1,6 @@
 # File name    Caller  Syscall name    # args  Strong name     Weak names
 
 # Socket APIs
-listen         -       listen          i:ii    __listen        listen
 getsockname    -       getsockname     i:ipp   __getsockname   getsockname
 getpeername    -       getpeername     i:ipp   __getpeername   getpeername
 shutdown       -       shutdown        i:ii    __shutdown      shutdown

diff --git a/sysdeps/unix/sysv/linux/i386/kernel-features.h b/sysdeps/unix/sysv/linux/i386/kernel-features.h
index 8a7fe47602e07d87b98054daed41c96386711ac6..a79ec679cc42a0fff8bace4d7c362b1c094ec43e 100644 (file)
--- a/sysdeps/unix/sysv/linux/i386/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/i386/kernel-features.h
@@ -19,7 +19,6 @@
 
 /* Direct socketcalls available with kernel 4.3.  */
 #if __LINUX_KERNEL_VERSION >= 0x040300
-# define __ASSUME_LISTEN_SYSCALL             1
 # define __ASSUME_GETSOCKNAME_SYSCALL        1
 # define __ASSUME_GETPEERNAME_SYSCALL        1
 # define __ASSUME_SHUTDOWN_SYSCALL           1
@@ -41,6 +40,7 @@
 # undef __ASSUME_BIND_SYSCALL
 # undef __ASSUME_SOCKET_SYSCALL
 # undef __ASSUME_SOCKETPAIR_SYSCALL
+# undef __ASSUME_LISTEN_SYSCALL
 #endif
 
 /* i686 only supports ipc syscall before 5.1.  */

diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h
index fd44b39cf499867163f42928c15f88289a58fa07..d1769b2d9960e98e31373b90ace44b3ae3278da7 100644 (file)
--- a/sysdeps/unix/sysv/linux/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/kernel-features.h
@@ -82,6 +82,7 @@
 #define __ASSUME_BIND_SYSCALL          1
 #define __ASSUME_SOCKET_SYSCALL                1
 #define __ASSUME_SOCKETPAIR_SYSCALL    1
+#define __ASSUME_LISTEN_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/listen.c b/sysdeps/unix/sysv/linux/listen.c
index 8d7ff85edfc0fa6ecc65cf416aba2f8b54e493e5..e563e4df6c4fbb6a6470bc39a81afd5989dc57ee 100644 (file)
--- a/sysdeps/unix/sysv/linux/listen.c
+++ b/sysdeps/unix/sysv/linux/listen.c
@@ -15,19 +15,14 @@
    License along with the GNU C Library; if not, see
    <https://www.gnu.org/licenses/>.  */
 
-#include <errno.h>
-#include <signal.h>
 #include <sys/socket.h>
-
 #include <socketcall.h>
-#include <kernel-features.h>
-#include <sys/syscall.h>
 
 int
 listen (int fd, int backlog)
 {
 #ifdef __ASSUME_LISTEN_SYSCALL
-  return INLINE_SYSCALL (listen, 2, fd, backlog);
+  return INLINE_SYSCALL_CALL (listen, fd, backlog);
 #else
   return SOCKETCALL (listen, fd, backlog);
 #endif

diff --git a/sysdeps/unix/sysv/linux/m68k/kernel-features.h b/sysdeps/unix/sysv/linux/m68k/kernel-features.h
index 46b3045b5685c7cbda8eab092fbd40e88f0d5ea5..a65fa63c5e0abf2c222dc2eb1f48fed73433205c 100644 (file)
--- a/sysdeps/unix/sysv/linux/m68k/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/m68k/kernel-features.h
@@ -19,7 +19,6 @@
 
 /* Direct socketcalls available with kernel 4.3.  */
 #if __LINUX_KERNEL_VERSION >= 0x040300
-# define __ASSUME_LISTEN_SYSCALL             1
 # define __ASSUME_GETSOCKNAME_SYSCALL        1
 # define __ASSUME_GETPEERNAME_SYSCALL        1
 # define __ASSUME_SHUTDOWN_SYSCALL           1
@@ -43,6 +42,7 @@
 # undef __ASSUME_BIND_SYSCALL
 # undef __ASSUME_SOCKET_SYSCALL
 # undef __ASSUME_SOCKETPAIR_SYSCALL
+# undef __ASSUME_LISTEN_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 198ff3209d085e5ffd75886c9228b258d33c838a..e19e6bb6ba8d5629786e146fb3acb940971e810f 100644 (file)
--- a/sysdeps/unix/sysv/linux/microblaze/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/microblaze/kernel-features.h
@@ -19,7 +19,6 @@
 
 /* All supported kernel versions for MicroBlaze have these syscalls.  */
 #define __ASSUME_CONNECT_SYSCALL       1
-#define __ASSUME_LISTEN_SYSCALL                1
 #define __ASSUME_GETSOCKNAME_SYSCALL   1
 #define __ASSUME_GETPEERNAME_SYSCALL   1
 #define __ASSUME_SEND_SYSCALL          1

diff --git a/sysdeps/unix/sysv/linux/powerpc/kernel-features.h b/sysdeps/unix/sysv/linux/powerpc/kernel-features.h
index 72ec2df1782855b85cb17999f58483adef2473bc..eb73a91a5da4e6cd6898830fb1c55268300a810b 100644 (file)
--- a/sysdeps/unix/sysv/linux/powerpc/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/powerpc/kernel-features.h
@@ -19,7 +19,6 @@
 
 /* New syscalls added for PowerPC in 2.6.37.  */
 #define __ASSUME_CONNECT_SYSCALL       1
-#define __ASSUME_LISTEN_SYSCALL                1
 #define __ASSUME_GETSOCKNAME_SYSCALL   1
 #define __ASSUME_GETPEERNAME_SYSCALL   1
 #define __ASSUME_SEND_SYSCALL          1

diff --git a/sysdeps/unix/sysv/linux/s390/kernel-features.h b/sysdeps/unix/sysv/linux/s390/kernel-features.h
index 01fc98e9ab2f0cc2d0670e70d00abdc97660b9f2..3daee3f13212836405c93d4f65aa047daffb4e8a 100644 (file)
--- a/sysdeps/unix/sysv/linux/s390/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/s390/kernel-features.h
@@ -19,7 +19,6 @@
 
 /* Direct socketcalls available with kernel 4.3.  */
 #if __LINUX_KERNEL_VERSION >= 0x040300
-# define __ASSUME_LISTEN_SYSCALL             1
 # define __ASSUME_GETSOCKNAME_SYSCALL        1
 # define __ASSUME_GETPEERNAME_SYSCALL        1
 # define __ASSUME_SHUTDOWN_SYSCALL           1
@@ -43,6 +42,7 @@
 # undef __ASSUME_BIND_SYSCALL
 # undef __ASSUME_SOCKET_SYSCALL
 # undef __ASSUME_SOCKETPAIR_SYSCALL
+# undef __ASSUME_LISTEN_SYSCALL
 #endif
 
 /* s390 only supports ipc syscall before 5.1.  */

diff --git a/sysdeps/unix/sysv/linux/sh/kernel-features.h b/sysdeps/unix/sysv/linux/sh/kernel-features.h
index b18314a9cd20ba83773e97729328c54603278771..23eadf84e07f34e0c27e80ff7a5cff01cc783a08 100644 (file)
--- a/sysdeps/unix/sysv/linux/sh/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/sh/kernel-features.h
@@ -24,7 +24,6 @@
 
 /* These syscalls were added for SH in 2.6.37.  */
 #define __ASSUME_CONNECT_SYSCALL       1
-#define __ASSUME_LISTEN_SYSCALL                1
 #define __ASSUME_GETSOCKNAME_SYSCALL   1
 #define __ASSUME_GETPEERNAME_SYSCALL   1
 #define __ASSUME_SEND_SYSCALL          1

diff --git a/sysdeps/unix/sysv/linux/sparc/kernel-features.h b/sysdeps/unix/sysv/linux/sparc/kernel-features.h
index f43e5c384f38b3bd7ff0f700367dfaa4889b2953..7070aaa1aeb099ada2c16f6d033bf626463dc8c5 100644 (file)
--- a/sysdeps/unix/sysv/linux/sparc/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/sparc/kernel-features.h
@@ -45,12 +45,9 @@
 #endif
 
 /* These syscalls were added for both 32-bit and 64-bit in 4.4.  */
-#if __LINUX_KERNEL_VERSION >= 0x040400
-# define __ASSUME_LISTEN_SYSCALL             1
-#endif
-
 #if __LINUX_KERNEL_VERSION < 0x040400
 # undef __ASSUME_BIND_SYSCALL
+# undef __ASSUME_LISTEN_SYSCALL
 #endif
 
 #ifdef __arch64__