mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-22 19:00:07 +00:00
Consolidate pwrite/pwrite64 implementations
This patch consolidates all the pwrite/pwrite64 implementation for Linux
in only one (sysdeps/unix/sysv/linux/pwrite{64}.c). It also removes the
syscall from the auto-generation using assembly macros.
For pwrite{64} offset argument placement the new SYSCALL_LL{64} macro
is used. For pwrite ports that do not define __NR_pwrite will use
__NR_pwrite64 and for pwrite64 ports that dot define __NR_pwrite64 will
use __NR_pwrite for the syscall.
Checked on x86_64, x32, i386, aarch64, and ppc64le.
* sysdeps/unix/sysv/linux/arm/pwrite.c: Remove file.
* sysdeps/unix/sysv/linux/arm/pwrite64.c: Likewise.
* sysdeps/unix/sysv/linux/generic/wordsize-32/pwrite.c: Likewise.
* sysdeps/unix/sysv/linux/generic/wordsize-32/pwrite64.c: Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc32/pwrite.c: Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc32/pwrite64.c: Likewise.
* sysdeps/unix/sysv/linux/wordsize-64/pwrite64.c: Likewise.
* sysdeps/unix/sysv/linux/wordsize-64/syscalls.list (prite): Remove
syscalls generation.
* sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h
[__NR_pwrite64] (__NR_write): Remove define.
* sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h
[__NR_pwrite64] (__NR_write): Remove define.
* sysdeps/unix/sysv/linux/pwrite.c [__NR_pwrite64] (__NR_pwrite):
Remove define.
(__libc_pwrite): Use SYSCALL_LL macro on offset argument.
* sysdeps/unix/sysv/linux/pwrite64.c [__NR_pwrite64] (__NR_pwrite):
Remove define.
(__libc_pwrite64): Use SYSCALL_LL64 macro on offset argument.
* sysdeps/unix/sysv/linux/sh/pwrite.c: Rewrite using default
Linux implementation as base.
* sysdeps/unix/sysv/linux/sh/pwrite64.c: Likewise.
* sysdeps/unix/sysv/linux/mips/pwrite.c: Likewise.
* sysdeps/unix/sysv/linux/mips/pwrite64.c: Likewise.
This commit is contained in:
Adhemerval Zanella
Adhemerval Zanella
parent
77a4fbd536
commit
071af4769f
25
ChangeLog
25
ChangeLog
@ -1,5 +1,30 @@
|
|||||||
2016-04-11 Adhemerval Zanella <adhemerval.zanella@linaro.org>
|
2016-04-11 Adhemerval Zanella <adhemerval.zanella@linaro.org>
|
||||||
|
|
||||||
|
* sysdeps/unix/sysv/linux/arm/pwrite.c: Remove file.
|
||||||
|
* sysdeps/unix/sysv/linux/arm/pwrite64.c: Likewise.
|
||||||
|
* sysdeps/unix/sysv/linux/generic/wordsize-32/pwrite.c: Likewise.
|
||||||
|
* sysdeps/unix/sysv/linux/generic/wordsize-32/pwrite64.c: Likewise.
|
||||||
|
* sysdeps/unix/sysv/linux/mips/pwrite.c: Likewise.
|
||||||
|
* sysdeps/unix/sysv/linux/mips/pwrite64.c: Likewise.
|
||||||
|
* sysdeps/unix/sysv/linux/powerpc/powerpc32/pwrite.c: Likewise.
|
||||||
|
* sysdeps/unix/sysv/linux/powerpc/powerpc32/pwrite64.c: Likewise.
|
||||||
|
* sysdeps/unix/sysv/linux/wordsize-64/pwrite64.c: Likewise.
|
||||||
|
* sysdeps/unix/sysv/linux/wordsize-64/syscalls.list (prite): Remove
|
||||||
|
syscalls generation.
|
||||||
|
* sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h
|
||||||
|
[__NR_pwrite64] (__NR_write): Remove define.
|
||||||
|
* sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h
|
||||||
|
[__NR_pwrite64] (__NR_write): Remove define.
|
||||||
|
* sysdeps/unix/sysv/linux/pwrite.c [__NR_pwrite64] (__NR_pwrite):
|
||||||
|
Remove define.
|
||||||
|
(__libc_pwrite): Use SYSCALL_LL macro on offset argument.
|
||||||
|
* sysdeps/unix/sysv/linux/pwrite64.c [__NR_pwrite64] (__NR_pwrite):
|
||||||
|
Remove define.
|
||||||
|
(__libc_pwrite64): Use SYSCALL_LL64 macro on offset argument.
|
||||||
|
* sysdeps/unix/sysv/linux/sh/pwrite.c: Rewrite using default
|
||||||
|
Linux implementation as base.
|
||||||
|
* sysdeps/unix/sysv/linux/sh/pwrite64.c: Likewise.
|
||||||
|
|
||||||
* sysdeps/unix/sysv/linux/arm/pread.c: Remove file.
|
* sysdeps/unix/sysv/linux/arm/pread.c: Remove file.
|
||||||
* sysdeps/unix/sysv/linux/arm/pread64.c: Likewise.
|
* sysdeps/unix/sysv/linux/arm/pread64.c: Likewise.
|
||||||
* sysdeps/unix/sysv/linux/generic/wordsize-32/pread.c: Likewise.
|
* sysdeps/unix/sysv/linux/generic/wordsize-32/pread.c: Likewise.
|
||||||
|
|||||||
@ -1,36 +0,0 @@
|
|||||||
/* Copyright (C) 1997-2016 Free Software Foundation, Inc.
|
|
||||||
This file is part of the GNU C Library.
|
|
||||||
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
|
|
||||||
|
|
||||||
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 <errno.h>
|
|
||||||
#include <endian.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
|
|
||||||
#include <sysdep-cancel.h>
|
|
||||||
#include <sys/syscall.h>
|
|
||||||
|
|
||||||
ssize_t
|
|
||||||
__libc_pwrite (int fd, const void *buf, size_t count, off_t offset)
|
|
||||||
{
|
|
||||||
/* In the ARM EABI, 64-bit values are aligned to even/odd register
|
|
||||||
pairs for syscalls. */
|
|
||||||
return SYSCALL_CANCEL (pwrite64, fd, buf, count, 0,
|
|
||||||
__LONG_LONG_PAIR (offset >> 31, offset));
|
|
||||||
}
|
|
||||||
|
|
||||||
strong_alias (__libc_pwrite, __pwrite)
|
|
||||||
weak_alias (__libc_pwrite, pwrite)
|
|
||||||
@ -1,38 +0,0 @@
|
|||||||
/* Copyright (C) 1997-2016 Free Software Foundation, Inc.
|
|
||||||
This file is part of the GNU C Library.
|
|
||||||
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
|
|
||||||
|
|
||||||
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 <errno.h>
|
|
||||||
#include <endian.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
|
|
||||||
#include <sysdep-cancel.h>
|
|
||||||
#include <sys/syscall.h>
|
|
||||||
|
|
||||||
ssize_t
|
|
||||||
__libc_pwrite64 (int fd, const void *buf, size_t count, off64_t offset)
|
|
||||||
{
|
|
||||||
/* In the ARM EABI, 64-bit values are aligned to even/odd register
|
|
||||||
pairs for syscalls. */
|
|
||||||
return SYSCALL_CANCEL (pwrite64, fd, buf, count, 0,
|
|
||||||
__LONG_LONG_PAIR ((off_t) (offset >> 32),
|
|
||||||
(off_t) (offset & 0xffffffff)));
|
|
||||||
}
|
|
||||||
|
|
||||||
weak_alias (__libc_pwrite64, __pwrite64)
|
|
||||||
libc_hidden_weak (__pwrite64)
|
|
||||||
weak_alias (__libc_pwrite64, pwrite64)
|
|
||||||
@ -1,36 +0,0 @@
|
|||||||
/* Copyright (C) 2011-2016 Free Software Foundation, Inc.
|
|
||||||
This file is part of the GNU C Library.
|
|
||||||
Contributed by Chris Metcalf <cmetcalf@tilera.com>, 2011.
|
|
||||||
Based on work contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
|
|
||||||
|
|
||||||
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 <assert.h>
|
|
||||||
#include <errno.h>
|
|
||||||
#include <endian.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
|
|
||||||
#include <sysdep-cancel.h>
|
|
||||||
#include <sys/syscall.h>
|
|
||||||
|
|
||||||
ssize_t
|
|
||||||
__libc_pwrite (int fd, const void *buf, size_t count, off_t offset)
|
|
||||||
{
|
|
||||||
assert (sizeof (offset) == 4);
|
|
||||||
return SYSCALL_CANCEL (pwrite64, fd, buf, count, __ALIGNMENT_ARG
|
|
||||||
__LONG_LONG_PAIR (offset >> 31, offset));
|
|
||||||
}
|
|
||||||
strong_alias (__libc_pwrite, __pwrite)
|
|
||||||
weak_alias (__libc_pwrite, pwrite)
|
|
||||||
@ -1,35 +0,0 @@
|
|||||||
/* Copyright (C) 2011-2016 Free Software Foundation, Inc.
|
|
||||||
This file is part of the GNU C Library.
|
|
||||||
Contributed by Chris Metcalf <cmetcalf@tilera.com>, 2011.
|
|
||||||
Based on work contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
|
|
||||||
|
|
||||||
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 <errno.h>
|
|
||||||
#include <endian.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
|
|
||||||
#include <sysdep-cancel.h>
|
|
||||||
#include <sys/syscall.h>
|
|
||||||
|
|
||||||
ssize_t
|
|
||||||
__libc_pwrite64 (int fd, const void *buf, size_t count, off64_t offset)
|
|
||||||
{
|
|
||||||
return SYSCALL_CANCEL (pwrite64, fd, buf, count, __ALIGNMENT_ARG
|
|
||||||
__LONG_LONG_PAIR ((off_t) (offset >> 32),
|
|
||||||
(off_t) (offset & 0xffffffff)));
|
|
||||||
}
|
|
||||||
weak_alias (__libc_pwrite64, __pwrite64)
|
|
||||||
libc_hidden_weak (__pwrite64) weak_alias (__libc_pwrite64, pwrite64)
|
|
||||||
@ -1,54 +0,0 @@
|
|||||||
/* Copyright (C) 1997-2016 Free Software Foundation, Inc.
|
|
||||||
This file is part of the GNU C Library.
|
|
||||||
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
|
|
||||||
|
|
||||||
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 <assert.h>
|
|
||||||
#include <errno.h>
|
|
||||||
#ifndef NO_SGIDEFS_H
|
|
||||||
#include <sgidefs.h>
|
|
||||||
#endif
|
|
||||||
#include <unistd.h>
|
|
||||||
#include <endian.h>
|
|
||||||
|
|
||||||
#include <sysdep-cancel.h>
|
|
||||||
#include <sys/syscall.h>
|
|
||||||
|
|
||||||
#ifdef __NR_pwrite64 /* Newer kernels renamed but it's the same. */
|
|
||||||
# ifdef __NR_pwrite
|
|
||||||
# error "__NR_pwrite and __NR_pwrite64 both defined???"
|
|
||||||
# endif
|
|
||||||
# define __NR_pwrite __NR_pwrite64
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
ssize_t
|
|
||||||
__libc_pwrite (int fd, const void *buf, size_t count, off_t offset)
|
|
||||||
{
|
|
||||||
#if _MIPS_SIM != _ABI64
|
|
||||||
assert (sizeof (offset) == 4);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if _MIPS_SIM == _ABIN32 || _MIPS_SIM == _ABI64
|
|
||||||
return SYSCALL_CANCEL (pwrite, fd, buf, count, offset);
|
|
||||||
#else
|
|
||||||
return SYSCALL_CANCEL (pwrite, fd, buf, count, 0,
|
|
||||||
__LONG_LONG_PAIR (offset >> 31, offset));
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
strong_alias (__libc_pwrite, __pwrite)
|
|
||||||
weak_alias (__libc_pwrite, pwrite)
|
|
||||||
@ -1,51 +0,0 @@
|
|||||||
/* Copyright (C) 1997-2016 Free Software Foundation, Inc.
|
|
||||||
This file is part of the GNU C Library.
|
|
||||||
Contributed by Ralf Baechle <ralf@gnu.org>, 1998.
|
|
||||||
|
|
||||||
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 <errno.h>
|
|
||||||
#ifndef NO_SGIDEFS_H
|
|
||||||
#include <sgidefs.h>
|
|
||||||
#endif
|
|
||||||
#include <unistd.h>
|
|
||||||
#include <endian.h>
|
|
||||||
|
|
||||||
#include <sysdep-cancel.h>
|
|
||||||
#include <sys/syscall.h>
|
|
||||||
|
|
||||||
#ifdef __NR_pwrite64 /* Newer kernels renamed but it's the same. */
|
|
||||||
# ifdef __NR_pwrite
|
|
||||||
# error "__NR_pwrite and __NR_pwrite64 both defined???"
|
|
||||||
# endif
|
|
||||||
# define __NR_pwrite __NR_pwrite64
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
ssize_t
|
|
||||||
__libc_pwrite64 (int fd, const void *buf, size_t count, off64_t offset)
|
|
||||||
{
|
|
||||||
#if _MIPS_SIM == _ABIN32 || _MIPS_SIM == _ABI64
|
|
||||||
return SYSCALL_CANCEL (pwrite, fd, buf, count, offset);
|
|
||||||
#else
|
|
||||||
return SYSCALL_CANCEL (pwrite, fd, buf, count, 0,
|
|
||||||
__LONG_LONG_PAIR ((off_t) (offset >> 32),
|
|
||||||
(off_t) (offset & 0xffffffff)));
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
weak_alias (__libc_pwrite64, __pwrite64)
|
|
||||||
libc_hidden_weak (__pwrite64)
|
|
||||||
weak_alias (__libc_pwrite64, pwrite64)
|
|
||||||
@ -1,35 +0,0 @@
|
|||||||
/* Copyright (C) 1997-2016 Free Software Foundation, Inc.
|
|
||||||
This file is part of the GNU C Library.
|
|
||||||
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
|
|
||||||
|
|
||||||
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 <assert.h>
|
|
||||||
#include <errno.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
|
|
||||||
#include <sysdep-cancel.h>
|
|
||||||
#include <sys/syscall.h>
|
|
||||||
|
|
||||||
|
|
||||||
ssize_t
|
|
||||||
__libc_pwrite (int fd, const void *buf, size_t count, off_t offset)
|
|
||||||
{
|
|
||||||
/* On PPC32 64bit values are aligned in odd/even register pairs. */
|
|
||||||
return SYSCALL_CANCEL (pwrite, fd, buf, count, 0, offset >> 31, offset);
|
|
||||||
}
|
|
||||||
|
|
||||||
strong_alias (__libc_pwrite, __pwrite)
|
|
||||||
weak_alias (__libc_pwrite, pwrite)
|
|
||||||
@ -1,36 +0,0 @@
|
|||||||
/* Copyright (C) 1997-2016 Free Software Foundation, Inc.
|
|
||||||
This file is part of the GNU C Library.
|
|
||||||
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
|
|
||||||
|
|
||||||
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 <errno.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
|
|
||||||
#include <sysdep-cancel.h>
|
|
||||||
#include <sys/syscall.h>
|
|
||||||
|
|
||||||
|
|
||||||
ssize_t
|
|
||||||
__libc_pwrite64 (int fd, const void *buf, size_t count, off64_t offset)
|
|
||||||
{
|
|
||||||
/* On PPC32 64bit values are aligned in odd/even register pairs. */
|
|
||||||
return SYSCALL_CANCEL (pwrite, fd, buf, count, 0, (long) (offset >> 32),
|
|
||||||
(long) offset);
|
|
||||||
}
|
|
||||||
|
|
||||||
weak_alias (__libc_pwrite64, __pwrite64)
|
|
||||||
libc_hidden_weak (__pwrite64)
|
|
||||||
weak_alias (__libc_pwrite64, pwrite64)
|
|
||||||
@ -22,17 +22,6 @@
|
|||||||
#include <sysdeps/unix/powerpc/sysdep.h>
|
#include <sysdeps/unix/powerpc/sysdep.h>
|
||||||
#include <tls.h>
|
#include <tls.h>
|
||||||
|
|
||||||
/* Some systen calls got renamed over time, but retained the same semantics.
|
|
||||||
Handle them here so they can be catched by both C and assembler stubs in
|
|
||||||
glibc. */
|
|
||||||
|
|
||||||
#ifdef __NR_pwrite64
|
|
||||||
# ifdef __NR_pwrite
|
|
||||||
# error "__NR_pwrite and __NR_pwrite64 both defined???"
|
|
||||||
# endif
|
|
||||||
# define __NR_pwrite __NR_pwrite64
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* For Linux we can use the system call table in the header file
|
/* For Linux we can use the system call table in the header file
|
||||||
/usr/include/asm/unistd.h
|
/usr/include/asm/unistd.h
|
||||||
of the kernel. But these symbols do not follow the SYS_* syntax
|
of the kernel. But these symbols do not follow the SYS_* syntax
|
||||||
|
|||||||
@ -29,17 +29,6 @@
|
|||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Some systen calls got renamed over time, but retained the same semantics.
|
|
||||||
Handle them here so they can be catched by both C and assembler stubs in
|
|
||||||
glibc. */
|
|
||||||
|
|
||||||
#ifdef __NR_pwrite64
|
|
||||||
# ifdef __NR_pwrite
|
|
||||||
# error "__NR_pwrite and __NR_pwrite64 both defined???"
|
|
||||||
# endif
|
|
||||||
# define __NR_pwrite __NR_pwrite64
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* For Linux we can use the system call table in the header file
|
/* For Linux we can use the system call table in the header file
|
||||||
/usr/include/asm/unistd.h
|
/usr/include/asm/unistd.h
|
||||||
of the kernel. But these symbols do not follow the SYS_* syntax
|
of the kernel. But these symbols do not follow the SYS_* syntax
|
||||||
|
|||||||
@ -16,33 +16,22 @@
|
|||||||
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/>. */
|
||||||
|
|
||||||
#include <assert.h>
|
|
||||||
#include <errno.h>
|
|
||||||
#include <endian.h>
|
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
#include <sysdep-cancel.h>
|
#include <sysdep-cancel.h>
|
||||||
#include <sys/syscall.h>
|
|
||||||
|
|
||||||
#ifdef __NR_pwrite64 /* Newer kernels renamed but it's the same. */
|
#if __WORDSIZE != 64 || defined (__ASSUME_OFF_DIFF_OFF64)
|
||||||
# ifdef __NR_pwrite
|
|
||||||
# error "__NR_pwrite and __NR_pwrite64 both defined???"
|
# ifndef __NR_pwrite
|
||||||
|
# define __NR_pwrite __NR_pwrite64
|
||||||
# endif
|
# endif
|
||||||
# define __NR_pwrite __NR_pwrite64
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
ssize_t
|
ssize_t
|
||||||
__libc_pwrite (int fd, const void *buf, size_t count, off_t offset)
|
__libc_pwrite (int fd, const void *buf, size_t count, off_t offset)
|
||||||
{
|
{
|
||||||
ssize_t result;
|
return SYSCALL_CANCEL (pwrite, fd, buf, count,
|
||||||
|
__ALIGNMENT_ARG SYSCALL_LL (offset));
|
||||||
assert (sizeof (offset) == 4);
|
|
||||||
result = SYSCALL_CANCEL (pwrite, fd, buf, count,
|
|
||||||
__LONG_LONG_PAIR (offset >> 31, offset));
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
strong_alias (__libc_pwrite, __pwrite)
|
strong_alias (__libc_pwrite, __pwrite)
|
||||||
weak_alias (__libc_pwrite, pwrite)
|
weak_alias (__libc_pwrite, pwrite)
|
||||||
|
#endif
|
||||||
|
|||||||
@ -16,28 +16,25 @@
|
|||||||
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/>. */
|
||||||
|
|
||||||
#include <errno.h>
|
|
||||||
#include <endian.h>
|
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
#include <sysdep-cancel.h>
|
#include <sysdep-cancel.h>
|
||||||
#include <sys/syscall.h>
|
|
||||||
|
|
||||||
#ifdef __NR_pwrite64 /* Newer kernels renamed but it's the same. */
|
#ifndef __NR_pwrite64
|
||||||
# ifdef __NR_pwrite
|
# define __NR_pwrite64 __NR_pwrite
|
||||||
# error "__NR_pwrite and __NR_pwrite64 both defined???"
|
|
||||||
# endif
|
|
||||||
# define __NR_pwrite __NR_pwrite64
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
ssize_t
|
ssize_t
|
||||||
__libc_pwrite64 (int fd, const void *buf, size_t count, off64_t offset)
|
__libc_pwrite64 (int fd, const void *buf, size_t count, off64_t offset)
|
||||||
{
|
{
|
||||||
return SYSCALL_CANCEL (pwrite, fd, buf, count,
|
return SYSCALL_CANCEL (pwrite64, fd, buf, count,
|
||||||
__LONG_LONG_PAIR ((off_t) (offset >> 32),
|
__ALIGNMENT_ARG SYSCALL_LL64 (offset));
|
||||||
(off_t) (offset & 0xffffffff)));
|
|
||||||
}
|
}
|
||||||
weak_alias (__libc_pwrite64, __pwrite64)
|
weak_alias (__libc_pwrite64, __pwrite64)
|
||||||
libc_hidden_weak (__pwrite64)
|
libc_hidden_weak (__pwrite64)
|
||||||
weak_alias (__libc_pwrite64, pwrite64)
|
weak_alias (__libc_pwrite64, pwrite64)
|
||||||
|
|
||||||
|
#if __WORDSIZE == 64 && !defined (__ASSUME_OFF_DIFF_OFF64)
|
||||||
|
strong_alias (__libc_pwrite64, __libc_pwrite)
|
||||||
|
weak_alias (__libc_pwrite64, __pwrite)
|
||||||
|
weak_alias (__libc_pwrite64, pwrite)
|
||||||
|
#endif
|
||||||
|
|||||||
@ -16,28 +16,8 @@
|
|||||||
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/>. */
|
||||||
|
|
||||||
#include <assert.h>
|
/* SH4 ABI does not really require argument alignment for 64-bits, but
|
||||||
#include <errno.h>
|
the kernel interface for pwrite adds a dummy long argument before the
|
||||||
#include <unistd.h>
|
offset. */
|
||||||
#include <endian.h>
|
#define __ALIGNMENT_ARG
|
||||||
|
#include <sysdeps/unix/sysv/linux/pwrite.c>
|
||||||
#include <sysdep-cancel.h>
|
|
||||||
#include <sys/syscall.h>
|
|
||||||
|
|
||||||
#ifdef __NR_pwrite64 /* Newer kernels renamed but it's the same. */
|
|
||||||
# ifdef __NR_pwrite
|
|
||||||
# error "__NR_pwrite and __NR_pwrite64 both defined???"
|
|
||||||
# endif
|
|
||||||
# define __NR_pwrite __NR_pwrite64
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
ssize_t
|
|
||||||
__libc_pwrite (int fd, const void *buf, size_t count, off_t offset)
|
|
||||||
{
|
|
||||||
return SYSCALL_CANCEL (pwrite, fd, buf, count, 0,
|
|
||||||
__LONG_LONG_PAIR (offset >> 31, offset));
|
|
||||||
}
|
|
||||||
|
|
||||||
strong_alias (__libc_pwrite, __pwrite)
|
|
||||||
weak_alias (__libc_pwrite, pwrite)
|
|
||||||
|
|||||||
@ -16,29 +16,8 @@
|
|||||||
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/>. */
|
||||||
|
|
||||||
#include <errno.h>
|
/* SH4 ABI does not really require argument alignment for 64-bits, but
|
||||||
#include <unistd.h>
|
the kernel interface for pread adds a dummy long argument before the
|
||||||
#include <endian.h>
|
offset. */
|
||||||
|
#define __ALIGNMENT_ARG
|
||||||
#include <sysdep-cancel.h>
|
#include <sysdeps/unix/sysv/linux/pwrite64.c>
|
||||||
#include <sys/syscall.h>
|
|
||||||
|
|
||||||
#ifdef __NR_pwrite64 /* Newer kernels renamed but it's the same. */
|
|
||||||
# ifdef __NR_pwrite
|
|
||||||
# error "__NR_pwrite and __NR_pwrite64 both defined???"
|
|
||||||
# endif
|
|
||||||
# define __NR_pwrite __NR_pwrite64
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
ssize_t
|
|
||||||
__libc_pwrite64 (int fd, const void *buf, size_t count, off64_t offset)
|
|
||||||
{
|
|
||||||
return SYSCALL_CANCEL (pwrite, fd, buf, count, 0,
|
|
||||||
__LONG_LONG_PAIR ((off_t) (offset >> 32),
|
|
||||||
(off_t) (offset & 0xffffffff)));
|
|
||||||
}
|
|
||||||
|
|
||||||
weak_alias (__libc_pwrite64, __pwrite64)
|
|
||||||
libc_hidden_weak (__pwrite64)
|
|
||||||
weak_alias (__libc_pwrite64, pwrite64)
|
|
||||||
|
|||||||
@ -1 +0,0 @@
|
|||||||
/* Empty since the pread syscall is equivalent. */
|
|
||||||
@ -3,7 +3,6 @@
|
|||||||
# Whee! 64-bit systems naturally implement llseek.
|
# Whee! 64-bit systems naturally implement llseek.
|
||||||
llseek EXTRA lseek i:iii __libc_lseek __lseek lseek __libc_lseek64 __llseek llseek __lseek64 lseek64
|
llseek EXTRA lseek i:iii __libc_lseek __lseek lseek __libc_lseek64 __llseek llseek __lseek64 lseek64
|
||||||
lseek llseek -
|
lseek llseek -
|
||||||
pwrite - pwrite Ci:ibni __libc_pwrite __libc_pwrite64 __pwrite pwrite __pwrite64 pwrite64
|
|
||||||
fstatfs - fstatfs i:ip __fstatfs fstatfs fstatfs64 __fstatfs64
|
fstatfs - fstatfs i:ip __fstatfs fstatfs fstatfs64 __fstatfs64
|
||||||
statfs - statfs i:sp __statfs statfs statfs64
|
statfs - statfs i:sp __statfs statfs statfs64
|
||||||
mmap - mmap b:aniiii __mmap mmap __mmap64 mmap64
|
mmap - mmap b:aniiii __mmap mmap __mmap64 mmap64
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user