From 75f99c5145faec5e3fc4b1c9f75a7e2588df28b1 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 7 Aug 2012 13:08:22 -0700 Subject: foo --- ChangeLog | 15 +++++++++++++++ bits/stat.h | 5 +++++ bits/typesizes.h | 3 +++ ports/ChangeLog.linux-generic | 5 +++++ ports/sysdeps/unix/sysv/linux/alpha/bits/stat.h | 3 +++ ports/sysdeps/unix/sysv/linux/generic/bits/typesizes.h | 3 +++ sysdeps/unix/sysv/linux/s390/bits/typesizes.h | 3 +++ sysdeps/unix/sysv/linux/sparc/bits/typesizes.h | 3 +++ sysdeps/unix/sysv/linux/x86/bits/typesizes.h | 3 +++ 9 files changed, 43 insertions(+) diff --git a/ChangeLog b/ChangeLog index 18fb8362cd..edb09bc773 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2012-08-07 Roland McGrath + + * bits/typesizes.h + [__LP64__] (__BLKCNT_T_MATCHES_BLKCNT64_T): New macro. + * sysdeps/unix/sysv/linux/s390/bits/typesizes.h + [__s390x__] (__BLKCNT_T_MATCHES_BLKCNT64_T): New macro. + * sysdeps/unix/sysv/linux/sparc/bits/typesizes.h + [defined __arch64__ || defined __sparcv9] + (__BLKCNT_T_MATCHES_BLKCNT64_T): New macro. + * sysdeps/unix/sysv/linux/x86/bits/typesizes.h + [__x86_64__] (__BLKCNT_T_MATCHES_BLKCNT64_T): New macro. + * bits/stat.h + [defined __OFF_T_MATCHES_OFF64_T && defined __INO_T_MATCHES_INO64_T] + (_STAT_MATCHES_STAT64): New macro. + 2012-08-07 Joseph Myers * sysdeps/unix/sysv/linux/configure.in (arch_minimum_kernel): diff --git a/bits/stat.h b/bits/stat.h index b9495c52e2..c90450a559 100644 --- a/bits/stat.h +++ b/bits/stat.h @@ -100,4 +100,9 @@ struct stat64 }; #endif +#if defined __OFF_T_MATCHES_OFF64_T && defined __INO_T_MATCHES_INO64_T +/* Inform libc code that these two types are effectively identical. */ +# define _STAT_MATCHES_STAT64 1 +#endif + #endif /* bits/stat.h */ diff --git a/bits/typesizes.h b/bits/typesizes.h index c3debd0dd6..7779e9c296 100644 --- a/bits/typesizes.h +++ b/bits/typesizes.h @@ -69,6 +69,9 @@ /* Same for ino_t and ino64_t. */ # define __INO_T_MATCHES_INO64_T 1 + +/* Same for blkcnt_t and blkcnt64_t. */ +# define __BLKCNT_T_MATCHES_BLKCNT64_T #endif /* Number of descriptors that can fit in an `fd_set'. */ diff --git a/ports/ChangeLog.linux-generic b/ports/ChangeLog.linux-generic index b5774de5ff..8519a3c8fa 100644 --- a/ports/ChangeLog.linux-generic +++ b/ports/ChangeLog.linux-generic @@ -1,3 +1,8 @@ +2012-08-07 Roland McGrath + + * sysdeps/unix/sysv/linux/generic/bits/typesizes.h + [__LP64__] (__BLKCNT_T_MATCHES_BLKCNT64_T): New macro. + 2012-08-02 Roland McGrath * sysdeps/unix/sysv/linux/generic/bits/typesizes.h diff --git a/ports/sysdeps/unix/sysv/linux/alpha/bits/stat.h b/ports/sysdeps/unix/sysv/linux/alpha/bits/stat.h index 68e5989aa2..d2ba065083 100644 --- a/ports/sysdeps/unix/sysv/linux/alpha/bits/stat.h +++ b/ports/sysdeps/unix/sysv/linux/alpha/bits/stat.h @@ -117,6 +117,9 @@ struct stat64 }; #endif +/* Inform libc code that these two types are effectively identical. */ +#define _STAT_MATCHES_STAT64 1 + #undef __ST_TIME /* Tell code we have these members. */ diff --git a/ports/sysdeps/unix/sysv/linux/generic/bits/typesizes.h b/ports/sysdeps/unix/sysv/linux/generic/bits/typesizes.h index d7d2a5c10d..b36a7479e6 100644 --- a/ports/sysdeps/unix/sysv/linux/generic/bits/typesizes.h +++ b/ports/sysdeps/unix/sysv/linux/generic/bits/typesizes.h @@ -70,6 +70,9 @@ /* Same for ino_t and ino64_t. */ # define __INO_T_MATCHES_INO64_T 1 + +/* Same for blkcnt_t and blkcnt64_t. */ +# define __BLKCNT_T_MATCHES_BLKCNT64_T #endif /* Number of descriptors that can fit in an `fd_set'. */ diff --git a/sysdeps/unix/sysv/linux/s390/bits/typesizes.h b/sysdeps/unix/sysv/linux/s390/bits/typesizes.h index b630488406..e360725c82 100644 --- a/sysdeps/unix/sysv/linux/s390/bits/typesizes.h +++ b/sysdeps/unix/sysv/linux/s390/bits/typesizes.h @@ -75,6 +75,9 @@ /* Same for ino_t and ino64_t. */ # define __INO_T_MATCHES_INO64_T 1 + +/* Same for blkcnt_t and blkcnt64_t. */ +# define __BLKCNT_T_MATCHES_BLKCNT64_T #endif /* Number of descriptors that can fit in an `fd_set'. */ diff --git a/sysdeps/unix/sysv/linux/sparc/bits/typesizes.h b/sysdeps/unix/sysv/linux/sparc/bits/typesizes.h index e55d642e74..da0399f748 100644 --- a/sysdeps/unix/sysv/linux/sparc/bits/typesizes.h +++ b/sysdeps/unix/sysv/linux/sparc/bits/typesizes.h @@ -69,6 +69,9 @@ /* Same for ino_t and ino64_t. */ # define __INO_T_MATCHES_INO64_T 1 + +/* Same for blkcnt_t and blkcnt64_t. */ +# define __BLKCNT_T_MATCHES_BLKCNT64_T #endif /* Number of descriptors that can fit in an `fd_set'. */ diff --git a/sysdeps/unix/sysv/linux/x86/bits/typesizes.h b/sysdeps/unix/sysv/linux/x86/bits/typesizes.h index 397e867245..ee816a5f87 100644 --- a/sysdeps/unix/sysv/linux/x86/bits/typesizes.h +++ b/sysdeps/unix/sysv/linux/x86/bits/typesizes.h @@ -81,6 +81,9 @@ /* Same for ino_t and ino64_t. */ # define __INO_T_MATCHES_INO64_T 1 + +/* Same for blkcnt_t and blkcnt64_t. */ +# define __BLKCNT_T_MATCHES_BLKCNT64_T #endif /* Number of descriptors that can fit in an `fd_set'. */ -- cgit v1.2.3