Date: Thu, 05 Mar 2026 14:44:13 +0000 From: Olivier Certner <olce@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 1e0de6ef6334 - stable/15 - sys/compat/freebsd32: Fix i386 compilation Message-ID: <69a996bd.26db5.7c5e94ef@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=1e0de6ef6334ac266b4b61eaa4c2ce0169d732de commit 1e0de6ef6334ac266b4b61eaa4c2ce0169d732de Author: Olivier Certner <olce@FreeBSD.org> AuthorDate: 2026-02-13 16:37:21 +0000 Commit: Olivier Certner <olce@FreeBSD.org> CommitDate: 2026-03-05 14:43:24 +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 (cherry picked from commit 07c4eb506be45a4b836665e14ad63034ef3d573a) --- 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 d742139f9dd0..13fe77228684 100644 --- a/sys/compat/freebsd32/freebsd32.h +++ b/sys/compat/freebsd32/freebsd32.h @@ -71,7 +71,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?69a996bd.26db5.7c5e94ef>