From 61564996f167280ab293fe1d4d4d45434ce4a2fb Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 5 Jan 2016 21:11:41 +0000 Subject: [PATCH] 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 --- usr/include/arch/i386/klibc/archconfig.h | 3 +++ usr/include/arch/m68k/klibc/archconfig.h | 3 +++ usr/include/arch/s390/klibc/archconfig.h | 3 +++ 3 files changed, 9 insertions(+) diff --git a/usr/include/arch/i386/klibc/archconfig.h b/usr/include/arch/i386/klibc/archconfig.h index d8db763..bd80298 100644 --- 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 10ef62e..1d5c034 100644 --- 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 d7a71a4..18d30da 100644 --- 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 */ -- 2.30.2