In uClibc almost all architectures uses their own kernel_stat.h header, so i follow this way. Also we have to handle what time_t we use - 32bit or 64bit and make time structures in kernel_stat structure in accordance with this. For other architectures (ARM, PPC, MIPS, xtensa) we already use the same scheme. These are the arguments to use the solution that I implemented :)
чт, 29 февр. 2024 г. в 00:03, Stafford Horne shorne@gmail.com:
On Wed, Feb 28, 2024 at 11:46:09AM +0300, Dmitry Chestnykh wrote:
Signed-off-by: Dmitry Chestnykh dm.chestnykh@gmail.com
extra/Configs/Config.in | 1 + libc/sysdeps/linux/or1k/bits/kernel_stat.h | 37 +++++++++++++++++++ .../linux/or1k/bits/uClibc_arch_features.h | 3 -- 3 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 libc/sysdeps/linux/or1k/bits/kernel_stat.h
diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in index c7c502040..ded1f72c9 100644 --- a/extra/Configs/Config.in +++ b/extra/Configs/Config.in @@ -1028,6 +1028,7 @@ config UCLIBC_USE_TIME64 bool "Use *time64 syscalls instead of 32bit ones (if possible)" depends on TARGET_arm || \ (TARGET_mips && !CONFIG_MIPS_N64_ABI) || \
TARGET_or1k || \ TARGET_powerpc || \ TARGET_xtensa # TODO: add support for other architectures
diff --git a/libc/sysdeps/linux/or1k/bits/kernel_stat.h
b/libc/sysdeps/linux/or1k/bits/kernel_stat.h
new file mode 100644 index 000000000..cec44ecfc --- /dev/null +++ b/libc/sysdeps/linux/or1k/bits/kernel_stat.h @@ -0,0 +1,37 @@ +#ifndef _BITS_STAT_STRUCT_H +#define _BITS_STAT_STRUCT_H
+#if defined(__UCLIBC_USE_TIME64__) +#include "internal/time64_helpers.h" +#endif
+struct kernel_stat {
unsigned long st_dev; /* Device. */
unsigned long st_ino; /* File serial number. */
unsigned int st_mode; /* File mode. */
unsigned int st_nlink; /* Link count. */
unsigned int st_uid; /* User ID of the file's owner. */
unsigned int st_gid; /* Group ID of the file's group. */
unsigned long st_rdev; /* Device number, if device. */
unsigned long __pad1;
long st_size; /* Size of file, in bytes. */
int st_blksize; /* Optimal block size for I/O. */
int __pad2;
long st_blocks; /* Number 512-byte blocks
allocated. */
+#if defined(__UCLIBC_USE_TIME64__)
struct __ts32_struct __st_atim32;
struct __ts32_struct __st_mtim32;
struct __ts32_struct __st_ctim32;
+#else
struct timespec st_atim;
struct timespec st_mtim;
struct timespec st_ctim;
+#endif
unsigned int __unused4;
unsigned int __unused5;
+};
+#define kernel_stat64 kernel_stat
+#endif /* _BITS_STAT_STRUCT_H */
Why is this struct needed for openrisc? It looks like something that is common and could be shared/imported?
diff --git a/libc/sysdeps/linux/or1k/bits/uClibc_arch_features.h
b/libc/sysdeps/linux/or1k/bits/uClibc_arch_features.h
index a9560b0b9..e11e71f88 100644 --- a/libc/sysdeps/linux/or1k/bits/uClibc_arch_features.h +++ b/libc/sysdeps/linux/or1k/bits/uClibc_arch_features.h @@ -14,9 +14,6 @@ /* can your target use syscall6() for mmap ? */ #define __UCLIBC_MMAP_HAS_6_ARGS__
-/* does your target use statx */ -#undef __UCLIBC_HAVE_STATX__
/* does your target have a broken create_module() ? */ #undef __UCLIBC_BROKEN_CREATE_MODULE__
-- 2.44.0