foo

diff --git a/ChangeLog b/ChangeLog
index 18fb8362cd552cd11ea6fef195f587019901b3f6..edb09bc7731f79ff1eee4dfc5133b5e335cde4f7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2012-08-07  Roland McGrath  <roland@hack.frob.com>
+
+       * 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  <joseph@codesourcery.com>
 
        * sysdeps/unix/sysv/linux/configure.in (arch_minimum_kernel):

diff --git a/bits/stat.h b/bits/stat.h
index b9495c52e20de3335c36be5bdde40a6c7bd8c2aa..c90450a55936388559ba0775fd59dde511852112 100644 (file)
--- 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 c3debd0dd634cbb5fbd156a9e494868d0c33b8a1..7779e9c296028066f035145b4918af16525cbb37 100644 (file)
--- 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 b5774de5ffa990c05fd022aa2c6eac1c3bf4b504..8519a3c8fae3d0c6586ca498d4b66207b5f2a666 100644 (file)
--- a/ports/ChangeLog.linux-generic
+++ b/ports/ChangeLog.linux-generic
@@ -1,3 +1,8 @@
+2012-08-07  Roland McGrath  <roland@hack.frob.com>
+
+       * sysdeps/unix/sysv/linux/generic/bits/typesizes.h
+       [__LP64__] (__BLKCNT_T_MATCHES_BLKCNT64_T): New macro.
+
 2012-08-02  Roland McGrath  <roland@hack.frob.com>
 
        * 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 68e5989aa296bba31a9eb1dd6cab69e046a78f6e..d2ba065083ebe6bfb5a9917647d3261b914c1e9b 100644 (file)
--- 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 d7d2a5c10dc2418119de490671bfb9e21f9e6e86..b36a7479e656d87104bba0182ca5a7fa5b6ad5c4 100644 (file)
--- 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 b63048840680e8fd1b5083d7f8ec71c9c410ce2c..e360725c8226048289eaec68941f6d7cef703ecc 100644 (file)
--- 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 e55d642e74c58dcd6d84b5d6a73ca6c86ad20550..da0399f7488f849cb644da57a3bdd725cc356dcd 100644 (file)
--- 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 397e867245d1a75af71e0b2388efddd3a0ccd49b..ee816a5f87ba7ebf76724b3153970f98b299ffa8 100644 (file)
--- 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'.  */