Date: Wed, 28 Oct 2020 15:23:54 -0600 From: Warner Losh <imp@bsdimp.com> To: Warner Losh <imp@freebsd.org> Cc: src-committers <src-committers@freebsd.org>, svn-src-all <svn-src-all@freebsd.org>, svn-src-head <svn-src-head@freebsd.org> Subject: Re: svn commit: r367119 - head/stand/libsa/zfs Message-ID: <CANCZdfpsHpabAnnUc1EjzwZcq72YY59sbuTnZaP-K_8Z9_5HLQ@mail.gmail.com> In-Reply-To: <202010282118.09SLI4uj043576@repo.freebsd.org> References: <202010282118.09SLI4uj043576@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This looks like it is missing something, but it isn't. I should have updated the commit message to say that it's just the makefile part of this since these commits were in upstream when it was last brought in. So it looks like things are missing but they are already in the tree... Warner On Wed, Oct 28, 2020 at 3:18 PM Warner Losh <imp@freebsd.org> wrote: > Author: imp > Date: Wed Oct 28 21:18:04 2020 > New Revision: 367119 > URL: https://svnweb.freebsd.org/changeset/base/367119 > > Log: > 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 > > Modified: > head/stand/libsa/zfs/Makefile.inc > > Modified: head/stand/libsa/zfs/Makefile.inc > > ============================================================================== > --- head/stand/libsa/zfs/Makefile.inc Wed Oct 28 21:09:56 2020 > (r367118) > +++ head/stand/libsa/zfs/Makefile.inc Wed Oct 28 21:18:04 2020 > (r367119) > @@ -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} >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfpsHpabAnnUc1EjzwZcq72YY59sbuTnZaP-K_8Z9_5HLQ>