From nobody Tue Apr 14 09:29:09 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 4fvzVt0yfrz6ZVRl for ; Tue, 14 Apr 2026 09:29:10 +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 4fvzVs5qjCz3HjP for ; Tue, 14 Apr 2026 09:29:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776158949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eaQfWw7PbQZItQzVXKULJso/B/Kkx8snLmgtJfehcR8=; b=b5wp8DxvlKUDwXNI1P8yvmSLIvHmUQG7sAE6ui5gpei8ep7s9KpT/f5sS4sqfIg1+nboNE jZvKoyT5fCMUiUUD5Pda8CeKZ95hRR5jQiabWdW1GxQ2XNcSlWgmbA4r23y1+NuEp/aJiM nw/tu7DhUeKgjEBtjOSeVOb5ppAFHXYEfJLz0/N9qLtycAZLXfm1+coysamffXrRrsvw1O ud/vRKX0XEAFDqh3dO7KoqxpnXq4jRdDNYD7cqv3KU2aP0fvezpImLfIUZHXf9LWSrI4XX dwOjhKx7sVItvUvwPKUgJFkwkJiqK+33fAt4EljOLHK6zwBq+9gslUN4vCSHdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776158949; a=rsa-sha256; cv=none; b=ZlrUCa8Z6+mipui3lbqvdBj63IBds8Rc2x0MbOeIXCRXpJdHzA+t7VImFDG+G9O2CXp/gl 51OdgYl+ctBoUlVYZvZh37MgXUN/Vemfwe7CgcLhrVkKd/S1q3m+xISUurY1ykAt568r9y Mlwlz4avbIJJhMGmfKB4YObu1FNGhCVcfwqW8mL8mZhR5FNUKTA5brQ6w7avT1ZjNo+sdw 76A3fk+K8tg9q1cB1T9vct0Fm9j6f7wgiC9araxmPg9/SVsHf6Y0jI1vVa4kH6DgHBcxjN HPnbTx+WRqjTaj12CiwSLWm6OqHOB7GKhHVwnd3bdn/V5McI3t9opAEbkZW6NQ== 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=1776158949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eaQfWw7PbQZItQzVXKULJso/B/Kkx8snLmgtJfehcR8=; b=BrszGPYvl8j7pxdE8PayQ4edazNOQFACvksS+N7pwTflTfzLAZx4wJ0wpmduMTLJjx5mqK 0AxWlOVgA63PZo+lfOXTSKCcTDnYLMTpkNhBwYJc0gO4cUfgoHBtfz+J83MQLTILZ3lwv6 Gh7/cSOGA0fxBT4xcNUBYmfVJWlnDprcGkqVOLph3KE5viZ1NVAKFpv6lf4/7uVM740tOz sygYfOmEnb1QPba7VJEuvV8BVDyZ+5gKAAaM34M34AYReFysB+3hDZFM/3vwhpE+wA/zJV 3EiHSU/6UMMs/uBZ9aJJV79oWv9zNCZGQptp52fwlLX0njs1aGEoKeYn2dw8RQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fvzVs5NLMzl9l for ; Tue, 14 Apr 2026 09:29:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 217fc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 14 Apr 2026 09:29:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Olivier Certner From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 3bc0114674a5 - stable/14 - sys/abi_types.h: time32_t is 64-bit on non-x86 architectures 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3bc0114674a590bcec90f74b20115085ff914c8d Auto-Submitted: auto-generated Date: Tue, 14 Apr 2026 09:29:09 +0000 Message-Id: <69de08e5.217fc.5a2b852e@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=3bc0114674a590bcec90f74b20115085ff914c8d commit 3bc0114674a590bcec90f74b20115085ff914c8d Author: Olivier Certner AuthorDate: 2026-02-13 17:20:13 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-14 09:15:35 +0000 sys/abi_types.h: time32_t is 64-bit on non-x86 architectures As long as 'sys/compat/freebsd32/freebsd32.h' is used unconditionally on all platforms (in 'kern_umtx.c' at least), the rule of thumb is to ensure that 'struct foo32' on a 32-bit arch is type-compatible with 'struct foo' on the same arch. In practice, this is very simple to achieve: All 'foo32' types should be compatible with 'foo' on 32-bit architectures, which is what we are supposed to do already for compat' structures by design. The recently introduced 'freebsd32_uint64_t' type typically supports that. This change fixes commit 87632ddf67b0 ("openzfs sys/types32.h: use abi_compat.h for time32_t") which was defining 'time32_t' to 'in32_t' for all 32-bit architectures, which is wrong but on i386. By luck, this did not change the size of whole 'struct ffclock_estimate32' (whose size is compile-time asserted) because 'struct bintime32''s one would stay the same, as even if its field 'sec' was incorrectly sized after that commit, the 'frac' one is 64-bit and 64-bit aligned on all non-x86 architectures so its offset in 'struct bintime32' would stay the same. Reviewed by: kib Fixes: 87632ddf67b0 ("openzfs sys/types32.h: use abi_compat.h for time32_t") Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55283 (cherry picked from commit 4ccca2100887943b11187787004bc8efc2a149c6) --- sys/sys/abi_types.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sys/sys/abi_types.h b/sys/sys/abi_types.h index e449c86323f7..44d1bd733bbd 100644 --- a/sys/sys/abi_types.h +++ b/sys/sys/abi_types.h @@ -25,15 +25,11 @@ typedef struct { #endif } freebsd32_uint64_t; -#if __SIZEOF_LONG__ == 8 -#if defined __amd64__ +#if defined(__amd64__) || defined(__i386__) typedef __int32_t time32_t; #else typedef __int64_t time32_t; #endif -#else -typedef __int32_t time32_t; -#endif #define __HAVE_TIME32_T #endif