lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

Remove __ASSUME_SOCKETCALL.

Browse Source 
The __ASSUME_SOCKETCALL macro in kernel-features.h is no longer used
for anything.  (It used to be used in defining other macros related to
accept4 / recvmmsg / sendmmsg availability, but the code in that area
was simplified once we could assume a kernel with those features,
whether through a syscall or through socketcall, so allowing those
functions to be handled much like other socket operations, without
requring __ASSUME_SOCKETCALL.)  This patch removes that unused macro.

(Note: once we can assume a Linux 4.4 or later kernel, much of the
support for using socketcall at all can be removed from glibc,
although a few functions may need that support in glibc for longer.)

Tested with build-many-glibcs.py.

	* sysdeps/unix/sysv/linux/kernel-features.h: Remove comment about
	__ASSUME_SOCKETCALL.
	* sysdeps/unix/sysv/linux/i386/kernel-features.h
	(__ASSUME_SOCKETCALL): Remove.
	* sysdeps/unix/sysv/linux/m68k/kernel-features.h
	(__ASSUME_SOCKETCALL): Likewise.
	* sysdeps/unix/sysv/linux/microblaze/kernel-features.h
	(__ASSUME_SOCKETCALL): Likewise.
	* sysdeps/unix/sysv/linux/powerpc/kernel-features.h
	(__ASSUME_SOCKETCALL): Likewise.
	* sysdeps/unix/sysv/linux/s390/kernel-features.h
	(__ASSUME_SOCKETCALL): Likewise.
	* sysdeps/unix/sysv/linux/sh/kernel-features.h
	(__ASSUME_SOCKETCALL): Likewise.
	* sysdeps/unix/sysv/linux/sparc/kernel-features.h
	(__ASSUME_SOCKETCALL): Likewise.
This commit is contained in:
Joseph Myers
2018-11-08 20:28:07 +00:00
parent d524fa6c35
commit e5de3b5b72
9 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ChangeLog
View File

@ -1,3 +1,22 @@
2018-11-08 Joseph Myers <joseph@codesourcery.com>
* sysdeps/unix/sysv/linux/kernel-features.h: Remove comment about
__ASSUME_SOCKETCALL.
* sysdeps/unix/sysv/linux/i386/kernel-features.h
(__ASSUME_SOCKETCALL): Remove.
* sysdeps/unix/sysv/linux/m68k/kernel-features.h
(__ASSUME_SOCKETCALL): Likewise.
* sysdeps/unix/sysv/linux/microblaze/kernel-features.h
(__ASSUME_SOCKETCALL): Likewise.
* sysdeps/unix/sysv/linux/powerpc/kernel-features.h
(__ASSUME_SOCKETCALL): Likewise.
* sysdeps/unix/sysv/linux/s390/kernel-features.h
(__ASSUME_SOCKETCALL): Likewise.
* sysdeps/unix/sysv/linux/sh/kernel-features.h
(__ASSUME_SOCKETCALL): Likewise.
* sysdeps/unix/sysv/linux/sparc/kernel-features.h
(__ASSUME_SOCKETCALL): Likewise.
2018-11-08 H.J. Lu <hongjiu.lu@intel.com> 2018-11-08 H.J. Lu <hongjiu.lu@intel.com>
[BZ #23509] [BZ #23509]

3
sysdeps/unix/sysv/linux/i386/kernel-features.h
View File

@ -17,9 +17,6 @@
License along with the GNU C Library; if not, see License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */ <http://www.gnu.org/licenses/>. */
/* i386 uses socketcall. */
#define __ASSUME_SOCKETCALL 1
/* Direct socketcalls available with kernel 4.3. */ /* Direct socketcalls available with kernel 4.3. */
#if __LINUX_KERNEL_VERSION >= 0x040300 #if __LINUX_KERNEL_VERSION >= 0x040300
# define __ASSUME_SOCKET_SYSCALL 1 # define __ASSUME_SOCKET_SYSCALL 1

4
sysdeps/unix/sysv/linux/kernel-features.h
View File

@ -37,10 +37,6 @@
introduced. If somebody cares these values can afterwards be introduced. If somebody cares these values can afterwards be
corrected. */ corrected. */
/* Some architectures use the socketcall multiplexer for some or all
socket-related operations instead of separate syscalls.
__ASSUME_SOCKETCALL is defined for such architectures. */
/* The changed st_ino field appeared in 2.4.0-test6. However, SH is lame, /* The changed st_ino field appeared in 2.4.0-test6. However, SH is lame,
and still does not have a 64-bit inode field. */ and still does not have a 64-bit inode field. */
#define __ASSUME_ST_INO_64_BIT 1 #define __ASSUME_ST_INO_64_BIT 1

3
sysdeps/unix/sysv/linux/m68k/kernel-features.h
View File

@ -17,9 +17,6 @@
License along with the GNU C Library. If not, see License along with the GNU C Library. If not, see
<http://www.gnu.org/licenses/>. */ <http://www.gnu.org/licenses/>. */
/* m68k uses socketcall. */
#define __ASSUME_SOCKETCALL 1
/* Direct socketcalls available with kernel 4.3. */ /* Direct socketcalls available with kernel 4.3. */
#if __LINUX_KERNEL_VERSION >= 0x040300 #if __LINUX_KERNEL_VERSION >= 0x040300
# define __ASSUME_SOCKET_SYSCALL 1 # define __ASSUME_SOCKET_SYSCALL 1

3
sysdeps/unix/sysv/linux/microblaze/kernel-features.h
View File

@ -16,9 +16,6 @@
<http://www.gnu.org/licenses/>. */ <http://www.gnu.org/licenses/>. */
/* MicroBlaze uses socketcall. */
#define __ASSUME_SOCKETCALL 1
/* All supported kernel versions for MicroBlaze have these syscalls. */ /* All supported kernel versions for MicroBlaze have these syscalls. */
#define __ASSUME_SOCKET_SYSCALL 1 #define __ASSUME_SOCKET_SYSCALL 1
#define __ASSUME_BIND_SYSCALL 1 #define __ASSUME_BIND_SYSCALL 1

3
sysdeps/unix/sysv/linux/powerpc/kernel-features.h
View File

@ -17,9 +17,6 @@
License along with the GNU C Library; if not, see License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */ <http://www.gnu.org/licenses/>. */
/* PowerPC uses socketcall. */
#define __ASSUME_SOCKETCALL 1
/* New syscalls added for PowerPC in 2.6.37. */ /* New syscalls added for PowerPC in 2.6.37. */
#define __ASSUME_SOCKET_SYSCALL 1 #define __ASSUME_SOCKET_SYSCALL 1
#define __ASSUME_BIND_SYSCALL 1 #define __ASSUME_BIND_SYSCALL 1

3
sysdeps/unix/sysv/linux/s390/kernel-features.h
View File

@ -17,9 +17,6 @@
License along with the GNU C Library; if not, see License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */ <http://www.gnu.org/licenses/>. */
/* S/390 uses socketcall. */
#define __ASSUME_SOCKETCALL 1
/* Direct socketcalls available with kernel 4.3. */ /* Direct socketcalls available with kernel 4.3. */
#if __LINUX_KERNEL_VERSION >= 0x040300 #if __LINUX_KERNEL_VERSION >= 0x040300
# define __ASSUME_SOCKET_SYSCALL 1 # define __ASSUME_SOCKET_SYSCALL 1

3
sysdeps/unix/sysv/linux/sh/kernel-features.h
View File

@ -20,9 +20,6 @@
#ifndef __KERNEL_FEATURES_SH__ #ifndef __KERNEL_FEATURES_SH__
# define __KERNEL_FEATURES_SH__ # define __KERNEL_FEATURES_SH__
/* SH uses socketcall. */
#define __ASSUME_SOCKETCALL 1
/* These syscalls were added for SH in 2.6.37. */ /* These syscalls were added for SH in 2.6.37. */
#define __ASSUME_SOCKET_SYSCALL 1 #define __ASSUME_SOCKET_SYSCALL 1
#define __ASSUME_BIND_SYSCALL 1 #define __ASSUME_BIND_SYSCALL 1

3
sysdeps/unix/sysv/linux/sparc/kernel-features.h
View File

@ -17,9 +17,6 @@
License along with the GNU C Library; if not, see License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */ <http://www.gnu.org/licenses/>. */
/* SPARC uses socketcall. */
#define __ASSUME_SOCKETCALL 1
#include_next <kernel-features.h> #include_next <kernel-features.h>
/* 32-bit SPARC kernels do not support /* 32-bit SPARC kernels do not support