aboutsummaryrefslogtreecommitdiff
path: root/stand/libsa
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2020-10-28 21:18:04 +0000
committerWarner Losh <imp@FreeBSD.org>2020-10-28 21:18:04 +0000
commit1ef64e3da5fb023436893a635e336e591aba120a (patch)
treeefeefae59c81aad05d86d1cada98e352da51cbb9 /stand/libsa
parentb4e4f070eacdc3873f5d6ab9728c0eaae2ff376a (diff)
downloadsrc-1ef64e3da5fb023436893a635e336e591aba120a.tar.gz
src-1ef64e3da5fb023436893a635e336e591aba120a.zip
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
Notes
Notes: svn path=/head/; revision=367119
Diffstat (limited to 'stand/libsa')
-rw-r--r--stand/libsa/zfs/Makefile.inc2
1 files changed, 0 insertions, 2 deletions
diff --git a/stand/libsa/zfs/Makefile.inc b/stand/libsa/zfs/Makefile.inc
index d046166dc4d9..777250806601 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}