From nobody Tue Jan 27 00:39:42 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 4f0RPV2sFNz6Pt6Z for ; Tue, 27 Jan 2026 00:39:42 +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 4f0RPV25F2z3cJp for ; Tue, 27 Jan 2026 00:39:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769474382; 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=U+7xfSWmVghKyS5lE2ee1mGMU0DN/C71SQQPXsDDEdc=; b=qw4Z5IXkELxiukd7cfSuwR36hxQxDCncvzuSLrv8cpkewn051NE8gjVnIasm75hCgpswuf /DJOxNKBI3u6AI9ZV8MVtQAI8yUDlxV4e/Smi1lQQGmTRyAnpB5z9+ZzQjSHGDVW+GJmVZ xs3d4xWXPv4qItnu+SUahoAO53e8d4xHdDOjCkmophl35RU3AnhYjRXy2m0zHlOSJgBjEF GSg7AeY1Dt75eDAigNSz0qX9v0Q7NGpY8ZHC5T/r9AMaLNihzA6FdvLY9YQGTBt8UZpgJJ NWbOuyPrcEKeXF4aegiYvJn0wHh5HkR1w5KEAtlvsLzvTUyC56LkyUhe0Sdrrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769474382; 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=U+7xfSWmVghKyS5lE2ee1mGMU0DN/C71SQQPXsDDEdc=; b=j1ESlDIUdfbBPJZzk4EabwYdTibYlDPCNPL2wOPzhA9CuwFkjyOvO+Gj6V5DeLTGmPSFHU w+u7EY2sFPdU5zkcO2Pdmrt41xo8Nn3UyGeR/4YQyNLwhHX5KHlxHdlj/hIrtasNo0Sh4A m/vqSgRfKv79n9xV2wgwhOaIikOsm2OFGcrSyzT94kiRkFq+L/zXN6DfInKGP7AqrjSgYK n4agKYIQP9m0Wi/Vc5VngOP2DqpcEWuBukVHMpBFFq5tXf/HRqcHEPpFDMj1l22L2cwBzJ k4Qb3rUhPy5dUiPJhWzqJLLJCd6YMSLo8b8Ogc+hldvEScj6gxrBU9t9iFHPHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769474382; a=rsa-sha256; cv=none; b=Epta4gxFO306ChklFoozvsc1zk/VWJZ8tjRoaHwGQWJLmJ0O9kyFkwOBj4hX3y9LSKhrcl Y4hL9/9sZeZy4wyto1YigJ6m9RPL2YZtVJnRvT3zNWfFOodbcSZr7B/ilLfOM2hdlRtkQt Vb6ce254rlk/V0VIictywympcA+mo692lc4hM0l3LuutKu/qZXPCynVHtXDHnlZUT9we+h 9ofB89Luk3A9y78ApAmYAPuzTvw1xPi3nyGOCjkHU7j7Co8cRphKegVLb5pLEgRP3jKv9z 8Qes7aZ4cvr4zrcjNZWQI/LXap2qOTLvmWz7OeZvI7vLqKkmWGXdpLqDLvAVrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f0RPV1QYvzkGY for ; Tue, 27 Jan 2026 00:39:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id d1d5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 27 Jan 2026 00:39:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: a984c2346bb1 - stable/15 - compat32: provide a type and a macro for (u)int64_t handling on non-x86 arches 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: a984c2346bb11e723560635ca11ed9c10565b9f0 Auto-Submitted: auto-generated Date: Tue, 27 Jan 2026 00:39:42 +0000 Message-Id: <6978094e.d1d5.6dd27ebd@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a984c2346bb11e723560635ca11ed9c10565b9f0 commit a984c2346bb11e723560635ca11ed9c10565b9f0 Author: Konstantin Belousov AuthorDate: 2026-01-12 04:45:36 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-27 00:38:22 +0000 compat32: provide a type and a macro for (u)int64_t handling on non-x86 arches (cherry picked from commit 96acaa960023c20e852e04e7cc5c6a5faca36c67) --- sys/compat/freebsd32/freebsd32.h | 11 ++++++++++- sys/sys/abi_compat.h | 8 ++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h index 9d724c93fee7..7324f9adf70c 100644 --- a/sys/compat/freebsd32/freebsd32.h +++ b/sys/compat/freebsd32/freebsd32.h @@ -36,8 +36,17 @@ #include /* - * i386 is the only arch with a 32-bit time_t + * i386 is the only arch with a 32-bit time_t. + * Also it is the only arch with (u)int64_t having 4-bytes alignment. */ +typedef struct { +#ifdef __amd64__ + uint32_t val[2]; +#else + uint64_t val; +#endif +} freebsd32_uint64_t; + #ifdef __amd64__ typedef int32_t time32_t; #else diff --git a/sys/sys/abi_compat.h b/sys/sys/abi_compat.h index c2233f2eac2c..0a7110191430 100644 --- a/sys/sys/abi_compat.h +++ b/sys/sys/abi_compat.h @@ -67,6 +67,14 @@ TS_CP((src), (dst), it_value); \ } while (0) +#define FU64_CP(src, dst, fld) do { \ + _Static_assert(sizeof((src).fld) == sizeof(uint64_t), \ + "FU64_CP src: " #src "." #fld "is not 8 bytes"); \ + _Static_assert(sizeof((dst).fld) == sizeof(uint64_t), \ + "FU64_CP dst: " #dst "." #fld "is not 8 bytes"); \ + memcpy(&(dst).fld, &(src).fld, sizeof(uint64_t)); \ +} while (0) + #define BT_CP(src, dst, fld) do { \ CP((src).fld, (dst).fld, sec); \ *(uint64_t *)&(dst).fld.frac[0] = (src).fld.frac; \