On 02/06/2016 14:26, Mike Frysinger wrote:
> On 02 Jun 2016 08:26, Adhemerval Zanella wrote:
>> --- a/sysdeps/unix/sysv/linux/preadv64.c
>> +++ b/sysdeps/unix/sysv/linux/preadv64.c
>>
>> +#ifndef __NR_preadv64
>> +# define __NR_preadv64 __NR_preadv
>> +#endif
>> +
>> +#ifdef __ASSUME_PREADV
>> +ssize_t
>> +preadv64 (int fd, const struct iovec *vector, int count, off64_t offset)
>> +{
>> + return SYSCALL_CANCEL (preadv64, fd, vector, count,
>> + __ALIGNMENT_ARG SYSCALL_LL64 (offset));
>> +}
>> +#else
>> +static ssize_t __atomic_preadv_replacement (int, const struct iovec *,
>> + int, off_t) internal_function;
>> +ssize_t
>> +preadv64 (int fd, const struct iovec *vector, int count, off64_t offset)
>> +{
>> +#ifdef __NR_preadv64
>
> seems like __NR_preadv64 is always defined now ?
> -mike
>
Indeed, I overlook it. I think maybe using another define set in first
__NR_preadv64 check (#define USE_SYSCALL or something). I will change it.
@@ -88,6 +88,8 @@ CFLAGS-lsearch.c = $(uses-callbacks)
CFLAGS-pselect.c = -fexceptions
CFLAGS-readv.c = -fexceptions -fasynchronous-unwind-tables
CFLAGS-writev.c = -fexceptions -fasynchronous-unwind-tables
+CFLAGS-preadv.c = -fexceptions -fasynchronous-unwind-tables
+CFLAGS-preadv64.c = -fexceptions -fasynchronous-unwind-tables
CFLAGS-usleep.c = -fexceptions
CFLAGS-syslog.c = -fexceptions
CFLAGS-error.c = -fexceptions
deleted file mode 100644
@@ -1,38 +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 <sys/uio.h>
-
-#include <sysdep-cancel.h>
-#include <sys/syscall.h>
-
-ssize_t
-__libc_preadv (int fd, const struct iovec *vector, int count, off_t offset)
-{
- assert (sizeof (offset) == 4);
- return SYSCALL_CANCEL (preadv, fd,
- vector, count, __ALIGNMENT_ARG
- __LONG_LONG_PAIR (offset >> 31, offset));
-}
-strong_alias (__libc_preadv, __preadv)
-weak_alias (__libc_preadv, preadv)
deleted file mode 100644
@@ -1,38 +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 <sys/uio.h>
-
-#include <sysdep-cancel.h>
-#include <sys/syscall.h>
-
-ssize_t
-__libc_preadv64 (int fd, const struct iovec *vector, int count, off64_t offset)
-{
- return SYSCALL_CANCEL (preadv, fd,
- vector, count, __ALIGNMENT_ARG
- __LONG_LONG_PAIR ((off_t) (offset >> 32),
- (off_t) (offset & 0xffffffff)));
-}
-
-strong_alias (__libc_preadv64, __preadv64)
-weak_alias (__libc_preadv64, preadv64)
deleted file mode 100644
@@ -1 +0,0 @@
-/* Empty since the preadv syscall is equivalent. */
@@ -15,67 +15,19 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include <errno.h>
-#include <stddef.h>
-#include <sys/param.h>
-#include <stdint.h>
-#if __WORDSIZE == 64
-/* Hide the preadv64 declaration. */
-# define preadv64 __redirect_preadv64
-#endif
#include <sys/uio.h>
-
#include <sysdep-cancel.h>
-#include <sys/syscall.h>
-#include <kernel-features.h>
-
-
-#ifndef PREADV
-# define PREADV preadv
-# define PREADV_REPLACEMENT __atomic_preadv_replacement
-# define PREAD __pread
-# define OFF_T off_t
-#endif
-#define LO_HI_LONG(val) \
- (off_t) val, \
- (off_t) ((((uint64_t) (val)) >> (sizeof (long) * 4)) >> (sizeof (long) * 4))
-
-#ifndef __ASSUME_PREADV
-static ssize_t PREADV_REPLACEMENT (int, const struct iovec *,
- int, OFF_T) internal_function;
-#endif
+#if __WORDSIZE != 64 || defined (__ASSUME_OFF_DIFF_OFF64)
+# ifndef __NR_preadv
+# define __NR_preadv __NR_preadv64
+# endif
ssize_t
-PREADV (int fd, const struct iovec *vector, int count, OFF_T offset)
+preadv (int fd, const struct iovec *vector, int count, off_t offset)
{
-#ifdef __NR_preadv
- ssize_t result;
-
- result = SYSCALL_CANCEL (preadv, fd, vector, count, LO_HI_LONG (offset));
-
-# ifdef __ASSUME_PREADV
- return result;
-# endif
-#endif
-
-#ifndef __ASSUME_PREADV
-# ifdef __NR_preadv
- if (result >= 0 || errno != ENOSYS)
- return result;
-# endif
-
- return PREADV_REPLACEMENT (fd, vector, count, offset);
-#endif
+ return SYSCALL_CANCEL (preadv, fd, vector, count,
+ __ALIGNMENT_ARG SYSCALL_LL (offset));
}
-#if __WORDSIZE == 64
-# undef preadv64
-strong_alias (preadv, preadv64)
-#endif
-
-#ifndef __ASSUME_PREADV
-# undef PREADV
-# define PREADV static internal_function PREADV_REPLACEMENT
-# include <sysdeps/posix/preadv.c>
#endif
@@ -1,6 +1,54 @@
-#define PREADV preadv64
-#define PREADV_REPLACEMENT __atomic_preadv64_replacement
-#define PREAD __libc_pread64
-#define OFF_T off64_t
+/* Copyright (C) 2016 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
-#include "preadv.c"
+ 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 __NR_preadv64
+# define __NR_preadv64 __NR_preadv
+#endif
+
+#ifdef __ASSUME_PREADV
+ssize_t
+preadv64 (int fd, const struct iovec *vector, int count, off64_t offset)
+{
+ return SYSCALL_CANCEL (preadv64, fd, vector, count,
+ __ALIGNMENT_ARG SYSCALL_LL64 (offset));
+}
+#else
+static ssize_t __atomic_preadv_replacement (int, const struct iovec *,
+ int, off_t) internal_function;
+ssize_t
+preadv64 (int fd, const struct iovec *vector, int count, off64_t offset)
+{
+#ifdef __NR_preadv64
+ ssize_t result = SYSCALL_CANCEL (preadv64, fd, vector, count,
+ __ALIGNMENT_ARG SYSCALL_LL64 (offset));
+ if (result >= 0 || errno != ENOSYS)
+ return result;
+#endif
+ return __atomic_preadv_replacement (fd, vector, count, offset);
+}
+# define PREADV static internal_function __atomic_preadv_replacement
+# define PREAD __pread
+# define OFF_T off_t
+# include <sysdeps/posix/preadv.c>
+#endif
+
+#if __WORDSIZE == 64 && !defined (__ASSUME_OFF_DIFF_OFF64)
+strong_alias (preadv64, preadv)
+#endif
deleted file mode 100644
@@ -1,64 +0,0 @@
-/* 64-bit preadv.
- Copyright (C) 2012-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 <errno.h>
-#include <stddef.h>
-#include <sys/param.h>
-/* Hide the preadv64 declaration. */
-#define preadv64 __redirect_preadv64
-#include <sys/uio.h>
-
-#include <sysdep-cancel.h>
-#include <sys/syscall.h>
-#include <kernel-features.h>
-
-#ifndef __ASSUME_PREADV
-static ssize_t __atomic_preadv_replacement (int, const struct iovec *,
- int, off_t) internal_function;
-#endif
-
-ssize_t
-preadv (int fd, const struct iovec *vector, int count, off_t offset)
-{
-#ifdef __NR_preadv
- ssize_t result;
-
- result = SYSCALL_CANCEL (preadv, fd, vector, count, offset);
-# ifdef __ASSUME_PREADV
- return result;
-# endif
-#endif
-
-#ifndef __ASSUME_PREADV
-# ifdef __NR_preadv
- if (result >= 0 || errno != ENOSYS)
- return result;
-# endif
-
- return __atomic_preadv_replacement (fd, vector, count, offset);
-#endif
-}
-#undef preadv64
-strong_alias (preadv, preadv64)
-
-#ifndef __ASSUME_PREADV
-# define PREADV static internal_function __atomic_preadv_replacement
-# define PREAD __pread
-# define OFF_T off_t
-# include <sysdeps/posix/preadv.c>
-#endif
deleted file mode 100644
@@ -1 +0,0 @@
-/* Empty since the preadv syscall is equivalent. */
@@ -4,6 +4,5 @@ fallocate - fallocate Ci:iiii fallocate fallocate64
gettimeofday - gettimeofday:__vdso_gettimeofday@LINUX_2.6 i:pP __gettimeofday gettimeofday
personality EXTRA personality Ei:i __personality personality
posix_fadvise - fadvise64 Vi:iiii posix_fadvise posix_fadvise64
-preadv - preadv Ci:ipii preadv preadv64
pwritev - pwritev Ci:ipii pwritev pwritev64
time - time:__vdso_time@LINUX_2.6 Ei:P time