From nobody Thu Mar 5 14:44:13 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fRXNs4dntz6T7k0 for ; Thu, 05 Mar 2026 14:44:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fRXNs3R6Yz3S4h for ; Thu, 05 Mar 2026 14:44:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772721853; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IpTgcUxMyWmzh/uZIlzcGG2wUYzzF8MCSlcA6PZeADY=; b=GQmMd7tAi6wWIdzPIz0syewpokEmAeICN/8aFZ6XCoJDPd3BwekxPO9tw4l++nPXRYg187 D1WOBAFVP0n5MMp9azKGHYKFk8x+oDSAVv/IYVZFfHszgkoluM+6uWosjcnPlCDUWPP6YV HN72harzFHDqzdAtD1O3DqgAi74vXhSGOJfI9/DyJ2wVCV0ovHUZYFyZqm+nbxFLUcXoG6 aslk1qNJ3wxWcUYThfI6MFh0Qun+dtkAPqniKptt01huyWXwyAory0fzAHXKJM5RkSwVTK 8Lzcv5aqVoLJ3uP09pvUmoimE8YP5Qyeva3kAmU3ADB3ztqlJcIQS7xMIs9/Hw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772721853; a=rsa-sha256; cv=none; b=mHcLcxasqECAU6VhCPsjQC6uAwNaFWSo5RFGxrNKFcISl4xtmHDPyuPRZg9Lj6yCYgOR85 x6skYgQBgl4e0zElX6PP1NrWsQFL+3BQ3wwoGkiIovQTQpMRM4JSv7YPNz8rFRiSryKPk5 0yh+0WYA/i+NWIRgYAcXbJHgLy2h5rSJkJxK6Tj6F8mTAt7tvdJ5nYy7PwxCUEDD7DdQpR e8s6ofupQ92+Ejg6jleKgvAXBaoyhK6m0oqicWvMZcsU7Nr8A6Vf2vFthD7Iy7vAJrpzAS +G7KbLqpz2uRJSUgOjb2L+BRDSyIMgsyW54+FDJcZHl9KFxgL0kXHYmYLXbCuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772721853; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IpTgcUxMyWmzh/uZIlzcGG2wUYzzF8MCSlcA6PZeADY=; b=WRy8NSIWrSyKk7kigZI9kFNfDaQV3fbpeG49Dv16Q9AW4QNC9pH8vv9ZGUKb1dW52IJIgJ jimTMFalLvuX2kZRkkCb1POKJ0ukC/Ob64S0hHo4B8XnNyUGPRpUjnWkdczWS0VfJvsfoT ZXR/v4PyVKb4maYxiu0teVmXy86icJFz1J5tQTbt3Vrh6pmFnfHxzlwuhoGTn1/dWot8mw mDwVWhUfLr7ViZfjsYqF/2HOhV5Zus5w4ILUiDe4NoD5LLESDiRvYznltVOmWaglpwjvfR XTJTrO7TOJzfdFUpmzAtNGs4do4D9Bm2LPOGKxDEMjRZ/PHkkZcxPGf2kMkhwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fRXNs2zSvzhkn for ; Thu, 05 Mar 2026 14:44:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26db5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Mar 2026 14:44:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 1e0de6ef6334 - stable/15 - sys/compat/freebsd32: Fix i386 compilation List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 1e0de6ef6334ac266b4b61eaa4c2ce0169d732de Auto-Submitted: auto-generated Date: Thu, 05 Mar 2026 14:44:13 +0000 Message-Id: <69a996bd.26db5.7c5e94ef@gitrepo.freebsd.org> The branch stable/15 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=1e0de6ef6334ac266b4b61eaa4c2ce0169d732de commit 1e0de6ef6334ac266b4b61eaa4c2ce0169d732de Author: Olivier Certner AuthorDate: 2026-02-13 16:37:21 +0000 Commit: Olivier Certner 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");