From nobody Sun Apr 12 05:57:17 2026 X-Original-To: dev-commits-src-all@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 4ftfvK4bN7z6YYy2 for ; Sun, 12 Apr 2026 05:57:17 +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 4ftfvK1TQHz3mnB for ; Sun, 12 Apr 2026 05:57:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775973437; 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=MuSXmYqVwt1pbAAhYsHQKFQpLzlcgGK8Jcu3P1ZaciU=; b=wJZWfJuGAKLeboirzEqQgg74k5rI9naQQC043qmfPhEpN8m0LUOs2g22uYngv9FLN/WjeD x3JFBHhBau4H8X9y4rRp+IvIXSP5W9xUlaW4PSsbdKZrMiE6UkrysyJcrYhjPG/FuLMk0Z wGbEWv7pK7TrZ87GG1pGD3ApIe8ObWyH3Q6Blx1IWj3D9dKZnReNf07/e3NTigckvu+KOZ KKyuk6cw3yxjW7/OA9pPHt8BcsRiR1EtECCi7xcmP6QQgoTcx78L/Be0NT9bknuK2rZEbj 3PNbsCpz8jjsvF22kCUhqC/s7WxqdvLZDLDpKig+gFNWg2q/+bSCDq0DkYxDPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775973437; a=rsa-sha256; cv=none; b=HAsVuktVzD364sY3ayR/YEdHRCU6PqEXZj4krYu67CM6J7MQlVKexqI4pzQ7e5kQ6A5Qvt dTeQe7NZPeE6/z7/OIrqhUgrOqMv9CMn2HDgZ9i9puJNOmYpDOtc2CY0dgaJjU4Mirwm5z kF3Y/jVVbSmLU81Tj58RzZIRXtHE4QSTknZDTauJuCfsioT9E7H5q7tulUPh3cLXO1gaDC frh+W7dfFOQkp8c+s47OhQL4LM+rinEhgjV35HD4JKcut0EkZ5C4o0ywoL4cDcbwJKxvRr /vH9UDok9vXouMjUQYgLtLhFXOkyglpACC9+xmmv5lHyTCV8c5C6nHTGI7sYDw== 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=1775973437; 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=MuSXmYqVwt1pbAAhYsHQKFQpLzlcgGK8Jcu3P1ZaciU=; b=VrbBkcalhZyiim3qRrqhFRy/DBO67vduWAKCXndSjoVinBMlPrdvDksdD8iWdcIdQR8IEB CnGxRvl9gQ6tR1e04GS0M3zVzYuXLFgx1TGrxCeYZBRjHzUuaYX9/ScVipPai/vhgCHQZE iHelqLVXmqbYmS6M66aRr1VM1/owK8BYpr2MD59SuxAoGHETrqMq6a/sAVncHfnC4/H1QR fExYsjLyFjh9iLIHPp++GQBd4pcDGKr3hfSTDgDZNe9vudnjIVx98hHDad0K9brnFtMus4 IJX6QpO2cwi2jMCRk4rfdbD70ipNE6If3p1TRzMMCD9oTNtRPzuA3MxVJVq0yg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftfvK10wXz14X1 for ; Sun, 12 Apr 2026 05:57:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 270dd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 05:57:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Konstantin Belousov From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 7320170ff210 - stable/14 - openzfs sys/types32.h: use abi_compat.h for time32_t List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 7320170ff210cc1da1f36e73130de7e2e62a867b Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 05:57:17 +0000 Message-Id: <69db343d.270dd.4df4722b@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=7320170ff210cc1da1f36e73130de7e2e62a867b commit 7320170ff210cc1da1f36e73130de7e2e62a867b Author: Konstantin Belousov AuthorDate: 2026-02-06 23:47:13 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-04-12 05:56:46 +0000 openzfs sys/types32.h: use abi_compat.h for time32_t The time32_t typedef leaks into openzfs compilation environment through sys/event.h. Simultaneously, openzfs provides its own definition that is only correct for amd64 on FreeBSD. Try to fix it by using sys/abi_compat.h directly. Since toolchain build from the make buildworld uses host abi_compat.h, add a preprocessor symbol __HAVE_TIME32_T to signal consumers that time32_t is typedef'ed. If not defined, fall back to old and wrong time32_t, which is enough for bootstraping toolchain. Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55135 (cherry picked from commit 87632ddf67b01f3d4787d10332afc1eeece52e2d) --- sys/contrib/openzfs/include/os/freebsd/spl/sys/types32.h | 3 ++- sys/contrib/openzfs/lib/libspl/include/sys/types32.h | 5 +++++ sys/sys/abi_compat.h | 7 ++++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/types32.h b/sys/contrib/openzfs/include/os/freebsd/spl/sys/types32.h index 907b667e5d80..1b84f84a2ee7 100644 --- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/types32.h +++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/types32.h @@ -29,9 +29,10 @@ #ifndef _SPL_TYPES32_H #define _SPL_TYPES32_H +#include + typedef uint32_t caddr32_t; typedef int32_t daddr32_t; -typedef int32_t time32_t; typedef uint32_t size32_t; #endif /* _SPL_TYPES32_H */ diff --git a/sys/contrib/openzfs/lib/libspl/include/sys/types32.h b/sys/contrib/openzfs/lib/libspl/include/sys/types32.h index d065ebed03b7..81e7f3d7886a 100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/types32.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/types32.h @@ -62,7 +62,12 @@ typedef uint32_t dev32_t; typedef int32_t pid32_t; typedef uint32_t size32_t; typedef int32_t ssize32_t; +#ifdef __FreeBSD__ +#include +#endif +#ifndef __HAVE_TIME32_T typedef int32_t time32_t; +#endif typedef int32_t clock32_t; typedef struct timespec32 { diff --git a/sys/sys/abi_compat.h b/sys/sys/abi_compat.h index 69fb349edc7a..f190dcda9b68 100644 --- a/sys/sys/abi_compat.h +++ b/sys/sys/abi_compat.h @@ -52,11 +52,16 @@ typedef struct { #endif } freebsd32_uint64_t; -#ifdef __amd64__ +#if __SIZEOF_LONG__ == 8 +#if defined __amd64__ typedef __int32_t time32_t; #else typedef __int64_t time32_t; #endif +#else +typedef __int32_t time32_t; +#endif +#define __HAVE_TIME32_T #define PTRIN(v) (void *)(uintptr_t)(v) #define PTROUT(v) (uintptr_t)(v)