about summary refs log tree commit diff
path: root/sysdeps/unix/sysv/linux/generic/bits
diff options
context:
space:
mode:
authorAlistair Francis <alistair.francis@wdc.com>2019-08-13 13:18:06 -0700
committerAlistair Francis <alistair.francis@wdc.com>2019-10-23 12:43:31 -0700
commitc82005921ed25cf22959d952c2aded4752f67d99 (patch)
treeea26b60c667aa0623a6eb36548cfa37074c04053 /sysdeps/unix/sysv/linux/generic/bits
parent76aaa13d5d654a2ba0d59cd328b3f5425809aa7e (diff)
downloadglibc-c82005921ed25cf22959d952c2aded4752f67d99.tar.gz
glibc-c82005921ed25cf22959d952c2aded4752f67d99.tar.xz
glibc-c82005921ed25cf22959d952c2aded4752f67d99.zip
sysdeps/stat: Handle 64-bit ino_t types on 32-bit hosts
On a 32-bit platform with a 64-bit ino_t type (__INO_T_MATCHES_INO64_T
defined) we want to update the stat struct to remove the padding as it
isn't required. As we don't have the padding we also need to update the
overflow checker to not access the undefined members.
Diffstat (limited to 'sysdeps/unix/sysv/linux/generic/bits')
-rw-r--r--sysdeps/unix/sysv/linux/generic/bits/stat.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/sysdeps/unix/sysv/linux/generic/bits/stat.h b/sysdeps/unix/sysv/linux/generic/bits/stat.h
index 1565f3f824..34c455ed78 100644
--- a/sysdeps/unix/sysv/linux/generic/bits/stat.h
+++ b/sysdeps/unix/sysv/linux/generic/bits/stat.h
@@ -42,7 +42,10 @@
 
 #if defined __USE_FILE_OFFSET64
 # define __field64(type, type64, name) type64 name
-#elif __WORDSIZE == 64
+#elif __WORDSIZE == 64 || defined __INO_T_MATCHES_INO64_T
+# if defined __INO_T_MATCHES_INO64_T && !defined __OFF_T_MATCHES_OFF64_T
+#  error "ino_t and off_t must both be the same type"
+# endif
 # define __field64(type, type64, name) type name
 #elif __BYTE_ORDER == __LITTLE_ENDIAN
 # define __field64(type, type64, name) \