lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00
Code Activity

Remove __ASSUME_OFF_DIFF_OFF64 definition

Browse Source 
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.
This commit is contained in:
Adhemerval Zanella
2016-06-28 09:48:18 -03:00
parent 62ce266b0b
commit 6320de9536
10 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ChangeLog
View File

@ -1,3 +1,25 @@
2016-07-08 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-07-08 Martin Galvan <martin.galvan@tallertechnologies.com> 2016-07-08 Martin Galvan <martin.galvan@tallertechnologies.com>
* Makeconfig (build-hardcoded-path-in-tests): Set to 'yes' * Makeconfig (build-hardcoded-path-in-tests): Set to 'yes'

1
sysdeps/unix/sysv/linux/mips/kernel-features.h
View File

@ -38,5 +38,4 @@
pass 64-bits values through syscalls. */ pass 64-bits values through syscalls. */
#if _MIPS_SIM == _ABIN32 #if _MIPS_SIM == _ABIN32
# define __ASSUME_WORDSIZE64_ILP32 1 # define __ASSUME_WORDSIZE64_ILP32 1
# define __ASSUME_OFF_DIFF_OFF64 1
#endif #endif

2
sysdeps/unix/sysv/linux/pread.c
View File

@ -19,7 +19,7 @@
#include <unistd.h> #include <unistd.h>
#include <sysdep-cancel.h> #include <sysdep-cancel.h>
#if __WORDSIZE != 64 || defined (__ASSUME_OFF_DIFF_OFF64) #ifndef __OFF_T_MATCHES_OFF64_T
# ifndef __NR_pread # ifndef __NR_pread
# define __NR_pread __NR_pread64 # define __NR_pread __NR_pread64

2
sysdeps/unix/sysv/linux/pread64.c
View File

@ -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)
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) strong_alias (__libc_pread64, __libc_pread)
weak_alias (__libc_pread64, __pread) weak_alias (__libc_pread64, __pread)
weak_alias (__libc_pread64, pread) weak_alias (__libc_pread64, pread)

2
sysdeps/unix/sysv/linux/preadv.c
View File

@ -18,7 +18,7 @@
#include <sys/uio.h> #include <sys/uio.h>
#include <sysdep-cancel.h> #include <sysdep-cancel.h>
#if __WORDSIZE != 64 || defined (__ASSUME_OFF_DIFF_OFF64) #ifndef __OFF_T_MATCHES_OFF64_T
# ifdef __ASSUME_PREADV # ifdef __ASSUME_PREADV

2
sysdeps/unix/sysv/linux/preadv64.c
View File

@ -49,6 +49,6 @@ preadv64 (int fd, const struct iovec *vector, int count, off64_t offset)
# include <sysdeps/posix/preadv.c> # include <sysdeps/posix/preadv.c>
#endif #endif
#if __WORDSIZE == 64 && !defined (__ASSUME_OFF_DIFF_OFF64) #ifdef __OFF_T_MATCHES_OFF64_T
strong_alias (preadv64, preadv) strong_alias (preadv64, preadv)
#endif #endif

2
sysdeps/unix/sysv/linux/pwrite.c
View File

@ -19,7 +19,7 @@
#include <unistd.h> #include <unistd.h>
#include <sysdep-cancel.h> #include <sysdep-cancel.h>
#if __WORDSIZE != 64 || defined (__ASSUME_OFF_DIFF_OFF64) #ifndef __OFF_T_MATCHES_OFF64_T
# ifndef __NR_pwrite # ifndef __NR_pwrite
# define __NR_pwrite __NR_pwrite64 # define __NR_pwrite __NR_pwrite64

2
sysdeps/unix/sysv/linux/pwrite64.c
View File

@ -33,7 +33,7 @@ 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) #ifdef __OFF_T_MATCHES_OFF64_T
strong_alias (__libc_pwrite64, __libc_pwrite) strong_alias (__libc_pwrite64, __libc_pwrite)
weak_alias (__libc_pwrite64, __pwrite) weak_alias (__libc_pwrite64, __pwrite)
weak_alias (__libc_pwrite64, pwrite) weak_alias (__libc_pwrite64, pwrite)

2
sysdeps/unix/sysv/linux/pwritev.c
View File

@ -18,7 +18,7 @@
#include <sys/uio.h> #include <sys/uio.h>
#include <sysdep-cancel.h> #include <sysdep-cancel.h>
#if __WORDSIZE != 64 || defined (__ASSUME_OFF_DIFF_OFF64) #ifndef __OFF_T_MATCHES_OFF64_T
# ifdef __ASSUME_PREADV # ifdef __ASSUME_PREADV

2
sysdeps/unix/sysv/linux/pwritev64.c
View File

@ -49,6 +49,6 @@ pwritev64 (int fd, const struct iovec *vector, int count, off64_t offset)
# include <sysdeps/posix/pwritev.c> # include <sysdeps/posix/pwritev.c>
#endif #endif
#if __WORDSIZE == 64 && !defined (__ASSUME_OFF_DIFF_OFF64) #ifdef __OFF_T_MATCHES_OFF64_T
strong_alias (pwritev64, pwritev) strong_alias (pwritev64, pwritev)
#endif #endif