| [c5c522c] | 1 | From: Ben Hutchings <ben@decadent.org.uk> |
|---|
| 2 | Date: Tue, 05 Jan 2016 21:11:41 +0000 |
|---|
| 3 | Subject: syscalls: Override detection of direct socket syscalls on i386, m68k, s390 |
|---|
| 4 | Bug-Debian: https://bugs.debian.org/809423 |
|---|
| 5 | Forwarded: http://www.zytor.com/pipermail/klibc/2016-January/003882.html |
|---|
| 6 | |
|---|
| 7 | The direct socket syscalls are now implemented on i386, m68k and s390, |
|---|
| 8 | making socketcall() obsolete. However we need to keep klibc/unstable |
|---|
| 9 | working with the last stable kernel version (3.16) so we shouldn't use |
|---|
| 10 | them yet. |
|---|
| 11 | |
|---|
| 12 | --- |
|---|
| 13 | --- a/usr/include/arch/i386/klibc/archconfig.h |
|---|
| 14 | +++ b/usr/include/arch/i386/klibc/archconfig.h |
|---|
| 15 | @@ -15,4 +15,7 @@ |
|---|
| 16 | /* We have __libc_arch_init() */ |
|---|
| 17 | #define _KLIBC_HAS_ARCHINIT 1 |
|---|
| 18 | |
|---|
| 19 | +/* Use sys_socketcall unconditionally */ |
|---|
| 20 | +#define _KLIBC_SYS_SOCKETCALL 1 |
|---|
| 21 | + |
|---|
| 22 | #endif /* _KLIBC_ARCHCONFIG_H */ |
|---|
| 23 | --- a/usr/include/arch/m68k/klibc/archconfig.h |
|---|
| 24 | +++ b/usr/include/arch/m68k/klibc/archconfig.h |
|---|
| 25 | @@ -12,4 +12,7 @@ |
|---|
| 26 | /* On m68k, sys_mmap2 uses the current page size as the shift factor */ |
|---|
| 27 | #define _KLIBC_MMAP2_SHIFT __getpageshift() |
|---|
| 28 | |
|---|
| 29 | +/* Use sys_socketcall unconditionally */ |
|---|
| 30 | +#define _KLIBC_SYS_SOCKETCALL 1 |
|---|
| 31 | + |
|---|
| 32 | #endif /* _KLIBC_ARCHCONFIG_H */ |
|---|
| 33 | --- a/usr/include/arch/s390/klibc/archconfig.h |
|---|
| 34 | +++ b/usr/include/arch/s390/klibc/archconfig.h |
|---|
| 35 | @@ -12,4 +12,7 @@ |
|---|
| 36 | /* Both s390 and s390x use the "32-bit" version of this structure */ |
|---|
| 37 | #define _KLIBC_STATFS_F_TYPE_64 0 |
|---|
| 38 | |
|---|
| 39 | +/* Use sys_socketcall unconditionally */ |
|---|
| 40 | +#define _KLIBC_SYS_SOCKETCALL 1 |
|---|
| 41 | + |
|---|
| 42 | #endif /* _KLIBC_ARCHCONFIG_H */ |
|---|
