mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-30 14:31:14 +00:00
6320de9536
This patch removes the __ASSUME_OFF_DIFF_OFF64 define introduced in
p{read,write} consolidation patch. This define was added based on
the idea 32 bits ports would continue to follow previous off{64}_t
definition where off_t size differs from off64_t one.
However, with recent AArch64/ILP32 patch submission and also with
discussion for RISCV kernel interface, 32 bits ports now may aim
to use off_t and off64_t with the same size as 64 bits.
So current assumption for both p{read,write} and p{read,write}v
are not compatible with new type definition. This patch now makes
the syscall wrappers to only depend on __OFF_T_MATCHES_OFF64_T to
define the default and 64-suffix variant, as follow:
<function>.c
#ifndef __OFF_T_MATCHES_OFF64_T
/* build <function> */
#endif
and
<function>64.c
/* build <function>64 */
#ifdef __OFF_T_MATCHES_OFF64_T
weak_alias (fallocate64, fallocate)
#endif
Tested on x86_64, i686, x32, and armhf.
* sysdeps/unix/sysv/linux/mips/kernel-features.h
(__ASSUME_OFF_DIFF_OFF64): Remove define.
* sysdeps/unix/sysv/linux/pread.c
[__WORDSIZE != 64 || __ASSUME_OFF_DIFF_OFF64] (pread): Replace by
__OFF_T_MATCHES_OFF64_T.
* sysdeps/unix/sysv/linux/pread64.c
[__WORDSIZE != 64 || __ASSUME_OFF_DIFF_OFF64] (pread64): Likewise.
* sysdeps/unix/sysv/linux/preadv.c
[__WORDSIZE != 64 || __ASSUME_OFF_DIFF_OFF64] (preadv): Likewise.
* sysdeps/unix/sysv/linux/preadv64.c
[__WORDSIZE != 64 || __ASSUME_OFF_DIFF_OFF64] (preadv64): Likewise.
* sysdeps/unix/sysv/linux/pwrite.c
[__WORDSIZE != 64 || __ASSUME_OFF_DIFF_OFF64] (pwrite): Likewise.
* sysdeps/unix/sysv/linux/pwrite64.c
[__WORDSIZE != 64 || __ASSUME_OFF_DIFF_OFF64] (pwrite64): Likewise.
* sysdeps/unix/sysv/linux/pwritev.c
[__WORDSIZE != 64 || __ASSUME_OFF_DIFF_OFF64] (pwritev): Likewise.
* sysdeps/unix/sysv/linux/pwritev64.c
[__WORDSIZE != 64 || __ASSUME_OFF_DIFF_OFF64] (pwritev64): Likewise.
54 lines
1.7 KiB
C
54 lines
1.7 KiB
C
/* Copyright (C) 2009-2016 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/>. */
|
|
|
|
#include <sys/uio.h>
|
|
#include <sysdep-cancel.h>
|
|
|
|
#ifndef __OFF_T_MATCHES_OFF64_T
|
|
|
|
# ifdef __ASSUME_PREADV
|
|
|
|
# ifndef __NR_pwritev
|
|
# define __NR_pwritev __NR_pwritev64
|
|
# endif
|
|
|
|
ssize_t
|
|
pwritev (int fd, const struct iovec *vector, int count, off_t offset)
|
|
{
|
|
return SYSCALL_CANCEL (pwritev, fd, vector, count, LO_HI_LONG (offset));
|
|
}
|
|
# else
|
|
static ssize_t __atomic_pwritev_replacement (int, const struct iovec *,
|
|
int, off_t) internal_function;
|
|
ssize_t
|
|
pwritev (int fd, const struct iovec *vector, int count, off_t offset)
|
|
{
|
|
# ifdef __NR_pwritev
|
|
ssize_t result = SYSCALL_CANCEL (pwritev, fd, vector, count,
|
|
LO_HI_LONG (offset));
|
|
if (result >= 0 || errno != ENOSYS)
|
|
return result;
|
|
# endif
|
|
return __atomic_pwritev_replacement (fd, vector, count, offset);
|
|
}
|
|
# define PWRITEV static internal_function __atomic_pwritev_replacement
|
|
# define PWRITE __pwrite
|
|
# define OFF_T off_t
|
|
# include <sysdeps/posix/pwritev.c>
|
|
# endif /* __ASSUME_PREADV */
|
|
#endif
|