Linux: Assume and consolidate socketpair 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 e5a62811a5aab4f2033e3636f504c63bfb8bab9f..95ed2cbac8c18eb1970670cafea85d5e0c06a3d9 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
-socketpair     -       socketpair      i:iiif  __socketpair    socketpair
 listen         -       listen          i:ii    __listen        listen
 getsockname    -       getsockname     i:ipp   __getsockname   getsockname
 getpeername    -       getpeername     i:ipp   __getpeername   getpeername

diff --git a/sysdeps/unix/sysv/linux/i386/kernel-features.h b/sysdeps/unix/sysv/linux/i386/kernel-features.h
index 4c2f1eb8f565b42ef03273586fc04248ecc52863..8a7fe47602e07d87b98054daed41c96386711ac6 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_SOCKETPAIR_SYSCALL         1
 # define __ASSUME_LISTEN_SYSCALL             1
 # define __ASSUME_GETSOCKNAME_SYSCALL        1
 # define __ASSUME_GETPEERNAME_SYSCALL        1
@@ -41,6 +40,7 @@
 # undef __ASSUME_SETSOCKOPT_SYSCALL
 # undef __ASSUME_BIND_SYSCALL
 # undef __ASSUME_SOCKET_SYSCALL
+# undef __ASSUME_SOCKETPAIR_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 a42b70c85b75b61c3d889584817decdfe83c275a..fd44b39cf499867163f42928c15f88289a58fa07 100644 (file)
--- a/sysdeps/unix/sysv/linux/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/kernel-features.h
@@ -81,6 +81,7 @@
 #define __ASSUME_SETSOCKOPT_SYSCALL    1
 #define __ASSUME_BIND_SYSCALL          1
 #define __ASSUME_SOCKET_SYSCALL                1
+#define __ASSUME_SOCKETPAIR_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 38ffbdbaed39cad8f0953db786223a546df08aa6..46b3045b5685c7cbda8eab092fbd40e88f0d5ea5 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_SOCKETPAIR_SYSCALL         1
 # define __ASSUME_LISTEN_SYSCALL             1
 # define __ASSUME_GETSOCKNAME_SYSCALL        1
 # define __ASSUME_GETPEERNAME_SYSCALL        1
@@ -43,6 +42,7 @@
 # undef __ASSUME_SETSOCKOPT_SYSCALL
 # undef __ASSUME_BIND_SYSCALL
 # undef __ASSUME_SOCKET_SYSCALL
+# undef __ASSUME_SOCKETPAIR_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 389dd146b42762ed180b70a802ab6141fc1aecff..198ff3209d085e5ffd75886c9228b258d33c838a 100644 (file)
--- a/sysdeps/unix/sysv/linux/microblaze/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/microblaze/kernel-features.h
@@ -22,7 +22,6 @@
 #define __ASSUME_LISTEN_SYSCALL                1
 #define __ASSUME_GETSOCKNAME_SYSCALL   1
 #define __ASSUME_GETPEERNAME_SYSCALL   1
-#define __ASSUME_SOCKETPAIR_SYSCALL    1
 #define __ASSUME_SEND_SYSCALL          1
 #define __ASSUME_RECV_SYSCALL          1
 #define __ASSUME_SHUTDOWN_SYSCALL      1

diff --git a/sysdeps/unix/sysv/linux/powerpc/kernel-features.h b/sysdeps/unix/sysv/linux/powerpc/kernel-features.h
index 9ee1dc2bc793c8f8ee4fe0decba184d382e82c16..72ec2df1782855b85cb17999f58483adef2473bc 100644 (file)
--- a/sysdeps/unix/sysv/linux/powerpc/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/powerpc/kernel-features.h
@@ -22,7 +22,6 @@
 #define __ASSUME_LISTEN_SYSCALL                1
 #define __ASSUME_GETSOCKNAME_SYSCALL   1
 #define __ASSUME_GETPEERNAME_SYSCALL   1
-#define __ASSUME_SOCKETPAIR_SYSCALL    1
 #define __ASSUME_SEND_SYSCALL          1
 #define __ASSUME_RECV_SYSCALL          1
 #define __ASSUME_SHUTDOWN_SYSCALL      1

diff --git a/sysdeps/unix/sysv/linux/s390/kernel-features.h b/sysdeps/unix/sysv/linux/s390/kernel-features.h
index d5991b265b028fead9d81086194841786bafa1c9..01fc98e9ab2f0cc2d0670e70d00abdc97660b9f2 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_SOCKETPAIR_SYSCALL         1
 # define __ASSUME_LISTEN_SYSCALL             1
 # define __ASSUME_GETSOCKNAME_SYSCALL        1
 # define __ASSUME_GETPEERNAME_SYSCALL        1
@@ -43,6 +42,7 @@
 # undef __ASSUME_SETSOCKOPT_SYSCALL
 # undef __ASSUME_BIND_SYSCALL
 # undef __ASSUME_SOCKET_SYSCALL
+# undef __ASSUME_SOCKETPAIR_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 3b57eb7f27e7b5f0a420ecd39545eed7f15aff03..b18314a9cd20ba83773e97729328c54603278771 100644 (file)
--- a/sysdeps/unix/sysv/linux/sh/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/sh/kernel-features.h
@@ -27,7 +27,6 @@
 #define __ASSUME_LISTEN_SYSCALL                1
 #define __ASSUME_GETSOCKNAME_SYSCALL   1
 #define __ASSUME_GETPEERNAME_SYSCALL   1
-#define __ASSUME_SOCKETPAIR_SYSCALL    1
 #define __ASSUME_SEND_SYSCALL          1
 #define __ASSUME_RECV_SYSCALL          1
 #define __ASSUME_SHUTDOWN_SYSCALL      1

diff --git a/sysdeps/unix/sysv/linux/socketpair.c b/sysdeps/unix/sysv/linux/socketpair.c
index d06cbbc2c93513a3ecb7c31a26cf9acb75cb896d..65f8cb46dcc9e9d5306c2c3482d0a134679859f3 100644 (file)
--- a/sysdeps/unix/sysv/linux/socketpair.c
+++ b/sysdeps/unix/sysv/linux/socketpair.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
 __socketpair (int domain, int type, int protocol, int sv[2])
 {
 #ifdef __ASSUME_SOCKETPAIR_SYSCALL
-  return INLINE_SYSCALL (socketpair, 4, domain, type, protocol, &sv[0]);
+  return INLINE_SYSCALL_CALL (socketpair, domain, type, protocol, &sv[0]);
 #else
   return SOCKETCALL (socketpair, domain, type, protocol, sv);
 #endif

diff --git a/sysdeps/unix/sysv/linux/sparc/kernel-features.h b/sysdeps/unix/sysv/linux/sparc/kernel-features.h
index f3a5ef6a99223207894c22bb5e5bb7232d4fb0f2..f43e5c384f38b3bd7ff0f700367dfaa4889b2953 100644 (file)
--- a/sysdeps/unix/sysv/linux/sparc/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/sparc/kernel-features.h
@@ -41,7 +41,6 @@
 # undef __ASSUME_GETSOCKOPT_SYSCALL
 # undef __ASSUME_SETSOCKOPT_SYSCALL
 #else
-# define __ASSUME_SOCKETPAIR_SYSCALL         1
 # define __ASSUME_SHUTDOWN_SYSCALL           1
 #endif