syscalls: Override detection of direct socket syscalls on i386, m68k, s390

The direct socket syscalls are now implemented on i386, m68k and s390,
making socketcall() obsolete.  However we need to keep klibc/unstable
working with the last stable kernel version (3.16) so we shouldn't use
them yet.

Gbp-Pq: Name syscalls-override-detection-of-direct-socket-syscalls-on-i386-m68k-s390.patch

diff --git a/usr/include/arch/i386/klibc/archconfig.h b/usr/include/arch/i386/klibc/archconfig.h
index d8db763e70052d70e9ebf3ae8329316beb6a83b4..bd80298337f70ba4f1494f6375245a78a27dc534 100644 (file)
--- a/usr/include/arch/i386/klibc/archconfig.h
+++ b/usr/include/arch/i386/klibc/archconfig.h
@@ -15,4 +15,7 @@
 /* We have __libc_arch_init() */
 #define _KLIBC_HAS_ARCHINIT 1
 
+/* Use sys_socketcall unconditionally */
+#define _KLIBC_SYS_SOCKETCALL 1
+
 #endif                         /* _KLIBC_ARCHCONFIG_H */

diff --git a/usr/include/arch/m68k/klibc/archconfig.h b/usr/include/arch/m68k/klibc/archconfig.h
index 10ef62e67a8894850a802728fd97f6b5c7cdfd70..1d5c034ad2d9ca619250f962a80c76eddcac16be 100644 (file)
--- a/usr/include/arch/m68k/klibc/archconfig.h
+++ b/usr/include/arch/m68k/klibc/archconfig.h
@@ -12,4 +12,7 @@
 /* On m68k, sys_mmap2 uses the current page size as the shift factor */
 #define _KLIBC_MMAP2_SHIFT     __getpageshift()
 
+/* Use sys_socketcall unconditionally */
+#define _KLIBC_SYS_SOCKETCALL 1
+
 #endif                         /* _KLIBC_ARCHCONFIG_H */

diff --git a/usr/include/arch/s390/klibc/archconfig.h b/usr/include/arch/s390/klibc/archconfig.h
index d7a71a4b9207718c49098ffcc71f5064930ec548..18d30dad311fcef067fb5aed0fb7134f2c87f7fa 100644 (file)
--- a/usr/include/arch/s390/klibc/archconfig.h
+++ b/usr/include/arch/s390/klibc/archconfig.h
@@ -12,4 +12,7 @@
 /* Both s390 and s390x use the "32-bit" version of this structure */
 #define _KLIBC_STATFS_F_TYPE_64 0
 
+/* Use sys_socketcall unconditionally */
+#define _KLIBC_SYS_SOCKETCALL 1
+
 #endif                         /* _KLIBC_ARCHCONFIG_H */