[1/3] Remove __ASSUME_OFF_DIFF_OFF64 definition
Commit Message
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.
---
ChangeLog | 22 ++++++++++++++++++++++
sysdeps/unix/sysv/linux/mips/kernel-features.h | 1 -
sysdeps/unix/sysv/linux/pread.c | 2 +-
sysdeps/unix/sysv/linux/pread64.c | 2 +-
sysdeps/unix/sysv/linux/preadv.c | 2 +-
sysdeps/unix/sysv/linux/preadv64.c | 2 +-
sysdeps/unix/sysv/linux/pwrite.c | 2 +-
sysdeps/unix/sysv/linux/pwrite64.c | 2 +-
sysdeps/unix/sysv/linux/pwritev.c | 2 +-
sysdeps/unix/sysv/linux/pwritev64.c | 2 +-
10 files changed, 30 insertions(+), 9 deletions(-)
Comments
Ping for this first part one (I postpone second and third part to 2.25).
On 28/06/2016 16:04, Adhemerval Zanella wrote:
> 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.
> ---
> ChangeLog | 22 ++++++++++++++++++++++
> sysdeps/unix/sysv/linux/mips/kernel-features.h | 1 -
> sysdeps/unix/sysv/linux/pread.c | 2 +-
> sysdeps/unix/sysv/linux/pread64.c | 2 +-
> sysdeps/unix/sysv/linux/preadv.c | 2 +-
> sysdeps/unix/sysv/linux/preadv64.c | 2 +-
> sysdeps/unix/sysv/linux/pwrite.c | 2 +-
> sysdeps/unix/sysv/linux/pwrite64.c | 2 +-
> sysdeps/unix/sysv/linux/pwritev.c | 2 +-
> sysdeps/unix/sysv/linux/pwritev64.c | 2 +-
> 10 files changed, 30 insertions(+), 9 deletions(-)
>
> diff --git a/ChangeLog b/ChangeLog
> index 932ec5b..ce4471e 100644
> --- a/ChangeLog
> +++ b/ChangeLog
> @@ -1,3 +1,25 @@
> +2016-06-28 Adhemerval Zanella <adhemerval.zanella@linaro.org>
> +
> + * 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.
> +
> 2016-06-28 Stefan Liebler <stli@linux.vnet.ibm.com>
>
> [BZ #19860]
> diff --git a/sysdeps/unix/sysv/linux/mips/kernel-features.h b/sysdeps/unix/sysv/linux/mips/kernel-features.h
> index 09d5ece..b486d90 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 5663092..1bcff64 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 c599f76..58c6aeb 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 be206e2..107cb81 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 64164bb..66afd4c 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 ca3014f..9c502be 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 5a37701..b49e6bc 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 19b4a10..6747f42 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 c0cfe4b..e162948 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
>
I will commit this shortly if no one opposes it.
On 07/07/2016 12:17, Adhemerval Zanella wrote:
> Ping for this first part one (I postpone second and third part to 2.25).
>
> On 28/06/2016 16:04, Adhemerval Zanella wrote:
>> 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.
>> ---
>> ChangeLog | 22 ++++++++++++++++++++++
>> sysdeps/unix/sysv/linux/mips/kernel-features.h | 1 -
>> sysdeps/unix/sysv/linux/pread.c | 2 +-
>> sysdeps/unix/sysv/linux/pread64.c | 2 +-
>> sysdeps/unix/sysv/linux/preadv.c | 2 +-
>> sysdeps/unix/sysv/linux/preadv64.c | 2 +-
>> sysdeps/unix/sysv/linux/pwrite.c | 2 +-
>> sysdeps/unix/sysv/linux/pwrite64.c | 2 +-
>> sysdeps/unix/sysv/linux/pwritev.c | 2 +-
>> sysdeps/unix/sysv/linux/pwritev64.c | 2 +-
>> 10 files changed, 30 insertions(+), 9 deletions(-)
>>
>> diff --git a/ChangeLog b/ChangeLog
>> index 932ec5b..ce4471e 100644
>> --- a/ChangeLog
>> +++ b/ChangeLog
>> @@ -1,3 +1,25 @@
>> +2016-06-28 Adhemerval Zanella <adhemerval.zanella@linaro.org>
>> +
>> + * 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.
>> +
>> 2016-06-28 Stefan Liebler <stli@linux.vnet.ibm.com>
>>
>> [BZ #19860]
>> diff --git a/sysdeps/unix/sysv/linux/mips/kernel-features.h b/sysdeps/unix/sysv/linux/mips/kernel-features.h
>> index 09d5ece..b486d90 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 5663092..1bcff64 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 c599f76..58c6aeb 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 be206e2..107cb81 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 64164bb..66afd4c 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 ca3014f..9c502be 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 5a37701..b49e6bc 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 19b4a10..6747f42 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 c0cfe4b..e162948 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
>>
On Fri, Jul 8, 2016 at 11:10 AM, Adhemerval Zanella
<adhemerval.zanella@linaro.org> wrote:
> I will commit this shortly if no one opposes it.
>
> On 07/07/2016 12:17, Adhemerval Zanella wrote:
>> Ping for this first part one (I postpone second and third part to 2.25).
>>
>> On 28/06/2016 16:04, Adhemerval Zanella wrote:
>>> 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.
>>> ---
>>> ChangeLog | 22 ++++++++++++++++++++++
>>> sysdeps/unix/sysv/linux/mips/kernel-features.h | 1 -
>>> sysdeps/unix/sysv/linux/pread.c | 2 +-
>>> sysdeps/unix/sysv/linux/pread64.c | 2 +-
>>> sysdeps/unix/sysv/linux/preadv.c | 2 +-
>>> sysdeps/unix/sysv/linux/preadv64.c | 2 +-
>>> sysdeps/unix/sysv/linux/pwrite.c | 2 +-
>>> sysdeps/unix/sysv/linux/pwrite64.c | 2 +-
>>> sysdeps/unix/sysv/linux/pwritev.c | 2 +-
>>> sysdeps/unix/sysv/linux/pwritev64.c | 2 +-
>>> 10 files changed, 30 insertions(+), 9 deletions(-)
>>>
>>> diff --git a/ChangeLog b/ChangeLog
>>> index 932ec5b..ce4471e 100644
>>> --- a/ChangeLog
>>> +++ b/ChangeLog
>>> @@ -1,3 +1,25 @@
>>> +2016-06-28 Adhemerval Zanella <adhemerval.zanella@linaro.org>
>>> +
>>> + * 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.
>>> +
I think this caused:
https://sourceware.org/bugzilla/show_bug.cgi?id=20348
@@ -1,3 +1,25 @@
+2016-06-28 Adhemerval Zanella <adhemerval.zanella@linaro.org>
+
+ * 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.
+
2016-06-28 Stefan Liebler <stli@linux.vnet.ibm.com>
[BZ #19860]
@@ -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
@@ -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
@@ -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)
@@ -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
@@ -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
@@ -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
@@ -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)
@@ -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
@@ -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