From nobody Sat Feb 21 21:34:51 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 4fJL4D1Y8Wz6SJsK for ; Sat, 21 Feb 2026 21:34:52 +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 4fJL4C3cvqz3PQF for ; Sat, 21 Feb 2026 21:34:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771709691; 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=6N5n++qXE9msYXhTOOTirJKor/EiLQSz1fBNEXRX+Hs=; b=F7ZYRTuuo9z8LcL9IZj/e6aA+qJ3gsyKmIkzL8q9feGlKj9nlkZp/WgSjTf3yv2tBtK/Ie MDOthYxR/7q3ljpalNXxp9S/5coo5udkQ0KRFCBjAZhVfObs69mzNYd1sbP5zozlnftojN RTrTIpfdv6YTbtV8xT3mo4L8i278AwQll5XxdXHDqYkn74Ct5yswbNYv6wPveMWTKsu2hd wrS8xMSXCPs+9i0tVuQ8Jy+feSJi6UrNiyND5uaTsXkEkkLQiK6oGkDT6y+9t/KGdKOVuH gTOtPAOWpi7YttHRmIXDZg7fTjjKtMuYZL8GpAgrWq0IUDMiNaomZXsTtqNt9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771709691; a=rsa-sha256; cv=none; b=DLU8oe6X4//UhGBDiwDKmeYbH5lKr/Kr8HwTsuaX63ZlyfdzDdCVMl8tjZ/4hc/Wn6jeR2 ep7LAhHZ0GhNQ1LvZrYrarBYH6nDAbjsbRhR9Cfac3QTfub2YDyIbeHvWypzeh77ETdC0n 87e5fd+XLehWuqb1Cp6CnJGxwFQR9rkNK7YR516XhJ3ybPgQL6S8hLc/x9eFKcYARAq4cc 1ilEL+H8F+/xI3502JmNKPqvztw48uxZn+HPct0kDMHy1ZuX5+VTZqDXWqiSbdEokt0VBW 29M4RuFsjGQZyKRgGad7JA3xmS2nO7Kp1A+4e7enZ5x7PMaHnAKC1JjaV1zePQ== 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=1771709691; 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=6N5n++qXE9msYXhTOOTirJKor/EiLQSz1fBNEXRX+Hs=; b=L8vvAuWwdBjR5rss3Ubn9FfmsmrAndQxQ3DnDhmBMHhZLNVWzryxfPVfF/sbROasMf3c1o lCjEU1gdpeuAbYLM5S2Ez63rDA4Prkus81tU8XgjfiNyLmrfTeeNJLsM9X0bw58BhcoWwK vQTBu7o43Emx9XOSqIbyfYWL3K2Y7XsNYDMKsQl1rJ79xDg1fqZfAG96heyI8oPpNfEjnv mgaxZvKWVcVCF6cKnIOVbPyMX6UAndpm7vX5xGjNtsa/TIUivLdNySbwdx9A98K13nUSbY DOxy6JIMTCQHOanSFanMaYACcqs74/As+wTo1RkrPU+ydJKcvIr9AxrJR1SFlA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJL4C3B04zrM for ; Sat, 21 Feb 2026 21:34:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22943 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 21:34:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 5ae9aac0c7d8 - stable/15 - openzfs sys/types32.h: use abi_compat.h for time32_t 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 5ae9aac0c7d819556a1cf2ec7bf61b78740d4917 Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 21:34:51 +0000 Message-Id: <699a24fb.22943.558e4bd@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5ae9aac0c7d819556a1cf2ec7bf61b78740d4917 commit 5ae9aac0c7d819556a1cf2ec7bf61b78740d4917 Author: Konstantin Belousov AuthorDate: 2026-02-06 23:47:13 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-21 21:34:08 +0000 openzfs sys/types32.h: use abi_compat.h for time32_t (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 5b7131923460..cb2ef27cf933 100644 --- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/types32.h +++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/types32.h @@ -30,9 +30,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 1bcae20187ad..850435b29f2a 100644 --- a/sys/contrib/openzfs/lib/libspl/include/sys/types32.h +++ b/sys/contrib/openzfs/lib/libspl/include/sys/types32.h @@ -63,7 +63,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)