diff options
author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2016-06-28 09:48:18 -0300 |
---|---|---|
committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2016-07-08 14:28:08 -0300 |
commit | 6320de95367a6d5a7849d2a2ccdd9189277fc181 (patch) | |
tree | f3f50eb6b1149591aebd0a5e019ca986bd3bf358 /sysdeps | |
parent | 62ce266b0b261def2c6329be9814ffdcc11964d6 (diff) | |
download | glibc-6320de95367a6d5a7849d2a2ccdd9189277fc181.tar.gz glibc-6320de95367a6d5a7849d2a2ccdd9189277fc181.tar.xz glibc-6320de95367a6d5a7849d2a2ccdd9189277fc181.zip |
Remove __ASSUME_OFF_DIFF_OFF64 definition
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.
Diffstat (limited to 'sysdeps')
-rw-r--r-- | sysdeps/unix/sysv/linux/mips/kernel-features.h | 1 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/pread.c | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/pread64.c | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/preadv.c | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/preadv64.c | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/pwrite.c | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/pwrite64.c | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/pwritev.c | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/pwritev64.c | 2 |
9 files changed, 8 insertions, 9 deletions
diff --git a/sysdeps/unix/sysv/linux/mips/kernel-features.h b/sysdeps/unix/sysv/linux/mips/kernel-features.h index 09d5ecedd8..b486d904c3 100644 --- a/sysdeps/unix/sysv/linux/mips/kernel-features.h +++ b/sysdeps/unix/sysv/linux/mips/kernel-features.h @@ -38,5 +38,4 @@ pass 64-bits values through syscalls. */ #if _MIPS_SIM == _ABIN32 # define __ASSUME_WORDSIZE64_ILP32 1 -# define __ASSUME_OFF_DIFF_OFF64 1 #endif diff --git a/sysdeps/unix/sysv/linux/pread.c b/sysdeps/unix/sysv/linux/pread.c index 566309278a..1bcff64781 100644 --- a/sysdeps/unix/sysv/linux/pread.c +++ b/sysdeps/unix/sysv/linux/pread.c @@ -19,7 +19,7 @@ #include <unistd.h> #include <sysdep-cancel.h> -#if __WORDSIZE != 64 || defined (__ASSUME_OFF_DIFF_OFF64) +#ifndef __OFF_T_MATCHES_OFF64_T # ifndef __NR_pread # define __NR_pread __NR_pread64 diff --git a/sysdeps/unix/sysv/linux/pread64.c b/sysdeps/unix/sysv/linux/pread64.c index c599f7664b..58c6aeb541 100644 --- a/sysdeps/unix/sysv/linux/pread64.c +++ b/sysdeps/unix/sysv/linux/pread64.c @@ -33,7 +33,7 @@ __libc_pread64 (int fd, void *buf, size_t count, off64_t offset) weak_alias (__libc_pread64, __pread64) weak_alias (__libc_pread64, pread64) -#if __WORDSIZE == 64 && !defined (__ASSUME_OFF_DIFF_OFF64) +#ifdef __OFF_T_MATCHES_OFF64_T strong_alias (__libc_pread64, __libc_pread) weak_alias (__libc_pread64, __pread) weak_alias (__libc_pread64, pread) diff --git a/sysdeps/unix/sysv/linux/preadv.c b/sysdeps/unix/sysv/linux/preadv.c index be206e277b..107cb818f9 100644 --- a/sysdeps/unix/sysv/linux/preadv.c +++ b/sysdeps/unix/sysv/linux/preadv.c @@ -18,7 +18,7 @@ #include <sys/uio.h> #include <sysdep-cancel.h> -#if __WORDSIZE != 64 || defined (__ASSUME_OFF_DIFF_OFF64) +#ifndef __OFF_T_MATCHES_OFF64_T # ifdef __ASSUME_PREADV diff --git a/sysdeps/unix/sysv/linux/preadv64.c b/sysdeps/unix/sysv/linux/preadv64.c index 64164bbe6b..66afd4c82e 100644 --- a/sysdeps/unix/sysv/linux/preadv64.c +++ b/sysdeps/unix/sysv/linux/preadv64.c @@ -49,6 +49,6 @@ preadv64 (int fd, const struct iovec *vector, int count, off64_t offset) # include <sysdeps/posix/preadv.c> #endif -#if __WORDSIZE == 64 && !defined (__ASSUME_OFF_DIFF_OFF64) +#ifdef __OFF_T_MATCHES_OFF64_T strong_alias (preadv64, preadv) #endif diff --git a/sysdeps/unix/sysv/linux/pwrite.c b/sysdeps/unix/sysv/linux/pwrite.c index ca3014f06d..9c502beac1 100644 --- a/sysdeps/unix/sysv/linux/pwrite.c +++ b/sysdeps/unix/sysv/linux/pwrite.c @@ -19,7 +19,7 @@ #include <unistd.h> #include <sysdep-cancel.h> -#if __WORDSIZE != 64 || defined (__ASSUME_OFF_DIFF_OFF64) +#ifndef __OFF_T_MATCHES_OFF64_T # ifndef __NR_pwrite # define __NR_pwrite __NR_pwrite64 diff --git a/sysdeps/unix/sysv/linux/pwrite64.c b/sysdeps/unix/sysv/linux/pwrite64.c index 5a37701848..b49e6bc286 100644 --- a/sysdeps/unix/sysv/linux/pwrite64.c +++ b/sysdeps/unix/sysv/linux/pwrite64.c @@ -33,7 +33,7 @@ weak_alias (__libc_pwrite64, __pwrite64) libc_hidden_weak (__pwrite64) weak_alias (__libc_pwrite64, pwrite64) -#if __WORDSIZE == 64 && !defined (__ASSUME_OFF_DIFF_OFF64) +#ifdef __OFF_T_MATCHES_OFF64_T strong_alias (__libc_pwrite64, __libc_pwrite) weak_alias (__libc_pwrite64, __pwrite) weak_alias (__libc_pwrite64, pwrite) diff --git a/sysdeps/unix/sysv/linux/pwritev.c b/sysdeps/unix/sysv/linux/pwritev.c index 19b4a109a9..6747f42c48 100644 --- a/sysdeps/unix/sysv/linux/pwritev.c +++ b/sysdeps/unix/sysv/linux/pwritev.c @@ -18,7 +18,7 @@ #include <sys/uio.h> #include <sysdep-cancel.h> -#if __WORDSIZE != 64 || defined (__ASSUME_OFF_DIFF_OFF64) +#ifndef __OFF_T_MATCHES_OFF64_T # ifdef __ASSUME_PREADV diff --git a/sysdeps/unix/sysv/linux/pwritev64.c b/sysdeps/unix/sysv/linux/pwritev64.c index c0cfe4b413..e162948cab 100644 --- a/sysdeps/unix/sysv/linux/pwritev64.c +++ b/sysdeps/unix/sysv/linux/pwritev64.c @@ -49,6 +49,6 @@ pwritev64 (int fd, const struct iovec *vector, int count, off64_t offset) # include <sysdeps/posix/pwritev.c> #endif -#if __WORDSIZE == 64 && !defined (__ASSUME_OFF_DIFF_OFF64) +#ifdef __OFF_T_MATCHES_OFF64_T strong_alias (pwritev64, pwritev) #endif |