Date: Fri, 13 Feb 2026 22:22:19 +0000 From: Olivier Certner <olce@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 07c4eb506be4 - main - sys/compat/freebsd32: Fix i386 compilation Message-ID: <698fa41b.23016.79a6cf2d@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=07c4eb506be45a4b836665e14ad63034ef3d573a commit 07c4eb506be45a4b836665e14ad63034ef3d573a Author: Olivier Certner <olce@FreeBSD.org> AuthorDate: 2026-02-13 16:37:21 +0000 Commit: Olivier Certner <olce@FreeBSD.org> CommitDate: 2026-02-13 22:21:51 +0000 sys/compat/freebsd32: Fix i386 compilation The compile assertion now failing is due to the change '__int64_t' => '__int32_t' as the type of 'time32_t' on i386, which is the correct value. The use of 'freebsd32.h' on i386 may seem strange, but it comes from 'kern_umtx.c' including it unconditionally as it needs 'struct umutex32'. Fixes: 87632ddf67b0 ("openzfs sys/types32.h: use abi_compat.h for time32_t") Sponsored by: The FreeBSD Foundation --- sys/compat/freebsd32/freebsd32.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h index e746a6e027ec..5210ce55b228 100644 --- a/sys/compat/freebsd32/freebsd32.h +++ b/sys/compat/freebsd32/freebsd32.h @@ -74,7 +74,7 @@ struct ffclock_estimate32 { __attribute__((packed)) #endif ; -#if defined(__amd64__) +#if defined(__amd64__) || defined(__i386__) _Static_assert(sizeof(struct ffclock_estimate32) == 52, "ffclock_estimate32 size"); #else _Static_assert(sizeof(struct ffclock_estimate32) == 56, "ffclock_estimate32 size");home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?698fa41b.23016.79a6cf2d>