diff --git a/sysdeps/unix/sysv/linux/alpha/syscalls.list b/sysdeps/unix/sysv/linux/alpha/syscalls.list
index b35f5fc199..6e06255d3c 100644
--- a/sysdeps/unix/sysv/linux/alpha/syscalls.list
+++ b/sysdeps/unix/sysv/linux/alpha/syscalls.list
@@ -4,9 +4,6 @@ sigstack - sigstack 2 sigstack
getpriority - getpriority i:ii __getpriority getpriority
-# proper socket implementations:
-socketpair - socketpair i:iiif __socketpair socketpair
-
ptrace - ptrace 4 __ptrace ptrace
# access pci space protected from machine checks:
diff --git a/sysdeps/unix/sysv/linux/arm/syscalls.list b/sysdeps/unix/sysv/linux/arm/syscalls.list
index 1dec4bcfdd..742ed64ec9 100644
--- a/sysdeps/unix/sysv/linux/arm/syscalls.list
+++ b/sysdeps/unix/sysv/linux/arm/syscalls.list
@@ -18,6 +18,3 @@ setfsuid - setfsuid32 Ei:i setfsuid
prlimit64 EXTRA prlimit64 i:iipp prlimit64
fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark
-
-# proper socket implementations:
-socketpair - socketpair i:iiif __socketpair socketpair
diff --git a/sysdeps/unix/sysv/linux/generic/syscalls.list b/sysdeps/unix/sysv/linux/generic/syscalls.list
deleted file mode 100644
index 0749707049..0000000000
--- a/sysdeps/unix/sysv/linux/generic/syscalls.list
+++ /dev/null
@@ -1,4 +0,0 @@
-# File name Caller Syscall name # args Strong name Weak names
-
-# Socket APIs
-socketpair - socketpair i:iiif __socketpair socketpair
diff --git a/sysdeps/unix/sysv/linux/hppa/syscalls.list b/sysdeps/unix/sysv/linux/hppa/syscalls.list
index 4a159a4da5..11fada447c 100644
--- a/sysdeps/unix/sysv/linux/hppa/syscalls.list
+++ b/sysdeps/unix/sysv/linux/hppa/syscalls.list
@@ -1,7 +1,4 @@
# File name Caller Syscall name # args Strong name Weak names
-# proper socket implementations:
-socketpair - socketpair i:iiif __socketpair socketpair
-
prlimit64 EXTRA prlimit64 i:iipp __prlimit64 prlimit64@@GLIBC_2.17
fanotify_mark EXTRA fanotify_mark i:iiiiis __fanotify_mark fanotify_mark@@GLIBC_2.19
diff --git a/sysdeps/unix/sysv/linux/i386/kernel-features.h b/sysdeps/unix/sysv/linux/i386/kernel-features.h
index e15db22472..176552766e 100644
--- a/sysdeps/unix/sysv/linux/i386/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/i386/kernel-features.h
@@ -17,15 +17,11 @@
License along with the GNU C Library; if not, see
. */
-/* Direct socketcalls available with kernel 4.3. */
-#if __LINUX_KERNEL_VERSION >= 0x040300
-# define __ASSUME_SOCKETPAIR_SYSCALL 1
-#endif
-
#include_next
#undef __ASSUME_ACCEPT_SYSCALL
+/* Direct socketcalls available with kernel 4.3. */
#if __LINUX_KERNEL_VERSION < 0x040300
# undef __ASSUME_BIND_SYSCALL
# undef __ASSUME_ACCEPT4_SYSCALL
@@ -41,6 +37,7 @@
# undef __ASSUME_SETSOCKOPT_SYSCALL
# undef __ASSUME_SHUTDOWN_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/ia64/syscalls.list b/sysdeps/unix/sysv/linux/ia64/syscalls.list
index 33cc01b64a..e468da4816 100644
--- a/sysdeps/unix/sysv/linux/ia64/syscalls.list
+++ b/sysdeps/unix/sysv/linux/ia64/syscalls.list
@@ -2,9 +2,6 @@
getpriority - getpriority i:ii __getpriority getpriority
-# proper socket implementations:
-socketpair - socketpair i:iiif __socketpair socketpair
-
# DIG-compliant access to PCI configuration space:
pciconfig_read EXTRA pciconfig_read 5 pciconfig_read
pciconfig_write EXTRA pciconfig_write 5 pciconfig_write
diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h
index 6d5658c680..b7c1996943 100644
--- a/sysdeps/unix/sysv/linux/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/kernel-features.h
@@ -85,6 +85,7 @@
#define __ASSUME_SETSOCKOPT_SYSCALL 1
#define __ASSUME_SHUTDOWN_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 b9371c36b0..ed7954f09a 100644
--- a/sysdeps/unix/sysv/linux/m68k/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/m68k/kernel-features.h
@@ -17,15 +17,11 @@
License along with the GNU C Library. If not, see
. */
-/* Direct socketcalls available with kernel 4.3. */
-#if __LINUX_KERNEL_VERSION >= 0x040300
-# define __ASSUME_SOCKETPAIR_SYSCALL 1
-#endif
-
#include_next
#undef __ASSUME_ACCEPT_SYSCALL
+/* Direct socketcalls available with kernel 4.3. */
#if __LINUX_KERNEL_VERSION < 0x040300
# undef __ASSUME_BIND_SYSCALL
# undef __ASSUME_ACCEPT4_SYSCALL
@@ -43,6 +39,7 @@
# undef __ASSUME_SETSOCKOPT_SYSCALL
# undef __ASSUME_SHUTDOWN_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 3082a05426..ede5e8d359 100644
--- 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_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 9881c832a5..4b72434b57 100644
--- a/sysdeps/unix/sysv/linux/mips/syscalls.list
+++ b/sysdeps/unix/sysv/linux/mips/syscalls.list
@@ -7,9 +7,3 @@
cachectl - cachectl i:pii __cachectl cachectl
cacheflush - cacheflush i:pii _flush_cache cacheflush
sysmips - sysmips i:iiii __sysmips sysmips
-
-#
-# Socket functions; Linux/MIPS doesn't use the socketcall(2) wrapper;
-# it's provided for compatibility, though.
-#
-socketpair - socketpair i:iiif __socketpair socketpair
diff --git a/sysdeps/unix/sysv/linux/powerpc/kernel-features.h b/sysdeps/unix/sysv/linux/powerpc/kernel-features.h
index e50a0a5069..7397a844cf 100644
--- 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_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 a74f8af97d..2b3e162ad7 100644
--- a/sysdeps/unix/sysv/linux/s390/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/s390/kernel-features.h
@@ -17,15 +17,11 @@
License along with the GNU C Library; if not, see
. */
-/* Direct socketcalls available with kernel 4.3. */
-#if __LINUX_KERNEL_VERSION >= 0x040300
-# define __ASSUME_SOCKETPAIR_SYSCALL 1
-#endif
-
#include_next
#undef __ASSUME_ACCEPT_SYSCALL
+/* Direct socketcalls available with kernel 4.3. */
#if __LINUX_KERNEL_VERSION < 0x040300
# undef __ASSUME_BIND_SYSCALL
# undef __ASSUME_ACCEPT4_SYSCALL
@@ -42,6 +38,7 @@
# undef __ASSUME_SETSOCKOPT_SYSCALL
# undef __ASSUME_SHUTDOWN_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 9aecddc1b3..ae0e3be10d 100644
--- 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_SOCKETPAIR_SYSCALL 1
#define __ASSUME_SEND_SYSCALL 1
#define __ASSUME_RECV_SYSCALL 1
diff --git a/sysdeps/unix/sysv/linux/sparc/kernel-features.h b/sysdeps/unix/sysv/linux/sparc/kernel-features.h
index 54e79852e6..3ebd4cea85 100644
--- a/sysdeps/unix/sysv/linux/sparc/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/sparc/kernel-features.h
@@ -41,8 +41,7 @@
# undef __ASSUME_GETSOCKOPT_SYSCALL
# undef __ASSUME_SHUTDOWN_SYSCALL
# undef __ASSUME_SOCKET_SYSCALL
-#else
-# define __ASSUME_SOCKETPAIR_SYSCALL 1
+# undef __ASSUME_SOCKETPAIR_SYSCALL
#endif
/* These syscalls were added for both 32-bit and 64-bit in 4.4. */
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list b/sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list
deleted file mode 100644
index 94c081f804..0000000000
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list
+++ /dev/null
@@ -1,3 +0,0 @@
-# File name Caller Syscall name # args Strong name Weak names
-
-socketpair - socketpair 4 __socketpair socketpair
diff --git a/sysdeps/unix/sysv/linux/x86_64/syscalls.list b/sysdeps/unix/sysv/linux/x86_64/syscalls.list
index 447f653cc0..2f7047be42 100644
--- a/sysdeps/unix/sysv/linux/x86_64/syscalls.list
+++ b/sysdeps/unix/sysv/linux/x86_64/syscalls.list
@@ -3,7 +3,3 @@
arch_prctl EXTRA arch_prctl i:ii __arch_prctl arch_prctl
modify_ldt EXTRA modify_ldt i:ipi __modify_ldt modify_ldt
syscall_clock_gettime EXTRA clock_gettime Ei:ip __syscall_clock_gettime
-
-
-# proper socket implementations:
-socketpair - socketpair i:iiif __socketpair socketpair