mirror of
https://sourceware.org/git/glibc.git
synced 2025-08-24 21:08:04 +03:00
646ce7e0be
kernel-features.h has a macro __ASSUME_ST_INO_64_BIT, with a comment
"However, SH is lame, and still does not have a 64-bit inode field.".
The macro is, in fact, defined to 0 by Alpha as well as SH. The Alpha
case is, however, trivially useless: none of the files that test
__ASSUME_ST_INO_64_BIT are built for Alpha (which gained kernel
support for stat64 syscalls, with a 64-bit st_ino field, in Linux
2.6.4; the define to 0 for Alpha in glibc predates that).
The SH kernel gained support for a 64-bit st_ino in struct stat64 in
commit 760bcb1deec13c50e20399c84cb6a8ea41cc2820 ("sh: Fix fstatat64()
syscall."), which is in Linux 2.6.22 and later. So the redefinition
of __ASSUME_ST_INO_64_BIT to 0 is of no use for SH either; three of
the files testing it do so immediately after a stat64-family syscall
has been used, which will always have set the 64-bit st_ino correctly
(in addition to the 32-bit __st_ino), while the relevant code
__xstat32_conv executes only after such a syscall in the function
calling __xstat32_conv.
Thus this patch removes __ASSUME_ST_INO_64_BIT and code testing it.
Removing the useless [!__ASSUME_ST_INO_64_BIT] code in __xstat32_conv
renders the [_HAVE_STAT64___ST_INO] and [!_HAVE_STAT64___ST_INO] cases
around it identical, so that conditional is also removed.
Tested compilation with build-many-glibcs.py for its Alpha and SH
configurations; also ran the glibc testsuite for x86_64 and x86.
* sysdeps/unix/sysv/linux/kernel-features.h
(__ASSUME_ST_INO_64_BIT): Remove macro definition.
* sysdeps/unix/sysv/linux/alpha/kernel-features.h
(__ASSUME_ST_INO_64_BIT): Do not undefine and define.
* sysdeps/unix/sysv/linux/sh/kernel-features.h
(__ASSUME_ST_INO_64_BIT): Likewise.
* sysdeps/unix/sysv/linux/fxstat64.c: Do not include
<kernel-features.h>.
(___fxstat64) [_HAVE_STAT64___ST_INO && !__ASSUME_ST_INO_64_BIT]:
Remove conditional code.
* sysdeps/unix/sysv/linux/lxstat64.c: Do not include
<kernel-features.h>.
(___lxstat64) [_HAVE_STAT64___ST_INO && !__ASSUME_ST_INO_64_BIT]:
Remove conditional code.
* sysdeps/unix/sysv/linux/xstat64.c: Do not include
<kernel-features.h>.
(___xstat64) [_HAVE_STAT64___ST_INO && !__ASSUME_ST_INO_64_BIT]:
Remove conditional code.
* sysdeps/unix/sysv/linux/xstatconv.c: Do not include
<kernel-features.h>.
(__xstat32_conv) [_HAVE_STAT64___ST_INO]: Remove conditional code.
[!_HAVE_STAT64___ST_INO]: Make code unconditional.
59 lines
2.0 KiB
C
59 lines
2.0 KiB
C
/* Set flags signalling availability of kernel features based on given
|
|
kernel version number. SH version.
|
|
Copyright (C) 1999-2018 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/>. */
|
|
|
|
#ifndef __KERNEL_FEATURES_SH__
|
|
# define __KERNEL_FEATURES_SH__
|
|
|
|
/* These syscalls were added for SH in 2.6.37. */
|
|
#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_RECV_SYSCALL 1
|
|
#define __ASSUME_SHUTDOWN_SYSCALL 1
|
|
#define __ASSUME_GETSOCKOPT_SYSCALL 1
|
|
#define __ASSUME_SETSOCKOPT_SYSCALL 1
|
|
|
|
#include_next <kernel-features.h>
|
|
|
|
/* SH4 ABI does not really require argument alignment for 64-bits, but
|
|
the kernel interface for p{read,write}64 adds a dummy long argument
|
|
before the offset. */
|
|
#define __ASSUME_PRW_DUMMY_ARG 1
|
|
|
|
/* sh only supports ipc syscall. */
|
|
#undef __ASSUME_DIRECT_SYSVIPC_SYSCALLS
|
|
|
|
/* Support for several syscalls was added in 4.8. */
|
|
#if __LINUX_KERNEL_VERSION < 0x040800
|
|
# undef __ASSUME_RENAMEAT2
|
|
# undef __ASSUME_EXECVEAT
|
|
# undef __ASSUME_MLOCK2
|
|
# undef __ASSUME_COPY_FILE_RANGE
|
|
#endif
|
|
|
|
/* sh does not support the statx system call. */
|
|
#undef __ASSUME_STATX
|
|
|
|
#endif
|