From 4e81b08fc28491231eec3b2ec8613940fcda9c7a Mon Sep 17 00:00:00 2001 From: imp Date: Wed, 28 Oct 2020 21:18:04 +0000 Subject: [PATCH] loader: add aarch64 support for zstd We don't have NEON available in the boot loader, so we have to disable it. OpenZFS included ZSTD which used the wrong symbol to bring in neon support. Change to use the code that's been submitted upstream as a pull request to both. __ARM_NEON is the proper symbol, defined in ARM C Language Extensions Release 2.1 (https://developer.arm.com/documentation/ihi0053/d/). Some sources suggest __ARM_NEON__, but that's the obsolete spelling from prior versions of the standard. OpenZFS Pull Request: https://github.com/openzfs/zfs/pull/11055 ZSTD Pull Request: https://github.com/facebook/zstd/pull/2356 --- stand/libsa/zfs/Makefile.inc | 2 -- 1 file changed, 2 deletions(-) diff --git a/stand/libsa/zfs/Makefile.inc b/stand/libsa/zfs/Makefile.inc index d046166dc4d999..77725080660100 100644 --- a/stand/libsa/zfs/Makefile.inc +++ b/stand/libsa/zfs/Makefile.inc @@ -5,10 +5,8 @@ .PATH: ${ZFSOSSRC}/spl .PATH: ${OZFS}/module/zstd/lib ZFSSRC= zfs.c nvlist.c skein.c skein_block.c list.c -.if ${MACHINE_ARCH} != aarch64 ZFSSRC+= zstd_shim.c zstd.c CFLAGS+= -DHAS_ZSTD_ZFS -.endif SRCS+= ${ZFSSRC} CFLAGS+= -I${LDRSRC}