From nobody Mon Feb 16 10:30:16 2026 X-Original-To: dev-commits-src-main@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 4fDzYh32y0z6SfMn for ; Mon, 16 Feb 2026 10:30:16 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fDzYh21m7z3pbK for ; Mon, 16 Feb 2026 10:30:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771237816; 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=WBndjh24x0goEyfgMt59+xMiFi9lg9H7tVhmc4OrXEk=; b=wrUxnOIA4ckWp9Y7gkakzhZGQBgKrh1iqemStEDAyQTBiPGMWzhy+9v3o3BEqfohSJ0xRT uqyB/z/OdkL+5Y14dp3XUG9xrY0ziKLzh3nZZp25k0jyejZPDEne1tAjvryIlQMCAIIXzW bZpJTSgIjDzDhqqZwSemf87shKu9W4Y1LitdbGfWS5agVcP61COCosDxz7Yge5JheKyMgH 41OPng27QzzvB5/J3xe0pSFsvZoqfcAqzbnRiHFMEhxoX4xjVmouQ6F2mmeljbNEtV1c6u cxVwXObuEqsmWcJLftOH8OLwZSrcQNeEhQjdqeNWO5DbJJXYYfq1h8Ppjd9XVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771237816; a=rsa-sha256; cv=none; b=iaITH9fTVgcWovpb9TvAJccdo7NASu8gg/cDmIEPzqf8/Rd+GjqgLdM1Al4ggGXfPfBLZ4 elbzU7ZC+xCNTIloJdXMQPyj8lzFExtQEduHSPvVQlNlXt9IMfkA6u/OvT48OHZI6RWisF 2nkQj+oUxPnsmCLuW7zVYe4N4glFtvKtOOdOV5tb+t2YNgtvAnPwVN6i/wlk1yw/XILzJB Q30cx07AdMdiKGm8naixjUrvGnLpWZDxx2GxSKngbAaMRZkMrCCD3RdljbC/vQWtQZhCrK QYI+rXlkIf6MtyLWz/tovwvXWOfwPSSlKodnEjed5Ea5UG6y3s6QVcrDat19cw== 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=1771237816; 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=WBndjh24x0goEyfgMt59+xMiFi9lg9H7tVhmc4OrXEk=; b=ylKgmectKq6va37BRqHCVWDFYndYRQ+3vR4PysjGkf//eDiogCg+BcMmto8PzFrvjtRpXj NVpy6kPwpNRpmb8TFA8AuE+oRVLRFChmJYACJkjUi0q1PKKSIx/K8wTw19aeeVAfuJluZ+ Iw24PKYkRm+e5di3PdkE4klBy0CXHR4FxccrnJYDk836l+dLk6H6Mz48XJfeiTqL0C86bc ZJ9DvhT043sdh/8d207J1KRTxXHQdEWQ2wEj8QGaxq0u3wGNJ+mqD5/h8UQiedctax2IxT KzfZ6LVd95I5Bg1/DTDXU00QTfuumqGh+Vl5F/DLvXMavFRpcaooQUflGO9w8Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fDzYh1SkCz4Vb for ; Mon, 16 Feb 2026 10:30:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25378 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Feb 2026 10:30:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 4ccca2100887 - main - sys/abi_types.h: time32_t is 64-bit on non-x86 architectures List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 4ccca2100887943b11187787004bc8efc2a149c6 Auto-Submitted: auto-generated Date: Mon, 16 Feb 2026 10:30:16 +0000 Message-Id: <6992f1b8.25378.59b9bc83@gitrepo.freebsd.org> The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=4ccca2100887943b11187787004bc8efc2a149c6 commit 4ccca2100887943b11187787004bc8efc2a149c6 Author: Olivier Certner AuthorDate: 2026-02-13 17:20:13 +0000 Commit: Olivier Certner CommitDate: 2026-02-16 10:29:04 +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 --- 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