git: c30f4ada165c - releng/15.0 - zfs: fix aarch64 build after zfs-2.4.0-rc4
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 19 Nov 2025 21:44:32 UTC
The branch releng/15.0 has been updated by cperciva:
URL: https://cgit.FreeBSD.org/src/commit/?id=c30f4ada165c85a25f782549b84efc3b3e655ecd
commit c30f4ada165c85a25f782549b84efc3b3e655ecd
Author: Martin Matuska <mm@FreeBSD.org>
AuthorDate: 2025-11-17 19:15:33 +0000
Commit: Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2025-11-19 21:37:03 +0000
zfs: fix aarch64 build after zfs-2.4.0-rc4
Approved by: re (cperciva)
(cherry picked from commit fb709935d64d5fd4ad21cf8c69faf580760999e4)
(cherry picked from commit 484fa40ca71bc9c00ee6d3729e5e27cc5d68e131)
---
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}