devel

devel@uclibc-ng.org

1 participants
1164 discussions

[PATCH] Add time64 support for sparc.
by Dmitry Chestnykh 03 Mar '24

03 Mar '24

By some reason sparc ld.so cannot work properly with statx() system call, so fallback to regular stat() family in ld.so. Signed-off-by: Dmitry Chestnykh <dm.chestnykh(a)gmail.com> --- extra/Configs/Config.in | 1 + ldso/include/dl-syscall.h | 10 +++++----- libc/sysdeps/linux/sparc/bits/kernel_stat.h | 16 ++++++++++++++++ libc/sysdeps/linux/sparc/bits/sem.h | 18 ++++++++++++++++-- libc/sysdeps/linux/sparc/bits/typesizes.h | 12 ++++++++++++ .../linux/sparc/bits/uClibc_arch_features.h | 3 --- 6 files changed, 50 insertions(+), 10 deletions(-) diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in index ded1f72c9..bae7b4885 100644 --- a/extra/Configs/Config.in +++ b/extra/Configs/Config.in @@ -1030,6 +1030,7 @@ config UCLIBC_USE_TIME64 (TARGET_mips && !CONFIG_MIPS_N64_ABI) || \ TARGET_or1k || \ TARGET_powerpc || \ + TARGET_sparc || \ TARGET_xtensa # TODO: add support for other architectures default n diff --git a/ldso/include/dl-syscall.h b/ldso/include/dl-syscall.h index 666a7c693..b40f58b10 100644 --- a/ldso/include/dl-syscall.h +++ b/ldso/include/dl-syscall.h @@ -20,7 +20,7 @@ extern int _dl_errno; #define _SYS_MMAN_H 1 #include <bits/mman.h> -#if defined(__ARCH_HAS_DEPRECATED_SYSCALLS__) && !defined(__UCLIBC_USE_TIME64__) +#if defined(__ARCH_HAS_DEPRECATED_SYSCALLS__) && (!defined(__UCLIBC_USE_TIME64__) || defined(__sparc__)) /* Pull in whatever this particular arch's kernel thinks the kernel version of * struct stat should look like. It turns out that each arch has a different * opinion on the subject, and different kernel revs use different names... */ @@ -116,7 +116,7 @@ static __always_inline _syscall3(unsigned long, _dl_read, int, fd, static __always_inline _syscall3(int, _dl_mprotect, const void *, addr, unsigned long, len, int, prot) -#if defined __NR_fstatat64 && !defined __NR_stat && !defined(__UCLIBC_USE_TIME64__) +#if defined __NR_fstatat64 && !defined __NR_stat && (!defined(__UCLIBC_USE_TIME64__) || defined(__sparc__)) # define __NR__dl_fstatat64 __NR_fstatat64 static __always_inline _syscall4(int, _dl_fstatat64, int, fd, const char *, fn, struct stat *, stat, int, flags) @@ -126,7 +126,7 @@ static __always_inline int _dl_stat(const char *file_name, { return _dl_fstatat64(AT_FDCWD, file_name, buf, 0); } -#elif defined __NR_newfstatat && !defined __NR_stat && !defined(__UCLIBC_USE_TIME64__) +#elif defined __NR_newfstatat && !defined __NR_stat && (!defined(__UCLIBC_USE_TIME64__) || defined(__sparc__)) # define __NR__dl_newfstatat __NR_newfstatat static __always_inline _syscall4(int, _dl_newfstatat, int, fd, const char *, fn, struct stat *, stat, int, flags) @@ -136,7 +136,7 @@ static __always_inline int _dl_stat(const char *file_name, { return _dl_newfstatat(AT_FDCWD, file_name, buf, 0); } -#elif defined __NR_stat && !defined(__UCLIBC_USE_TIME64__) +#elif defined __NR_stat && (!defined(__UCLIBC_USE_TIME64__) || defined(__sparc__)) # define __NR__dl_stat __NR_stat static __always_inline _syscall2(int, _dl_stat, const char *, file_name, struct stat *, buf) @@ -160,7 +160,7 @@ static __always_inline int _dl_stat(const char *file_name, } #endif -#if defined __NR_fstat64 && !defined __NR_fstat && !defined(__UCLIBC_USE_TIME64__) +#if defined __NR_fstat64 && !defined __NR_fstat && (!defined(__UCLIBC_USE_TIME64__) || defined(__sparc__)) # define __NR__dl_fstat __NR_fstat64 static __always_inline _syscall2(int, _dl_fstat, int, fd, struct stat *, buf) #elif defined __NR_fstat diff --git a/libc/sysdeps/linux/sparc/bits/kernel_stat.h b/libc/sysdeps/linux/sparc/bits/kernel_stat.h index e960857fe..5e214c72f 100644 --- a/libc/sysdeps/linux/sparc/bits/kernel_stat.h +++ b/libc/sysdeps/linux/sparc/bits/kernel_stat.h @@ -5,6 +5,10 @@ * struct kernel_stat should look like... It turns out each arch has a * different opinion on the subject... */ +#if defined(__UCLIBC_USE_TIME64__) +#include "internal/time64_helpers.h" +#endif + struct kernel_stat { unsigned short st_dev; unsigned long st_ino; @@ -14,9 +18,15 @@ struct kernel_stat { unsigned short st_gid; unsigned short st_rdev; long st_size; +#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 long st_blksize; long st_blocks; unsigned long __unused4[2]; @@ -35,9 +45,15 @@ struct kernel_stat64 { unsigned int st_blksize; unsigned char __pad4[8]; unsigned int st_blocks; +#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; }; diff --git a/libc/sysdeps/linux/sparc/bits/sem.h b/libc/sysdeps/linux/sparc/bits/sem.h index 04c579fc6..23fd7c2eb 100644 --- a/libc/sysdeps/linux/sparc/bits/sem.h +++ b/libc/sysdeps/linux/sparc/bits/sem.h @@ -38,10 +38,24 @@ struct semid_ds { struct ipc_perm sem_perm; /* operation permission struct */ unsigned int __pad1; - __time_t sem_otime; /* last semop() time */ +#if defined(__UCLIBC_USE_TIME64__) + unsigned long int __sem_otime_internal_1; /* last semop() time */ + unsigned long int __sem_otime_internal_2; +#else + __time_t sem_otime; /* last semop() time */ +#endif unsigned int __pad2; - __time_t sem_ctime; /* last time changed by semctl() */ +#if defined(__UCLIBC_USE_TIME64__) + unsigned long int __sem_ctime_internal_1; /* last time changed by semctl() */ + unsigned long int __sem_ctime_internal_2; +#else + __time_t sem_ctime; /* last time changed by semctl() */ +#endif unsigned long int sem_nsems; /* number of semaphores in set */ +#if defined(__UCLIBC_USE_TIME64__) + __time_t sem_otime; + __time_t sem_ctime; +#endif unsigned long int __uclibc_unused1; unsigned long int __uclibc_unused2; }; diff --git a/libc/sysdeps/linux/sparc/bits/typesizes.h b/libc/sysdeps/linux/sparc/bits/typesizes.h index 37b7656aa..c7b7f5576 100644 --- a/libc/sysdeps/linux/sparc/bits/typesizes.h +++ b/libc/sysdeps/linux/sparc/bits/typesizes.h @@ -46,9 +46,21 @@ #define __FSFILCNT64_T_TYPE __UQUAD_TYPE #define __ID_T_TYPE __U32_TYPE #define __CLOCK_T_TYPE __SLONGWORD_TYPE + +#ifdef __UCLIBC_USE_TIME64__ +#define __TIME_T_TYPE __S64_TYPE +#else #define __TIME_T_TYPE __SLONGWORD_TYPE +#endif + #define __USECONDS_T_TYPE __U32_TYPE + +#ifdef __UCLIBC_USE_TIME64__ +#define __SUSECONDS_T_TYPE __S64_TYPE +#else #define __SUSECONDS_T_TYPE __S32_TYPE +#endif + #define __DADDR_T_TYPE __S32_TYPE #define __SWBLK_T_TYPE __SLONGWORD_TYPE #define __KEY_T_TYPE __S32_TYPE diff --git a/libc/sysdeps/linux/sparc/bits/uClibc_arch_features.h b/libc/sysdeps/linux/sparc/bits/uClibc_arch_features.h index 76f5084ff..283a250bb 100644 --- a/libc/sysdeps/linux/sparc/bits/uClibc_arch_features.h +++ b/libc/sysdeps/linux/sparc/bits/uClibc_arch_features.h @@ -11,9 +11,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 align 64bit values in register pairs ? (32bit arches only) */ #undef __UCLIBC_SYSCALL_ALIGN_64BIT__ -- 2.44.0

2 1

[PATCH] libc: restore correct definition of semid_ds struct.
by Dmitry Chestnykh 03 Mar '24

03 Mar '24

Previously the common definition of this structure was broken by a mistake. Restore it correctly for all needed architectures and all use cases. Signed-off-by: Dmitry Chestnykh <dm.chestnykh(a)gmail.com> --- libc/sysdeps/linux/common/bits/sem.h | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/libc/sysdeps/linux/common/bits/sem.h b/libc/sysdeps/linux/common/bits/sem.h index 06a256259..1c0836c6d 100644 --- a/libc/sysdeps/linux/common/bits/sem.h +++ b/libc/sysdeps/linux/common/bits/sem.h @@ -39,22 +39,33 @@ struct semid_ds { struct ipc_perm sem_perm; /* operation permission struct */ - +#if defined(__UCLIBC_USE_TIME64__) unsigned long int __sem_otime_internal_1; unsigned long int __sem_otime_internal_2; +#else + __time_t sem_otime; /* last semop() time */ +#endif +#if (__WORDSIZE == 32 && !defined(__arm__) && !defined(__or1k__) && !defined(__xtensa__)) || \ + ((defined(__arm__) || defined(__or1k__) || defined(__xtensa__)) && !defined(__UCLIBC_USE_TIME64__)) + unsigned long int __uclibc_unused1; +#endif +#if defined(__UCLIBC_USE_TIME64__) unsigned long int __sem_ctime_internal_1; unsigned long int __sem_ctime_internal_2; -#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ - unsigned short int sem_nsems; /* number of semaphores in set */ - char __paddind[sizeof(long int) - sizeof(short int)]; #else - char __padding[sizeof(long int) - sizeof(short int)]; - unsigned short int sem_nsems; /* number of semaphores in set */ + __time_t sem_ctime; /* last time changed by semctl() */ #endif - unsigned long int __uclibc_unused3; - unsigned long int __uclibc_unused4; +#if (__WORDSIZE == 32 && !defined(__arm__) && !defined(__or1k__) && !defined(__xtensa__)) || \ + ((defined(__arm__) || defined(__or1k__) || defined(__xtensa__)) && !defined(__UCLIBC_USE_TIME64__)) + unsigned long int __uclibc_unused2; +#endif + unsigned long int sem_nsems; /* number of semaphores in set */ +#if defined(__UCLIBC_USE_TIME64__) __time_t sem_otime; /* last semop() time */ __time_t sem_ctime; /* last time changed by semctl() */ +#endif + unsigned long int __uclibc_unused3; + unsigned long int __uclibc_unused4; }; /* The user should define a union like the following to use it for arguments -- 2.44.0

2 1

[PATCH] Add time64 support to ARC.
by Dmitry Chestnykh 03 Mar '24

03 Mar '24

Signed-off-by: Dmitry Chestnykh <dm.chestnykh(a)gmail.com> --- extra/Configs/Config.in | 3 ++- libc/sysdeps/linux/arc/bits/uClibc_arch_features.h | 3 --- libc/sysdeps/linux/common/bits/sem.h | 8 ++++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in index bae7b4885..5f297b492 100644 --- a/extra/Configs/Config.in +++ b/extra/Configs/Config.in @@ -1026,7 +1026,8 @@ config UCLIBC_FALLBACK_TO_ETC_LOCALTIME config UCLIBC_USE_TIME64 bool "Use *time64 syscalls instead of 32bit ones (if possible)" - depends on TARGET_arm || \ + depends on TARGET_arc || \ + TARGET_arm || \ (TARGET_mips && !CONFIG_MIPS_N64_ABI) || \ TARGET_or1k || \ TARGET_powerpc || \ diff --git a/libc/sysdeps/linux/arc/bits/uClibc_arch_features.h b/libc/sysdeps/linux/arc/bits/uClibc_arch_features.h index 119bbb7e1..94e089d5d 100755 --- a/libc/sysdeps/linux/arc/bits/uClibc_arch_features.h +++ b/libc/sysdeps/linux/arc/bits/uClibc_arch_features.h @@ -17,9 +17,6 @@ /* can your target use syscall6() for mmap ? */ #undef __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__ diff --git a/libc/sysdeps/linux/common/bits/sem.h b/libc/sysdeps/linux/common/bits/sem.h index 1c0836c6d..24a130981 100644 --- a/libc/sysdeps/linux/common/bits/sem.h +++ b/libc/sysdeps/linux/common/bits/sem.h @@ -45,8 +45,8 @@ struct semid_ds #else __time_t sem_otime; /* last semop() time */ #endif -#if (__WORDSIZE == 32 && !defined(__arm__) && !defined(__or1k__) && !defined(__xtensa__)) || \ - ((defined(__arm__) || defined(__or1k__) || defined(__xtensa__)) && !defined(__UCLIBC_USE_TIME64__)) +#if (__WORDSIZE == 32 && !defined(__ARC64_ARCH32__) && !defined(__arc__) && !defined(__arm__) && !defined(__or1k__) && !defined(__xtensa__)) || \ + ((defined(__ARC64_ARCH32__) || defined(__arc__) || defined(__arm__) || defined(__or1k__) || defined(__xtensa__)) && !defined(__UCLIBC_USE_TIME64__)) unsigned long int __uclibc_unused1; #endif #if defined(__UCLIBC_USE_TIME64__) @@ -55,8 +55,8 @@ struct semid_ds #else __time_t sem_ctime; /* last time changed by semctl() */ #endif -#if (__WORDSIZE == 32 && !defined(__arm__) && !defined(__or1k__) && !defined(__xtensa__)) || \ - ((defined(__arm__) || defined(__or1k__) || defined(__xtensa__)) && !defined(__UCLIBC_USE_TIME64__)) +#if (__WORDSIZE == 32 && !defined(__ARC64_ARCH32__) && !defined(__arc__) && !defined(__arm__) && !defined(__or1k__) && !defined(__xtensa__)) || \ + ((defined(__ARC64_ARCH32__) || defined(__arc__) || defined(__arm__) || defined(__or1k__) || defined(__xtensa__)) && !defined(__UCLIBC_USE_TIME64__)) unsigned long int __uclibc_unused2; #endif unsigned long int sem_nsems; /* number of semaphores in set */ -- 2.44.0

2 1

[PATCH] libc: Remove 32bit timespec structures everywhere.
by Dmitry Chestnykh 03 Mar '24

03 Mar '24

With time64 enabled we use statx() system call and the appropriate routines for results conversion. There is no need in `__ts32_struct` anymore. Signed-off-by: Dmitry Chestnykh <dm.chestnykh(a)gmail.com> --- include/internal/time64_helpers.h | 5 ---- libc/sysdeps/linux/arm/bits/kernel_stat.h | 16 ----------- libc/sysdeps/linux/common/xstatconv.c | 27 ------------------- libc/sysdeps/linux/or1k/bits/kernel_stat.h | 10 ------- libc/sysdeps/linux/powerpc/bits/kernel_stat.h | 16 ----------- libc/sysdeps/linux/sparc/bits/kernel_stat.h | 16 ----------- libc/sysdeps/linux/xtensa/bits/kernel_stat.h | 16 ----------- 7 files changed, 106 deletions(-) diff --git a/include/internal/time64_helpers.h b/include/internal/time64_helpers.h index 0f912f4bf..2284aacd9 100644 --- a/include/internal/time64_helpers.h +++ b/include/internal/time64_helpers.h @@ -5,11 +5,6 @@ #include <time.h> #include <stddef.h> -struct __ts32_struct { - __S32_TYPE tv_sec; - __S32_TYPE tv_nsec; -}; - struct __ts64_struct { __S64_TYPE tv_sec; __S64_TYPE tv_nsec; diff --git a/libc/sysdeps/linux/arm/bits/kernel_stat.h b/libc/sysdeps/linux/arm/bits/kernel_stat.h index 45c8e9681..cdbeeb4de 100644 --- a/libc/sysdeps/linux/arm/bits/kernel_stat.h +++ b/libc/sysdeps/linux/arm/bits/kernel_stat.h @@ -5,10 +5,6 @@ * struct kernel_stat should look like... It turns out each arch has a * different opinion on the subject... */ -#if defined(__UCLIBC_USE_TIME64__) -#include "internal/time64_helpers.h" -#endif - struct kernel_stat { #if defined(__ARMEB__) unsigned short st_dev; @@ -30,15 +26,9 @@ struct kernel_stat { unsigned long st_size; unsigned long st_blksize; unsigned long st_blocks; -#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 long __uclibc_unused4; unsigned long __uclibc_unused5; }; @@ -60,15 +50,9 @@ struct kernel_stat64 { long long st_size; unsigned long st_blksize; unsigned long 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 long long st_ino; #ifndef __ARM_EABI__ } __attribute__((packed)); diff --git a/libc/sysdeps/linux/common/xstatconv.c b/libc/sysdeps/linux/common/xstatconv.c index 391804e66..d50fbf9c3 100644 --- a/libc/sysdeps/linux/common/xstatconv.c +++ b/libc/sysdeps/linux/common/xstatconv.c @@ -37,21 +37,12 @@ void __xstat_conv(struct kernel_stat *kbuf, struct stat *buf) buf->st_size = kbuf->st_size; buf->st_blksize = kbuf->st_blksize; buf->st_blocks = kbuf->st_blocks; -#if defined(__UCLIBC_USE_TIME64__) && !defined(__mips__) - buf->st_atim.tv_sec = kbuf->__st_atim32.tv_sec; - buf->st_atim.tv_nsec = kbuf->__st_atim32.tv_nsec; - buf->st_mtim.tv_sec = kbuf->__st_mtim32.tv_sec; - buf->st_mtim.tv_nsec = kbuf->__st_mtim32.tv_nsec; - buf->st_ctim.tv_sec = kbuf->__st_ctim32.tv_sec; - buf->st_ctim.tv_nsec = kbuf->__st_ctim32.tv_nsec; -#else buf->st_atim.tv_sec = kbuf->st_atim.tv_sec; buf->st_atim.tv_nsec = kbuf->st_atim.tv_nsec; buf->st_mtim.tv_sec = kbuf->st_mtim.tv_sec; buf->st_mtim.tv_nsec = kbuf->st_mtim.tv_nsec; buf->st_ctim.tv_sec = kbuf->st_ctim.tv_sec; buf->st_ctim.tv_nsec = kbuf->st_ctim.tv_nsec; -#endif } void __xstat32_conv(struct kernel_stat64 *kbuf, struct stat *buf) @@ -68,21 +59,12 @@ void __xstat32_conv(struct kernel_stat64 *kbuf, struct stat *buf) buf->st_size = kbuf->st_size; buf->st_blksize = kbuf->st_blksize; buf->st_blocks = kbuf->st_blocks; -#if defined(__UCLIBC_USE_TIME64__) && !defined(__mips__) - buf->st_atim.tv_sec = kbuf->__st_atim32.tv_sec; - buf->st_atim.tv_nsec = kbuf->__st_atim32.tv_nsec; - buf->st_mtim.tv_sec = kbuf->__st_mtim32.tv_sec; - buf->st_mtim.tv_nsec = kbuf->__st_mtim32.tv_nsec; - buf->st_ctim.tv_sec = kbuf->__st_ctim32.tv_sec; - buf->st_ctim.tv_nsec = kbuf->__st_ctim32.tv_nsec; -#else buf->st_atim.tv_sec = kbuf->st_atim.tv_sec; buf->st_atim.tv_nsec = kbuf->st_atim.tv_nsec; buf->st_mtim.tv_sec = kbuf->st_mtim.tv_sec; buf->st_mtim.tv_nsec = kbuf->st_mtim.tv_nsec; buf->st_ctim.tv_sec = kbuf->st_ctim.tv_sec; buf->st_ctim.tv_nsec = kbuf->st_ctim.tv_nsec; -#endif } void __xstat64_conv(struct kernel_stat64 *kbuf, struct stat64 *buf) @@ -102,19 +84,10 @@ void __xstat64_conv(struct kernel_stat64 *kbuf, struct stat64 *buf) buf->st_size = kbuf->st_size; buf->st_blksize = kbuf->st_blksize; buf->st_blocks = kbuf->st_blocks; -#if defined(__UCLIBC_USE_TIME64__) && !defined(__mips__) - buf->st_atim.tv_sec = kbuf->__st_atim32.tv_sec; - buf->st_atim.tv_nsec = kbuf->__st_atim32.tv_nsec; - buf->st_mtim.tv_sec = kbuf->__st_mtim32.tv_sec; - buf->st_mtim.tv_nsec = kbuf->__st_mtim32.tv_nsec; - buf->st_ctim.tv_sec = kbuf->__st_ctim32.tv_sec; - buf->st_ctim.tv_nsec = kbuf->__st_ctim32.tv_nsec; -#else buf->st_atim.tv_sec = kbuf->st_atim.tv_sec; buf->st_atim.tv_nsec = kbuf->st_atim.tv_nsec; buf->st_mtim.tv_sec = kbuf->st_mtim.tv_sec; buf->st_mtim.tv_nsec = kbuf->st_mtim.tv_nsec; buf->st_ctim.tv_sec = kbuf->st_ctim.tv_sec; buf->st_ctim.tv_nsec = kbuf->st_ctim.tv_nsec; -#endif } diff --git a/libc/sysdeps/linux/or1k/bits/kernel_stat.h b/libc/sysdeps/linux/or1k/bits/kernel_stat.h index cec44ecfc..2e5eab901 100644 --- a/libc/sysdeps/linux/or1k/bits/kernel_stat.h +++ b/libc/sysdeps/linux/or1k/bits/kernel_stat.h @@ -1,10 +1,6 @@ #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. */ @@ -18,15 +14,9 @@ struct kernel_stat { 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; }; diff --git a/libc/sysdeps/linux/powerpc/bits/kernel_stat.h b/libc/sysdeps/linux/powerpc/bits/kernel_stat.h index c28ef2a9a..023eefeea 100644 --- a/libc/sysdeps/linux/powerpc/bits/kernel_stat.h +++ b/libc/sysdeps/linux/powerpc/bits/kernel_stat.h @@ -5,10 +5,6 @@ * struct kernel_stat should look like... It turns out each arch has a * different opinion on the subject... */ -#if defined(__UCLIBC_USE_TIME64__) -#include "internal/time64_helpers.h" -#endif - #if __WORDSIZE == 64 #define kernel_stat kernel_stat64 #else @@ -23,15 +19,9 @@ struct kernel_stat { __kernel_off_t st_size; unsigned long st_blksize; unsigned long st_blocks; -#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 long __unused4; unsigned long __unused5; }; @@ -49,15 +39,9 @@ struct kernel_stat64 { long long st_size; /* Size of file, in bytes. */ long st_blksize; /* Optimal block size for I/O. */ long 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 long int __uclibc_unused4; unsigned long int __uclibc_unused5; }; diff --git a/libc/sysdeps/linux/sparc/bits/kernel_stat.h b/libc/sysdeps/linux/sparc/bits/kernel_stat.h index 5e214c72f..e960857fe 100644 --- a/libc/sysdeps/linux/sparc/bits/kernel_stat.h +++ b/libc/sysdeps/linux/sparc/bits/kernel_stat.h @@ -5,10 +5,6 @@ * struct kernel_stat should look like... It turns out each arch has a * different opinion on the subject... */ -#if defined(__UCLIBC_USE_TIME64__) -#include "internal/time64_helpers.h" -#endif - struct kernel_stat { unsigned short st_dev; unsigned long st_ino; @@ -18,15 +14,9 @@ struct kernel_stat { unsigned short st_gid; unsigned short st_rdev; long st_size; -#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 long st_blksize; long st_blocks; unsigned long __unused4[2]; @@ -45,15 +35,9 @@ struct kernel_stat64 { unsigned int st_blksize; unsigned char __pad4[8]; unsigned int st_blocks; -#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; }; diff --git a/libc/sysdeps/linux/xtensa/bits/kernel_stat.h b/libc/sysdeps/linux/xtensa/bits/kernel_stat.h index 07ff39540..d884344d3 100644 --- a/libc/sysdeps/linux/xtensa/bits/kernel_stat.h +++ b/libc/sysdeps/linux/xtensa/bits/kernel_stat.h @@ -5,10 +5,6 @@ * struct kernel_stat should look like... It turns out each arch has a * different opinion on the subject... */ -#if defined(__UCLIBC_USE_TIME64__) -#include "internal/time64_helpers.h" -#endif - struct kernel_stat { unsigned long st_dev; unsigned long st_ino; @@ -20,15 +16,9 @@ struct kernel_stat { long st_size; unsigned long st_blksize; unsigned long st_blocks; -#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 long __unused4; unsigned long __unused5; }; @@ -45,15 +35,9 @@ struct kernel_stat64 { unsigned long st_blksize; /* Optimal block size for I/O. */ unsigned long __uclibc_unused2; unsigned long 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; /* Time of last access. */ struct timespec st_mtim; /* Time of last modification. */ struct timespec st_ctim; /* Time of last status change. */ -#endif unsigned long __uclibc_unused4; unsigned long __uclibc_unused5; }; -- 2.44.0

2 1

Build fix c6x
by Ramin Moussavi 29 Feb '24

29 Feb '24

since this pcommit Bad : d869bb1600942c01a77539128f9ba5b5b55ad647 Author : ramin <lordrasmus(a)gmail.com> Date : Wed Dec 7 11:59:57 2022 +0100 Message : add getauxval() implementation c6x build fails because DT_DSBT_BASE_IDX is not defined seems that #include <dl-sysdep.h> is missing if the compiler defines __DSBT__

2 1

[PATCH] Add test to *stat() after 2038y with time64.
by Dmitry Chestnykh 27 Feb '24

27 Feb '24

Signed-off-by: Dmitry Chestnykh <dm.chestnykh(a)gmail.com> --- test/stat/stat-time64.c | 74 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 test/stat/stat-time64.c diff --git a/test/stat/stat-time64.c b/test/stat/stat-time64.c new file mode 100644 index 0000000..0102317 --- /dev/null +++ b/test/stat/stat-time64.c @@ -0,0 +1,74 @@ +/* Test for stat() after 2038 year. */ + +#include <limits.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> +#include <sys/stat.h> +#include <time.h> + +#define assert(x) \ + if (!(x)) \ + { \ + fputs ("test failed: " #x "\n", stderr); \ + retval = 1; \ + goto the_end; \ + } + +int +main (int argc, char *argv[]) +{ +#if defined(__arm__) || defined(__mips__) || defined(__or1k__) || defined(__powerpc__) || defined(__sparc__) || defined(__xtensa__) + char name[PATH_MAX]; + int retval = 0; + int fd; + struct stat st; + + if (sizeof(time_t) == 8) { + + memset(name, 0, PATH_MAX); + + struct timespec y2090_ts = { + .tv_sec = 3786962400, + .tv_nsec = 0 + }; + + assert(clock_settime (CLOCK_REALTIME, &y2090_ts) == 0); + + /* hack to get a tempfile name w/out using tmpname() + * as that func causes a link time warning */ + sprintf(name, "%s-uClibc-test.XXXXXX", __FILE__); + fd = mkstemp(name); + + assert(stat (name, &st) == 0) + assert(st.st_atime >= 3786962400); + assert(st.st_mtime >= 3786962400); + assert(st.st_ctime >= 3786962400); + + assert(fstat (fd, &st) == 0) + assert(st.st_atime >= 3786962400); + assert(st.st_mtime >= 3786962400); + assert(st.st_ctime >= 3786962400); + + assert(lstat (name, &st) == 0) + assert(st.st_atime >= 3786962400); + assert(st.st_mtime >= 3786962400); + assert(st.st_ctime >= 3786962400); + + close(fd); + retval = 0; + +the_end: + unlink (name); + + return retval; + } + else { + printf("Nothing to test.\n"); + } +#else + printf("Nothing to test.\n"); + return 0; +#endif +} -- 2.44.0

2 1

[PATCH] Fix *stat() and *stat64() when the time is beyond year 2038.
by Dmitry Chestnykh 27 Feb '24

27 Feb '24

To obtain correct `st_atim`, `st_mtim` and `st_ctim` fields we need to use statx() syscall and then convert the data from the kernel to the regular stat structure. Signed-off-by: Dmitry Chestnykh <dm.chestnykh(a)gmail.com> --- Rules.mak | 4 ++++ libc/sysdeps/linux/arm/bits/uClibc_arch_features.h | 3 --- libc/sysdeps/linux/common/fstat.c | 5 +++-- libc/sysdeps/linux/common/fstat64.c | 2 +- libc/sysdeps/linux/common/fstatat.c | 11 ++--------- libc/sysdeps/linux/common/fstatat64.c | 8 +++----- libc/sysdeps/linux/common/lstat.c | 3 ++- libc/sysdeps/linux/common/stat.c | 3 ++- libc/sysdeps/linux/common/stat64.c | 2 +- libc/sysdeps/linux/common/statx_cp.c | 2 +- libc/sysdeps/linux/mips/bits/uClibc_arch_features.h | 3 --- .../sysdeps/linux/powerpc/bits/uClibc_arch_features.h | 3 --- libc/sysdeps/linux/xtensa/bits/uClibc_arch_features.h | 3 --- 13 files changed, 19 insertions(+), 33 deletions(-) diff --git a/Rules.mak b/Rules.mak index a51e98b92..55c2f81fe 100644 --- a/Rules.mak +++ b/Rules.mak @@ -670,6 +670,10 @@ ifeq ($(UCLIBC_HAS_STDIO_FUTEXES),y) CFLAGS += -D__USE_STDIO_FUTEXES__ endif +ifeq ($(UCLIBC_USE_TIME64),y) +CFLAGS += -D__UCLIBC_HAVE_STATX__ +endif + ifeq ($(UCLIBC_HAS_THREADS),y) ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y) PTNAME := nptl diff --git a/libc/sysdeps/linux/arm/bits/uClibc_arch_features.h b/libc/sysdeps/linux/arm/bits/uClibc_arch_features.h index b0b093c99..671afd3ac 100644 --- a/libc/sysdeps/linux/arm/bits/uClibc_arch_features.h +++ b/libc/sysdeps/linux/arm/bits/uClibc_arch_features.h @@ -11,9 +11,6 @@ /* can your target use syscall6() for mmap ? */ #undef __UCLIBC_MMAP_HAS_6_ARGS__ -/* does your target use statx */ -#undef __UCLIBC_HAVE_STATX__ - /* does your target align 64bit values in register pairs ? (32bit arches only) */ #ifdef __ARM_EABI__ #define __UCLIBC_SYSCALL_ALIGN_64BIT__ diff --git a/libc/sysdeps/linux/common/fstat.c b/libc/sysdeps/linux/common/fstat.c index 86c24bff6..65e879799 100644 --- a/libc/sysdeps/linux/common/fstat.c +++ b/libc/sysdeps/linux/common/fstat.c @@ -10,10 +10,11 @@ #include <unistd.h> #include <sys/stat.h> #include <sys/syscall.h> +#include <bits/uClibc_arch_features.h> #include "xstatconv.h" -#if defined __NR_fstat64 && !defined __NR_fstat +#if defined __NR_fstat64 && !defined __NR_fstat && !defined(__UCLIBC_USE_TIME64__) int fstat(int fd, struct stat *buf) { return INLINE_SYSCALL(fstat64, 2, fd, buf); @@ -29,7 +30,7 @@ int fstat(int fd, struct stat *buf) } libc_hidden_def(fstat) -#elif __NR_statx && defined __UCLIBC_HAVE_STATX__ +#elif defined __NR_statx && defined __UCLIBC_HAVE_STATX__ # include <fcntl.h> # include <statx_cp.h> diff --git a/libc/sysdeps/linux/common/fstat64.c b/libc/sysdeps/linux/common/fstat64.c index fe1cb4fe5..20a9acf01 100644 --- a/libc/sysdeps/linux/common/fstat64.c +++ b/libc/sysdeps/linux/common/fstat64.c @@ -45,7 +45,7 @@ int fstat64(int fd, struct stat64 *buf) int rc = INLINE_SYSCALL (statx, 5, fd, "", AT_EMPTY_PATH, STATX_BASIC_STATS, &tmp); if (rc == 0) - __cp_stat_statx ((struct stat64 *)buf, &tmp); + __cp_stat64_statx ((struct stat64 *)buf, &tmp); return rc; } diff --git a/libc/sysdeps/linux/common/fstatat.c b/libc/sysdeps/linux/common/fstatat.c index d4f566a62..14b118cc0 100644 --- a/libc/sysdeps/linux/common/fstatat.c +++ b/libc/sysdeps/linux/common/fstatat.c @@ -9,13 +9,14 @@ #include <sys/syscall.h> #include <sys/stat.h> #include "xstatconv.h" +#include <bits/uClibc_arch_features.h> /* 64bit ports tend to favor newfstatat() */ #if __WORDSIZE == 64 && defined __NR_newfstatat # define __NR_fstatat64 __NR_newfstatat #endif -#ifdef __NR_fstatat64 +#if defined(__NR_fstatat64) && !defined(__UCLIBC_USE_TIME64__) int fstatat(int fd, const char *file, struct stat *buf, int flag) { int ret; @@ -62,14 +63,6 @@ int fstatat(int fd, const char *file, struct stat *buf, int flag) .st_mtim.tv_nsec = tmp.stx_mtime.tv_nsec, .st_ctim.tv_sec = tmp.stx_ctime.tv_sec, .st_ctim.tv_nsec = tmp.stx_ctime.tv_nsec, -#if defined(__UCLIBC_USE_TIME64__) && !defined(__mips__) - .__st_atim32.tv_sec = stx.stx_atime.tv_sec, - .__st_atim32.tv_nsec = stx.stx_atime.tv_nsec, - .__st_mtim32.tv_sec = stx.stx_mtime.tv_sec, - .__st_mtim32.tv_nsec = stx.stx_mtime.tv_nsec, - .__st_ctim32.tv_sec = stx.stx_ctime.tv_sec, - .__st_ctim32.tv_nsec = stx.stx_ctime.tv_nsec, -#endif }; return ret; diff --git a/libc/sysdeps/linux/common/fstatat64.c b/libc/sysdeps/linux/common/fstatat64.c index 836ed4114..fdd17a0b7 100644 --- a/libc/sysdeps/linux/common/fstatat64.c +++ b/libc/sysdeps/linux/common/fstatat64.c @@ -56,12 +56,10 @@ int fstatat64(int fd, const char *file, struct stat64 *buf, int flag) int r = INLINE_SYSCALL(statx, 5, fd, file, AT_NO_AUTOMOUNT | flag, STATX_BASIC_STATS, &tmp); - if (r != 0) - return r; + if (r == 0) + __cp_stat64_statx ((struct stat *)buf, &tmp); - __cp_stat_statx ((struct stat *)buf, &tmp); - - return 0; + return r; } libc_hidden_def(fstatat64) #endif diff --git a/libc/sysdeps/linux/common/lstat.c b/libc/sysdeps/linux/common/lstat.c index 8a0baf85f..2ebd8615e 100644 --- a/libc/sysdeps/linux/common/lstat.c +++ b/libc/sysdeps/linux/common/lstat.c @@ -9,8 +9,9 @@ #include <sys/syscall.h> #include <unistd.h> #include <sys/stat.h> +#include <bits/uClibc_arch_features.h> -#if defined __NR_fstatat64 && !defined __NR_lstat +#if defined __NR_fstatat64 && !defined __NR_lstat && !defined(__UCLIBC_USE_TIME64__) # include <fcntl.h> int lstat(const char *file_name, struct stat *buf) diff --git a/libc/sysdeps/linux/common/stat.c b/libc/sysdeps/linux/common/stat.c index 99ce8d2dd..42f39aea6 100644 --- a/libc/sysdeps/linux/common/stat.c +++ b/libc/sysdeps/linux/common/stat.c @@ -9,10 +9,11 @@ #include <sys/syscall.h> #include <unistd.h> #include <sys/stat.h> +#include <bits/uClibc_arch_features.h> #undef stat -#if defined __NR_fstatat64 && !defined __NR_stat +#if defined __NR_fstatat64 && !defined __NR_stat && !defined(__UCLIBC_USE_TIME64__) # include <fcntl.h> int stat(const char *file_name, struct stat *buf) diff --git a/libc/sysdeps/linux/common/stat64.c b/libc/sysdeps/linux/common/stat64.c index 47d938b11..fdd2c49a9 100644 --- a/libc/sysdeps/linux/common/stat64.c +++ b/libc/sysdeps/linux/common/stat64.c @@ -30,7 +30,7 @@ int stat64(const char *file_name, struct stat64 *buf) int rc = INLINE_SYSCALL (statx, 5, AT_FDCWD, file_name, AT_NO_AUTOMOUNT, STATX_BASIC_STATS, &tmp); if (rc == 0) - __cp_stat_statx ((struct stat64 *)buf, &tmp); + __cp_stat64_statx ((struct stat64 *)buf, &tmp); return rc; } diff --git a/libc/sysdeps/linux/common/statx_cp.c b/libc/sysdeps/linux/common/statx_cp.c index 9f024eec8..c50d28ecb 100644 --- a/libc/sysdeps/linux/common/statx_cp.c +++ b/libc/sysdeps/linux/common/statx_cp.c @@ -24,7 +24,7 @@ #include <statx_cp.h> -#if !defined(__NR_fstat64) || !defined(__NR_fstatat64) +#if (!defined(__NR_fstat64) || !defined(__NR_fstatat64)) || defined(__UCLIBC_USE_TIME64__) void __cp_stat64_statx (struct stat64 *to, struct statx *from) { diff --git a/libc/sysdeps/linux/mips/bits/uClibc_arch_features.h b/libc/sysdeps/linux/mips/bits/uClibc_arch_features.h index 59d9f0807..bcdf124a4 100644 --- a/libc/sysdeps/linux/mips/bits/uClibc_arch_features.h +++ b/libc/sysdeps/linux/mips/bits/uClibc_arch_features.h @@ -12,9 +12,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 align 64bit values in register pairs ? (32bit arches only) */ #if _MIPS_SIM == _ABIO32 #define __UCLIBC_SYSCALL_ALIGN_64BIT__ diff --git a/libc/sysdeps/linux/powerpc/bits/uClibc_arch_features.h b/libc/sysdeps/linux/powerpc/bits/uClibc_arch_features.h index bc6ae652e..661069384 100644 --- a/libc/sysdeps/linux/powerpc/bits/uClibc_arch_features.h +++ b/libc/sysdeps/linux/powerpc/bits/uClibc_arch_features.h @@ -11,9 +11,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 align 64bit values in register pairs ? (32bit arches only) */ #define __UCLIBC_SYSCALL_ALIGN_64BIT__ diff --git a/libc/sysdeps/linux/xtensa/bits/uClibc_arch_features.h b/libc/sysdeps/linux/xtensa/bits/uClibc_arch_features.h index de9b38983..a15744c2f 100644 --- a/libc/sysdeps/linux/xtensa/bits/uClibc_arch_features.h +++ b/libc/sysdeps/linux/xtensa/bits/uClibc_arch_features.h @@ -11,9 +11,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 align 64bit values in register pairs ? (32bit arches only) */ #define __UCLIBC_SYSCALL_ALIGN_64BIT__ -- 2.44.0

2 1

[PATCH 1/2] Refactor `ts32_struct` and `TO_ITS64_P`.
by Dmitry Chestnykh 26 Feb '24

26 Feb '24

- Renamed `ts32_struct` to `__ts32_struct` like `__ts64_struct` and moved its definition to the header. - Removed extra space from TO_ITS64_P() macro. Signed-off-by: Dmitry Chestnykh <dm.chestnykh(a)gmail.com> --- include/internal/time64_helpers.h | 7 ++++++- libc/sysdeps/linux/arm/bits/kernel_stat.h | 21 +++++++------------ libc/sysdeps/linux/powerpc/bits/kernel_stat.h | 20 +++++++----------- libc/sysdeps/linux/xtensa/bits/kernel_stat.h | 20 +++++++----------- 4 files changed, 27 insertions(+), 41 deletions(-) diff --git a/include/internal/time64_helpers.h b/include/internal/time64_helpers.h index 7a78e8388..0f912f4bf 100644 --- a/include/internal/time64_helpers.h +++ b/include/internal/time64_helpers.h @@ -5,6 +5,11 @@ #include <time.h> #include <stddef.h> +struct __ts32_struct { + __S32_TYPE tv_sec; + __S32_TYPE tv_nsec; +}; + struct __ts64_struct { __S64_TYPE tv_sec; __S64_TYPE tv_nsec; @@ -21,7 +26,7 @@ struct __its64_struct { __S64_TYPE value_tv_nsec; }; -#define TO_ITS64_P(__its) (((struct itimerspec *)(__its)) ? \ +#define TO_ITS64_P(__its) (((struct itimerspec *)(__its)) ? \ (&(struct __its64_struct) {.interval_tv_sec = ((struct itimerspec *)(__its))->it_interval.tv_sec, \ .interval_tv_nsec = ((struct itimerspec *)(__its))->it_interval.tv_nsec, \ .value_tv_sec = ((struct itimerspec *)(__its))->it_value.tv_sec, \ diff --git a/libc/sysdeps/linux/arm/bits/kernel_stat.h b/libc/sysdeps/linux/arm/bits/kernel_stat.h index 8bddb4085..45c8e9681 100644 --- a/libc/sysdeps/linux/arm/bits/kernel_stat.h +++ b/libc/sysdeps/linux/arm/bits/kernel_stat.h @@ -6,14 +6,7 @@ * different opinion on the subject... */ #if defined(__UCLIBC_USE_TIME64__) - -#include <bits/types.h> - -struct ts32_struct { - __S32_TYPE tv_sec; - __S32_TYPE tv_nsec; -}; - +#include "internal/time64_helpers.h" #endif struct kernel_stat { @@ -38,9 +31,9 @@ struct kernel_stat { unsigned long st_blksize; unsigned long st_blocks; #if defined(__UCLIBC_USE_TIME64__) - struct ts32_struct __st_atim32; - struct ts32_struct __st_mtim32; - struct ts32_struct __st_ctim32; + struct __ts32_struct __st_atim32; + struct __ts32_struct __st_mtim32; + struct __ts32_struct __st_ctim32; #else struct timespec st_atim; struct timespec st_mtim; @@ -68,9 +61,9 @@ struct kernel_stat64 { unsigned long st_blksize; unsigned long 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; + struct __ts32_struct __st_atim32; + struct __ts32_struct __st_mtim32; + struct __ts32_struct __st_ctim32; #else struct timespec st_atim; struct timespec st_mtim; diff --git a/libc/sysdeps/linux/powerpc/bits/kernel_stat.h b/libc/sysdeps/linux/powerpc/bits/kernel_stat.h index 0e76120ab..c28ef2a9a 100644 --- a/libc/sysdeps/linux/powerpc/bits/kernel_stat.h +++ b/libc/sysdeps/linux/powerpc/bits/kernel_stat.h @@ -6,13 +6,7 @@ * different opinion on the subject... */ #if defined(__UCLIBC_USE_TIME64__) -#include <bits/types.h> - -struct ts32_struct { - __S32_TYPE tv_sec; - __S32_TYPE tv_nsec; -}; - +#include "internal/time64_helpers.h" #endif #if __WORDSIZE == 64 @@ -30,9 +24,9 @@ struct kernel_stat { unsigned long st_blksize; unsigned long st_blocks; #if defined(__UCLIBC_USE_TIME64__) - struct ts32_struct __st_atim32; - struct ts32_struct __st_mtim32; - struct ts32_struct __st_ctim32; + struct __ts32_struct __st_atim32; + struct __ts32_struct __st_mtim32; + struct __ts32_struct __st_ctim32; #else struct timespec st_atim; struct timespec st_mtim; @@ -56,9 +50,9 @@ struct kernel_stat64 { long st_blksize; /* Optimal block size for I/O. */ long 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; + struct __ts32_struct __st_atim32; + struct __ts32_struct __st_mtim32; + struct __ts32_struct __st_ctim32; #else struct timespec st_atim; struct timespec st_mtim; diff --git a/libc/sysdeps/linux/xtensa/bits/kernel_stat.h b/libc/sysdeps/linux/xtensa/bits/kernel_stat.h index 80ccdb76a..07ff39540 100644 --- a/libc/sysdeps/linux/xtensa/bits/kernel_stat.h +++ b/libc/sysdeps/linux/xtensa/bits/kernel_stat.h @@ -6,13 +6,7 @@ * different opinion on the subject... */ #if defined(__UCLIBC_USE_TIME64__) -#include <bits/types.h> - -struct ts32_struct { - __S32_TYPE tv_sec; - __S32_TYPE tv_nsec; -}; - +#include "internal/time64_helpers.h" #endif struct kernel_stat { @@ -27,9 +21,9 @@ struct kernel_stat { unsigned long st_blksize; unsigned long st_blocks; #if defined(__UCLIBC_USE_TIME64__) - struct ts32_struct __st_atim32; - struct ts32_struct __st_mtim32; - struct ts32_struct __st_ctim32; + struct __ts32_struct __st_atim32; + struct __ts32_struct __st_mtim32; + struct __ts32_struct __st_ctim32; #else struct timespec st_atim; struct timespec st_mtim; @@ -52,9 +46,9 @@ struct kernel_stat64 { unsigned long __uclibc_unused2; unsigned long 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; + struct __ts32_struct __st_atim32; + struct __ts32_struct __st_mtim32; + struct __ts32_struct __st_ctim32; #else struct timespec st_atim; /* Time of last access. */ struct timespec st_mtim; /* Time of last modification. */ -- 2.44.0

2 2

[PATCH] Remove unneeded comparisons.
by Dmitry Chestnykh 26 Feb '24

26 Feb '24

Inside `if` branches the conditions `as->ino == bs->ino` and `as->dev == bs->dev` are always false. Signed-off-by: Dmitry Chestnykh <dm.chestnykh(a)gmail.com> --- libpthread/nptl/sem_open.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libpthread/nptl/sem_open.c b/libpthread/nptl/sem_open.c index 2746da1b7..8c99d6dbe 100644 --- a/libpthread/nptl/sem_open.c +++ b/libpthread/nptl/sem_open.c @@ -147,11 +147,11 @@ __sem_search (const void *a, const void *b) if (as->ino != bs->ino) /* Cannot return the difference the type is larger than int. */ - return as->ino < bs->ino ? -1 : (as->ino == bs->ino ? 0 : 1); + return as->ino < bs->ino ? -1 : 1; if (as->dev != bs->dev) /* Cannot return the difference the type is larger than int. */ - return as->dev < bs->dev ? -1 : (as->dev == bs->dev ? 0 : 1); + return as->dev < bs->dev ? -1 : 1; return strcmp (as->name, bs->name); } -- 2.43.2

2 1

[PATCH] ldso: Remove unneeded semicolons.
by Dmitry Chestnykh 26 Feb '24

26 Feb '24

We use semicolons in the place of `DL_RELOCATE_RELR()` and `DL_DO_RELOCATE_RELR()` 'calling' so the semicolon in the macro definition leads to semicolon duplication after preprocessing. Signed-off-by: Dmitry Chestnykh <dm.chestnykh(a)gmail.com> --- ldso/include/dl-elf.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ldso/include/dl-elf.h b/ldso/include/dl-elf.h index 7143b572c..832f6b1dd 100644 --- a/ldso/include/dl-elf.h +++ b/ldso/include/dl-elf.h @@ -274,7 +274,7 @@ unsigned int __dl_parse_dynamic_info(ElfW(Dyn) *dpnt, unsigned long dynamic_info relr_reloc_addr += CHAR_BIT * sizeof(ElfW(Relr)) - 1; \ } \ } \ - } while (0); + } while (0) /* The macro to prepare data for the above DL_DO_RELOCATE_RELR */ #define DL_RELOCATE_RELR(dyn) \ @@ -289,7 +289,7 @@ unsigned int __dl_parse_dynamic_info(ElfW(Dyn) *dpnt, unsigned long dynamic_info dyn->libname, (void *)relr_start, (void *)relr_end); \ DL_DO_RELOCATE_RELR(dyn->loadaddr, relr_start, relr_end); \ } \ - } while (0); + } while (0) #endif /* __FDPIC__ */ #endif /* _DL_ELF_H */ -- 2.43.2

2 1

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

devel