From nobody Tue Nov 18 14:04:33 2025 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 4d9mZT546Mz6HC0V for ; Tue, 18 Nov 2025 14:04:33 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9mZT1t8mz3vZ8 for ; Tue, 18 Nov 2025 14:04:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763474673; 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=INROj0bnNUFACH+UA0b1aXJloAR5I38lUm0Y9AwJ87o=; b=cvcqN9z3UqmB+BC7v/WHr2MelGbIXzeaIFkTDJLqN54xaw65FHZCayTe5cOVXBehCL8fO4 9kEEJxClz0fAqq2Awzqbu0blen8rpDpfKNW4zVHasACcHtC+17w5JkQik9QGKMwmtQGd7+ CtXaUet7W0j7yyn/GRqaNTvCKHcH316gA2pKIsUDBtUasNW287DNICzPOEk7rt5FS2hJQJ 0jrdwcdeqRRDhmgVStWQG38R9UauAal7X/Ozzg6ACP86HLMHYjm27KeK4W/ybaZMKzzGQm gGyb4aj8CCgKXEdewSEJNxFuGzKAuUs8hLlejfqJCV+h5k8WsQTQKqotkBVOSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763474673; 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=INROj0bnNUFACH+UA0b1aXJloAR5I38lUm0Y9AwJ87o=; b=nqiY2V6liFiCYiCbAD8yqpU5Fqx9dFFieT69IvIDMbN+LiQ44VhJ3iwrtxZJfG6BJhOivx aqRa/J0vvRtkOU4DlToH2kLXRXQ5bnF2aiiqSh1/sm8vEFyM/QR7lLoR5hhvO8yR71Gkuh EmvoymZiSm+REcTkq1Ba6Fi0TEnsrb3VVBFgrHveeX4fkBRAD+hZjNrDrXOGwHJ6Mm3wfL 7gZbFtpV2baHGzNjxc1px4pqzDyuqKbAvJbP8fMYSr1pSHvDWnDSRMex2kiuTQjQs7WNl0 +Vn07IcJkuOwVCCOKomiZKgvn/mlapVRTy9z0l9vONnZL+u66XzvAahm/PadYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763474673; a=rsa-sha256; cv=none; b=UtOeLexEzmmej11yB1wOC/Wk26mWkMpC3DadLHM4ErYf/BynyMpaTCuOY1mC1Q2R3TSkYm hakaw0n1XVXwYn2CAcdxfq33bwIqbrK/oLVskSxFEn+MYRriAcDb1KCf/u0DcXccTRfvhg k548SzVH/eJmwqrSvPPvmdrMbqDUiVbrwflGmvSnVYL5CUPoCFglU7J+17ASunkJpWf6cu p8mEzhh1VIPahtnY3mqISyWpy4ka2w/fXmt+w9WyKJc/HLv5DptUSBLZ+YKpe9llvt7RNq WXewxsgXCkxfIWlPVP0Iz8tw5sTsZfbcO18ki6l4JvOknlI0b9xvQsv2EgNOZQ== 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 4d9mZT1NBZzxn4 for ; Tue, 18 Nov 2025 14:04:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3227a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 14:04:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: 484fa40ca71b - stable/15 - zfs: fix aarch64 build after zfs-2.4.0-rc4 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: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 484fa40ca71bc9c00ee6d3729e5e27cc5d68e131 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 14:04:33 +0000 Message-Id: <691c7cf1.3227a.389b4e4e@gitrepo.freebsd.org> The branch stable/15 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=484fa40ca71bc9c00ee6d3729e5e27cc5d68e131 commit 484fa40ca71bc9c00ee6d3729e5e27cc5d68e131 Author: Martin Matuska AuthorDate: 2025-11-17 19:15:33 +0000 Commit: Martin Matuska CommitDate: 2025-11-18 14:03:54 +0000 zfs: fix aarch64 build after zfs-2.4.0-rc4 (cherry picked from commit fb709935d64d5fd4ad21cf8c69faf580760999e4) --- sys/modules/zfs/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile index ec531ed646a7..7a4d0bb51376 100644 --- a/sys/modules/zfs/Makefile +++ b/sys/modules/zfs/Makefile @@ -475,8 +475,6 @@ CFLAGS.zstd_ldm.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICA CFLAGS.zstd_opt.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} .if ${MACHINE_ARCH} == "aarch64" -__ZFS_ZSTD_AARCH64_FLAGS= -include ${SRCDIR}/zstd/include/aarch64_compat.h -CFLAGS.zstd.c+= ${__ZFS_ZSTD_AARCH64_FLAGS} CFLAGS.entropy_common.c+= ${__ZFS_ZSTD_AARCH64_FLAGS} CFLAGS.error_private.c+= ${__ZFS_ZSTD_AARCH64_FLAGS} CFLAGS.fse_compress.c+= ${__ZFS_ZSTD_AARCH64_FLAGS}