From 701ef1f8c2afb9b9d05b40f26c7b5d3fc10557a2 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Fri, 13 Oct 2023 19:32:54 -0700 Subject: [PATCH] glibc patch: remove some static asserts from fstatat These are tripping on 32-bit x86 but are intended to prevent glibc itself from being built with a bad configuration. Zig is only using this file to create libc_nonshared.a, so it's not relevant. --- lib/libc/glibc/sysdeps/unix/sysv/linux/fstatat64.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/lib/libc/glibc/sysdeps/unix/sysv/linux/fstatat64.c b/lib/libc/glibc/sysdeps/unix/sysv/linux/fstatat64.c index ff1e3a44b2..e774f8952a 100644 --- a/lib/libc/glibc/sysdeps/unix/sysv/linux/fstatat64.c +++ b/lib/libc/glibc/sysdeps/unix/sysv/linux/fstatat64.c @@ -29,18 +29,6 @@ #include #include -#if __TIMESIZE == 64 \ - && (__WORDSIZE == 32 \ - && (!defined __SYSCALL_WORDSIZE || __SYSCALL_WORDSIZE == 32)) -/* Sanity check to avoid newer 32-bit ABI to support non-LFS calls. */ -_Static_assert (sizeof (__off_t) == sizeof (__off64_t), - "__blkcnt_t and __blkcnt64_t must match"); -_Static_assert (sizeof (__ino_t) == sizeof (__ino64_t), - "__blkcnt_t and __blkcnt64_t must match"); -_Static_assert (sizeof (__blkcnt_t) == sizeof (__blkcnt64_t), - "__blkcnt_t and __blkcnt64_t must match"); -#endif - #if (__WORDSIZE == 32 \ && (!defined __SYSCALL_WORDSIZE || __SYSCALL_WORDSIZE == 32)) \ || defined STAT_HAS_TIME32 \