mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-27 07:20:11 +00:00
01061a7cab
This patch consolidates the accept Linux syscall implementation on
sysdeps/unix/sysv/linux/accept.c. The changes are:
1. Remove accept from auto-generation syscalls.list on the architecture
that uses __NR_accept.
2. Define __NR_accept as default (__ASSUME_ACCEPT_SYSCALL) and undef for
architectures that do not support it.
3. Remove __ASSUME_ACCEPT4_FOR_ACCEPT_SYSCALL and decide to use
__NR_accept4 for accept generation based on __ASSUME_ACCEPT4_SYSCALL.
Checked on i686-linux-gnu, x86_64-linux-gnu, x86_64-linux-gnux32,
aarch64-linux-gnu, arm-linux-gnueabihf, and powerpc64le-linux-gnu.
* sysdeps/unix/sysv/linux/accept.c (__libc_accept): Replace
__ASSUME_ACCEPT4_FOR_ACCEPT_SYSCALL by __ASSUME_ACCEPT4_SYSCALL.
* sysdeps/unix/sysv/linux/alpha/syscalls.list: Remove accept from
auto-generation list.
* sysdeps/unix/sysv/linux/arm/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/generic/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/hppa/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/ia64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/mips/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/x86_64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/i386/kernel-features.h
(__ASSUME_ACCEPT4_FOR_ACCEPT_SYSCALL): Remove define.
(__ASSUME_ACCEPT_SYSCALL): Undefine.
* sysdeps/unix/sysv/linux/kernel-features.h
(__ASSUME_ACCEPT_SYSCALL): New define.
* sysdeps/unix/sysv/linux/m68k/kernel-features.h
(__ASSUME_ACCEPT4_FOR_ACCEPT_SYSCALL): Remove define.
(__ASSUME_ACCEPT_SYSCALL): Define wheter kernel version supports.
* sysdeps/unix/sysv/linux/microblaze/kernel-features.h
(__ASSUME_ACCEPT_SYSCALL): Define.
* sysdeps/unix/sysv/linux/powerpc/kernel-features.h
(__ASSUME_ACCEPT_SYSCALL): Undefine.
* sysdeps/unix/sysv/linux/s390/kernel-features.h
(__ASSUME_ACCEPT4_FOR_ACCEPT_SYSCALL): Remove define.
(__ASSUME_ACCEPT_SYSCALL): Undefine.
* sysdeps/unix/sysv/linux/sh/kernel-features.h
(__ASSUME_ACCEPT_SYSCALL): Undefine.
* sysdeps/unix/sysv/linux/sparc/kernel-features.h
(__ASSUME_ACCEPT_SYSCALL): Undefine for 32 bits.
55 lines
1.9 KiB
C
55 lines
1.9 KiB
C
/* Copyright (C) 2011-2017 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library. If not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
|
|
/* MicroBlaze uses socketcall. */
|
|
#define __ASSUME_SOCKETCALL 1
|
|
|
|
/* All supported kernel versions for MicroBlaze have these syscalls. */
|
|
#define __ASSUME_SOCKET_SYSCALL 1
|
|
#define __ASSUME_BIND_SYSCALL 1
|
|
#define __ASSUME_CONNECT_SYSCALL 1
|
|
#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_SENDTO_SYSCALL 1
|
|
#define __ASSUME_RECV_SYSCALL 1
|
|
#define __ASSUME_RECVFROM_SYSCALL 1
|
|
#define __ASSUME_SHUTDOWN_SYSCALL 1
|
|
#define __ASSUME_GETSOCKOPT_SYSCALL 1
|
|
#define __ASSUME_SETSOCKOPT_SYSCALL 1
|
|
|
|
/* Support for the accept4 and recvmmsg syscalls was added in 2.6.33. */
|
|
#define __ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL 1
|
|
|
|
#include_next <kernel-features.h>
|
|
|
|
/* Support for the pselect6, preadv and pwritev syscalls was added in
|
|
3.15. */
|
|
#if __LINUX_KERNEL_VERSION < 0x030f00
|
|
# undef __ASSUME_PSELECT
|
|
# undef __ASSUME_PREADV
|
|
# undef __ASSUME_PWRITEV
|
|
#endif
|
|
|
|
/* Support for the sendmmsg syscall was added in 3.3. */
|
|
#if __LINUX_KERNEL_VERSION < 0x030300
|
|
# undef __ASSUME_SENDMMSG_SYSCALL
|
|
#endif
|