aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2012-08-07 13:08:22 -0700
committerRoland McGrath <roland@hack.frob.com>2012-08-07 13:08:22 -0700
commit75f99c5145faec5e3fc4b1c9f75a7e2588df28b1 (patch)
tree625b8fa0a48313f1e90495b216ad02bdb84c09d2
parent6dad2c06889774ddaf6eac09799821e3941bfa87 (diff)
downloadtermbaud-roland/stat64.tar.gz
termbaud-roland/stat64.tar.xz
termbaud-roland/stat64.zip
-rw-r--r--ChangeLog15
-rw-r--r--bits/stat.h5
-rw-r--r--bits/typesizes.h3
-rw-r--r--ports/ChangeLog.linux-generic5
-rw-r--r--ports/sysdeps/unix/sysv/linux/alpha/bits/stat.h3
-rw-r--r--ports/sysdeps/unix/sysv/linux/generic/bits/typesizes.h3
-rw-r--r--sysdeps/unix/sysv/linux/s390/bits/typesizes.h3
-rw-r--r--sysdeps/unix/sysv/linux/sparc/bits/typesizes.h3
-rw-r--r--sysdeps/unix/sysv/linux/x86/bits/typesizes.h3
9 files changed, 43 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 18fb8362cd5..edb09bc7731 100644
--- 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 b9495c52e20..c90450a5593 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 c3debd0dd63..7779e9c2960 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 b5774de5ffa..8519a3c8fae 100644
--- 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 68e5989aa29..d2ba065083e 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 d7d2a5c10dc..b36a7479e65 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 b6304884068..e360725c822 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 e55d642e74c..da0399f7488 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 397e867245d..ee816a5f87b 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'. */