aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/unix/sysv/linux/sysdep.h
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2016-06-14 17:56:33 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2016-06-21 11:29:18 -0300
commit4751bbe2ad4d1bfa05774e29376d553ecfe563b0 (patch)
tree029d8253f0c76d8ab16f6f477dd53007113e7c55 /sysdeps/unix/sysv/linux/sysdep.h
parentdf2258c6cb4250e53f12b59785987c338b5cf396 (diff)
downloadglibc-4751bbe2ad4d1bfa05774e29376d553ecfe563b0.tar
glibc-4751bbe2ad4d1bfa05774e29376d553ecfe563b0.tar.gz
glibc-4751bbe2ad4d1bfa05774e29376d553ecfe563b0.tar.bz2
glibc-4751bbe2ad4d1bfa05774e29376d553ecfe563b0.zip
Fix p{readv,writev}{64} consolidation implementation
This patch fixes the p{readv,writev}{64} consolidation implementation from commits 4e77815 and af5fdf5. Different from pread/pwrite implementation, preadv/pwritev implementation does not require __ALIGNMENT_ARG because kernel syscall prototypes define the high and low part of the off_t, if it is the case, directly (different from pread/pwrite where the architecture ABI for passing 64-bit values must be in consideration for passsing the arguments). It also adds some basic tests for preadv/pwritev. Tested on x86_64, i686, and armhf. * misc/Makefile (tests): Add tst-preadvwritev and tst-preadvwritev64. * misc/tst-preadvwritev.c: New file. * misc/tst-preadvwritev64.c: Likewise. * sysdeps/unix/sysv/linux/preadv.c (preadv): Remove SYSCALL_LL{64} usage. * sysdeps/unix/sysv/linux/preadv64.c (preadv64): Likewise. * sysdeps/unix/sysv/linux/pwritev.c (pwritev): Likewise. * sysdeps/unix/sysv/linux/pwritev64.c (pwritev64): Likewise. * sysdeps/unix/sysv/linux/sysdep.h (LO_HI_LONG): New macro.
Diffstat (limited to 'sysdeps/unix/sysv/linux/sysdep.h')
-rw-r--r--sysdeps/unix/sysv/linux/sysdep.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/sysdeps/unix/sysv/linux/sysdep.h b/sysdeps/unix/sysv/linux/sysdep.h
index f2d7e05975..8c9e62efb0 100644
--- a/sysdeps/unix/sysv/linux/sysdep.h
+++ b/sysdeps/unix/sysv/linux/sysdep.h
@@ -47,3 +47,12 @@
#define SYSCALL_LL64(val) \
__LONG_LONG_PAIR ((long) ((val) >> 32), (long) ((val) & 0xffffffff))
#endif
+
+/* Provide a macro to pass the off{64}_t argument on p{readv,writev}{64}. */
+#if __WORDSIZE == 64 || defined __ASSUME_WORDSIZE64_ILP32
+# define LO_HI_LONG(val) (val)
+#else
+# define LO_HI_LONG(val) \
+ (long) (val), \
+ (long) (((uint64_t) (val)) >> 32)
+#endif