From nobody Thu Aug 07 18:26:52 2025 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 4bybGj1Wm2z64ZTV; Thu, 07 Aug 2025 18:26:53 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bybGj0fPLz3npS; Thu, 07 Aug 2025 18:26:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754591213; 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=/g7cZCReM++7JpLU8zms/Xue0KbfnRiK94v3Cw+gn3A=; b=UnkVkAr9pCZmAFhlPI8+iWzBI2f/f+frbnihVKd2LopbVacMM6xibFQfXsxJEMpTZGJMIT whcFgA4gbL5GBKwAKXk6A690xpaXQkGkwScoVVSt/VgDjyoFxYVI7QRR2+op9zjqKwTlFi j13adDf1stiyGDmzS7IoT7mJiuQMFpC0JJnYIe9ndytZTJlodvRojbQ1EJqBy+tATeQnhn 0s9sFZFC7mP/7KV3cm28CnhE0dirfOZuBbICw2JYtC+dlDFHmYpTFQoZKqeGUomzPnFfym CLvPRx4uORombbBrDrWtdIBhCigkuyJQ82KlTMVIMgz1GPYycM8CT1hZ/y7Euw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754591213; 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=/g7cZCReM++7JpLU8zms/Xue0KbfnRiK94v3Cw+gn3A=; b=YCB746LJrSgFXGWd4RtLq8cDrj3v0VjSeZAI/9Ig5CJJukxuuJOA680JOYMhEShEfnYg40 ZcZiaJsbVVlvC5zGrbYI1nLnEhWe6rs4S8Ryw1ehMTULXBlRWvnh/Dd0LX72ggp8Q075pM vPkekJAqg590dS8nUFxCJLSEv3JYKfx4tWuXeVdIBqPTFitv54rRbbWlYaiy6ZjLsUyoPx YP82IwuVgcID7kxA6xkfh1QKpG7CKqc8Piw6GwtQIxjGOUr5TDwE8bfIaqbimUsPDB2D/T 6RdpI0m1uGX1jnC1PfifWYtCPJgU9ZlvyYIwRkTsTX/I5+GykTw2dGIkhWMR4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754591213; a=rsa-sha256; cv=none; b=pamsjx0DmJI5CGO8ztkQEnnk05tf+wqUwKgwRoTeqI3tOR//gA3dGP6JB845xh5GH3M6Fm bpeGrlBiqWYWmCt/jpWxXG9N8r09WLAuCJKbWG0u6fxFSI8OnisZMF8iriFV4w73WZDVu/ szPmaoY6nUx/5IAkBcIkipBJfDhOae5zu0jdZLrmNjF4vXDatLvEIaoFaonE3394tlvl73 gBkwRtVv/+4B25xaTCLg9a+by+LW+NitJFScq538z8puLR9hlv/D6CUnnbr1OMqOA7ndcC JohuZnW+NKNfs6jG1L9oN8o5gP5B5rIoX8yBsQb21KxLZGX8yna5YfES59WksA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bybGj00Psz1GtS; Thu, 07 Aug 2025 18:26:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 577IQqHF081532; Thu, 7 Aug 2025 18:26:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 577IQqKx081528; Thu, 7 Aug 2025 18:26:52 GMT (envelope-from git) Date: Thu, 7 Aug 2025 18:26:52 GMT Message-Id: <202508071826.577IQqKx081528@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 2d76470b7011 - main - zfs: Fix build with GCC on 32-bit 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2d76470b7011d0c2f50ae394972976fbca14bc95 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=2d76470b7011d0c2f50ae394972976fbca14bc95 commit 2d76470b7011d0c2f50ae394972976fbca14bc95 Author: John Baldwin AuthorDate: 2025-08-07 17:44:24 +0000 Commit: John Baldwin CommitDate: 2025-08-07 18:26:46 +0000 zfs: Fix build with GCC on 32-bit architectures The presence of uint64_t in the expression promotes the entire expression to uint64_t which is larger than uintptr_t on 32-bit plaforms. Note that this also fixes the build for lib32 libraries on 64-bit platforms. sys/contrib/openzfs/include/sys/zio.h: In function 'gbh_eck': sys/contrib/openzfs/include/sys/zio.h:85:17: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast] 85 | return ((zio_eck_t *)((uintptr_t)gbh + size - sizeof (zio_eck_t))); | ^ --- sys/contrib/openzfs/include/sys/zio.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/contrib/openzfs/include/sys/zio.h b/sys/contrib/openzfs/include/sys/zio.h index a3368034695b..4f46eab3db89 100644 --- a/sys/contrib/openzfs/include/sys/zio.h +++ b/sys/contrib/openzfs/include/sys/zio.h @@ -82,7 +82,7 @@ gbh_nblkptrs(uint64_t size) { static inline zio_eck_t * gbh_eck(zio_gbh_phys_t *gbh, uint64_t size) { ASSERT(IS_P2ALIGNED(size, sizeof (blkptr_t))); - return ((zio_eck_t *)((uintptr_t)gbh + size - sizeof (zio_eck_t))); + return ((zio_eck_t *)((uintptr_t)gbh + (size_t)size - sizeof (zio_eck_t))); } static inline blkptr_t *