diff options
Diffstat (limited to 'sysdeps')
24 files changed, 26 insertions, 48 deletions
diff --git a/sysdeps/unix/bsd/bsd4.4/freebsd/bits/typesizes.h b/sysdeps/unix/bsd/bsd4.4/freebsd/bits/typesizes.h index 02c24e4..67d82e6 100644 --- a/sysdeps/unix/bsd/bsd4.4/freebsd/bits/typesizes.h +++ b/sysdeps/unix/bsd/bsd4.4/freebsd/bits/typesizes.h @@ -61,6 +61,11 @@ #define __SYSCALL_SLONG_TYPE __SLONGWORD_TYPE #define __SYSCALL_ULONG_TYPE __ULONGWORD_TYPE + +/* Tell the libc code that off_t and off64_t are actually the same type. */ +#define __OFF_T_MATCHES_OFF64_T 1 + + /* Number of descriptors that can fit in an `fd_set'. */ #define __FD_SETSIZE 1024 diff --git a/sysdeps/unix/sysv/linux/s390/bits/typesizes.h b/sysdeps/unix/sysv/linux/s390/bits/typesizes.h index def84cc..bf3d8b7 100644 --- a/sysdeps/unix/sysv/linux/s390/bits/typesizes.h +++ b/sysdeps/unix/sysv/linux/s390/bits/typesizes.h @@ -67,6 +67,13 @@ #define __SYSCALL_SLONG_TYPE __SLONGWORD_TYPE #define __SYSCALL_ULONG_TYPE __ULONGWORD_TYPE +#ifdef __s390x__ +/* Tell the libc code that off_t and off64_t are actually the same type + for all ABI purposes, even if possibly expressed as different base types + for C type-checking purposes. */ +# define __OFF_T_MATCHES_OFF64_T 1 +#endif + /* Number of descriptors that can fit in an `fd_set'. */ #define __FD_SETSIZE 1024 diff --git a/sysdeps/unix/sysv/linux/sparc/bits/typesizes.h b/sysdeps/unix/sysv/linux/sparc/bits/typesizes.h index b65a1a5..7b1f191 100644 --- a/sysdeps/unix/sysv/linux/sparc/bits/typesizes.h +++ b/sysdeps/unix/sysv/linux/sparc/bits/typesizes.h @@ -61,6 +61,13 @@ #define __SYSCALL_SLONG_TYPE __SLONGWORD_TYPE #define __SYSCALL_ULONG_TYPE __ULONGWORD_TYPE +#if defined __arch64__ || defined __sparcv9 +/* Tell the libc code that off_t and off64_t are actually the same type + for all ABI purposes, even if possibly expressed as different base types + for C type-checking purposes. */ +# define __OFF_T_MATCHES_OFF64_T 1 +#endif + /* Number of descriptors that can fit in an `fd_set'. */ #define __FD_SETSIZE 1024 diff --git a/sysdeps/unix/sysv/linux/x86/bits/typesizes.h b/sysdeps/unix/sysv/linux/x86/bits/typesizes.h index be8985b..a477627 100644 --- a/sysdeps/unix/sysv/linux/x86/bits/typesizes.h +++ b/sysdeps/unix/sysv/linux/x86/bits/typesizes.h @@ -73,6 +73,13 @@ #define __FSID_T_TYPE struct { int __val[2]; } #define __SSIZE_T_TYPE __SWORD_TYPE +#ifdef __x86_64__ +/* Tell the libc code that off_t and off64_t are actually the same type + for all ABI purposes, even if possibly expressed as different base types + for C type-checking purposes. */ +# define __OFF_T_MATCHES_OFF64_T 1 +#endif + /* Number of descriptors that can fit in an `fd_set'. */ #define __FD_SETSIZE 1024 diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/fseeko.c b/sysdeps/unix/sysv/linux/x86_64/x32/fseeko.c deleted file mode 100644 index dc47698..0000000 --- a/sysdeps/unix/sysv/linux/x86_64/x32/fseeko.c +++ /dev/null @@ -1 +0,0 @@ -#include <sysdeps/wordsize-64/fseeko.c> diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/fseeko64.c b/sysdeps/unix/sysv/linux/x86_64/x32/fseeko64.c deleted file mode 100644 index 3e554ec..0000000 --- a/sysdeps/unix/sysv/linux/x86_64/x32/fseeko64.c +++ /dev/null @@ -1 +0,0 @@ -#include <sysdeps/wordsize-64/fseeko64.c> diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/ftello.c b/sysdeps/unix/sysv/linux/x86_64/x32/ftello.c deleted file mode 100644 index 735e3e1..0000000 --- a/sysdeps/unix/sysv/linux/x86_64/x32/ftello.c +++ /dev/null @@ -1 +0,0 @@ -#include <sysdeps/wordsize-64/ftello.c> diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/ftello64.c b/sysdeps/unix/sysv/linux/x86_64/x32/ftello64.c deleted file mode 100644 index eb155ed..0000000 --- a/sysdeps/unix/sysv/linux/x86_64/x32/ftello64.c +++ /dev/null @@ -1 +0,0 @@ -#include <sysdeps/wordsize-64/ftello64.c> diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/iofgetpos.c b/sysdeps/unix/sysv/linux/x86_64/x32/iofgetpos.c deleted file mode 100644 index de2ff01..0000000 --- a/sysdeps/unix/sysv/linux/x86_64/x32/iofgetpos.c +++ /dev/null @@ -1 +0,0 @@ -#include <sysdeps/wordsize-64/iofgetpos.c> diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/iofgetpos64.c b/sysdeps/unix/sysv/linux/x86_64/x32/iofgetpos64.c deleted file mode 100644 index 34aabfc..0000000 --- a/sysdeps/unix/sysv/linux/x86_64/x32/iofgetpos64.c +++ /dev/null @@ -1 +0,0 @@ -#include <sysdeps/wordsize-64/iofgetpos64.c> diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/iofsetpos.c b/sysdeps/unix/sysv/linux/x86_64/x32/iofsetpos.c deleted file mode 100644 index a4c99c9..0000000 --- a/sysdeps/unix/sysv/linux/x86_64/x32/iofsetpos.c +++ /dev/null @@ -1 +0,0 @@ -#include <sysdeps/wordsize-64/iofsetpos.c> diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/iofsetpos64.c b/sysdeps/unix/sysv/linux/x86_64/x32/iofsetpos64.c deleted file mode 100644 index e83fbba..0000000 --- a/sysdeps/unix/sysv/linux/x86_64/x32/iofsetpos64.c +++ /dev/null @@ -1 +0,0 @@ -#include <sysdeps/wordsize-64/iofsetpos64.c> diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/lockf.c b/sysdeps/unix/sysv/linux/x86_64/x32/lockf.c deleted file mode 100644 index 42306a0..0000000 --- a/sysdeps/unix/sysv/linux/x86_64/x32/lockf.c +++ /dev/null @@ -1 +0,0 @@ -#include <sysdeps/wordsize-64/lockf.c> diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/lockf64.c b/sysdeps/unix/sysv/linux/x86_64/x32/lockf64.c deleted file mode 100644 index 3b4b55a..0000000 --- a/sysdeps/unix/sysv/linux/x86_64/x32/lockf64.c +++ /dev/null @@ -1 +0,0 @@ -#include <sysdeps/wordsize-64/lockf64.c> diff --git a/sysdeps/wordsize-64/fseeko.c b/sysdeps/wordsize-64/fseeko.c deleted file mode 100644 index 692885a..0000000 --- a/sysdeps/wordsize-64/fseeko.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "../../libio/fseeko.c" - -weak_alias (fseeko, fseeko64) diff --git a/sysdeps/wordsize-64/fseeko64.c b/sysdeps/wordsize-64/fseeko64.c deleted file mode 100644 index 73e011a..0000000 --- a/sysdeps/wordsize-64/fseeko64.c +++ /dev/null @@ -1 +0,0 @@ -/* Defined in fseeko.c. */ diff --git a/sysdeps/wordsize-64/ftello.c b/sysdeps/wordsize-64/ftello.c deleted file mode 100644 index fa05cfc..0000000 --- a/sysdeps/wordsize-64/ftello.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "../../libio/ftello.c" - -weak_alias (ftello, ftello64) diff --git a/sysdeps/wordsize-64/ftello64.c b/sysdeps/wordsize-64/ftello64.c deleted file mode 100644 index 2cbbe63..0000000 --- a/sysdeps/wordsize-64/ftello64.c +++ /dev/null @@ -1 +0,0 @@ -/* Defined in ftello.c. */ diff --git a/sysdeps/wordsize-64/iofgetpos.c b/sysdeps/wordsize-64/iofgetpos.c deleted file mode 100644 index ba8df67..0000000 --- a/sysdeps/wordsize-64/iofgetpos.c +++ /dev/null @@ -1,12 +0,0 @@ -#define _IO_new_fgetpos64 __renamed__IO_new_fgetpos64 -#define _IO_fgetpos64 __renamed__IO_fgetpos64 - -#include "../../libio/iofgetpos.c" - -#undef _IO_new_fgetpos64 -#undef _IO_fgetpos64 - -strong_alias (_IO_new_fgetpos, _IO_new_fgetpos64) -strong_alias (_IO_new_fgetpos64, __new_fgetpos64) -versioned_symbol (libc, _IO_new_fgetpos64, _IO_fgetpos64, GLIBC_2_2); -versioned_symbol (libc, __new_fgetpos64, fgetpos64, GLIBC_2_2); diff --git a/sysdeps/wordsize-64/iofgetpos64.c b/sysdeps/wordsize-64/iofgetpos64.c deleted file mode 100644 index 1748b81..0000000 --- a/sysdeps/wordsize-64/iofgetpos64.c +++ /dev/null @@ -1 +0,0 @@ -/* Defined in iofgetpos.c. */ diff --git a/sysdeps/wordsize-64/iofsetpos.c b/sysdeps/wordsize-64/iofsetpos.c deleted file mode 100644 index f2bb8ae..0000000 --- a/sysdeps/wordsize-64/iofsetpos.c +++ /dev/null @@ -1,12 +0,0 @@ -#define _IO_new_fsetpos64 __renamed__IO_new_fsetpos64 -#define _IO_fsetpos64 __renamed__IO_fsetpos64 - -#include "../../libio/iofsetpos.c" - -#undef _IO_new_fsetpos64 -#undef _IO_fsetpos64 - -strong_alias (_IO_new_fsetpos, _IO_new_fsetpos64) -strong_alias (_IO_new_fsetpos64, __new_fsetpos64) -versioned_symbol (libc, __new_fsetpos64, fsetpos64, GLIBC_2_2); -versioned_symbol (libc, _IO_new_fsetpos64, _IO_fsetpos64, GLIBC_2_2); diff --git a/sysdeps/wordsize-64/iofsetpos64.c b/sysdeps/wordsize-64/iofsetpos64.c deleted file mode 100644 index 5fbc732..0000000 --- a/sysdeps/wordsize-64/iofsetpos64.c +++ /dev/null @@ -1 +0,0 @@ -/* Defined in iofsetpos.c. */ diff --git a/sysdeps/wordsize-64/lockf.c b/sysdeps/wordsize-64/lockf.c deleted file mode 100644 index 502472d..0000000 --- a/sysdeps/wordsize-64/lockf.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "../../io/lockf.c" - -weak_alias (lockf, lockf64) diff --git a/sysdeps/wordsize-64/lockf64.c b/sysdeps/wordsize-64/lockf64.c deleted file mode 100644 index 8ef5fc6..0000000 --- a/sysdeps/wordsize-64/lockf64.c +++ /dev/null @@ -1 +0,0 @@ -/* Defined in lockf.c. */ |