Skip to content

Commit

Permalink
loader: add aarch64 support for zstd
Browse files Browse the repository at this point in the history
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: openzfs/zfs#11055
ZSTD Pull Request: facebook/zstd#2356


git-svn-id: svn+ssh://svn.freebsd.org/base/head@367119 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
  • Loading branch information
imp committed Oct 28, 2020
1 parent 0a6db45 commit b4ffe46
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions stand/libsa/zfs/Makefile.inc
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down

0 comments on commit b4ffe46

Please sign in to comment.