diff options
| author | Andrew Turner <andrew@FreeBSD.org> | 2020-09-14 16:12:28 +0000 |
|---|---|---|
| committer | Andrew Turner <andrew@FreeBSD.org> | 2020-09-14 16:12:28 +0000 |
| commit | 2a6803de1cdbc7e34dfe4dc185a2dd98b9a787fb (patch) | |
| tree | f6626469ce3b843e7fcac56715d1f7347aa60bae /cddl | |
| parent | 5fb8eca8700bbf0047c8d9a4472eb71dca8f6d0c (diff) | |
| download | src-2a6803de1cdbc7e34dfe4dc185a2dd98b9a787fb.tar.gz src-2a6803de1cdbc7e34dfe4dc185a2dd98b9a787fb.zip | |
Use MACHINE_CPUARCH when checking for arm64
Use MACHINE_CPUARCH with arm64 (aarch64) when we build code that could run
on any 64-bit Arm instruction set. This will simplify checks in downstream
consumers targeting prototype instruction sets.
The only place we check for MACHINE_ARCH == aarch64 is when building the
device tree blobs. As these are targeting current generation ISAs.
Sponsored by: Innovate UK
Differential Revision: https://reviews.freebsd.org/D26370
Notes
Notes:
svn path=/head/; revision=365726
Diffstat (limited to 'cddl')
| -rw-r--r-- | cddl/lib/libzfs/Makefile | 2 | ||||
| -rw-r--r-- | cddl/lib/libzpool/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile index cd30840c5b2c..611eb91d76e7 100644 --- a/cddl/lib/libzfs/Makefile +++ b/cddl/lib/libzfs/Makefile @@ -82,7 +82,7 @@ CFLAGS += -DHAVE_SSE2 ARCH_C += zfs_fletcher_avx512.c CFLAGS+= -DHAVE_AVX2 -DHAVE_AVX -D__x86_64 -DHAVE_AVX512F .endif -.if ${MACHINE_ARCH} == "aarch64" +.if ${MACHINE_CPUARCH} == "aarch64" ARCH_C += zfs_fletcher_aarch64_neon.c .endif diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile index 5edeee86d4e6..3d4554df955e 100644 --- a/cddl/lib/libzpool/Makefile +++ b/cddl/lib/libzpool/Makefile @@ -187,7 +187,7 @@ ARCH_C += zfs_fletcher_avx512.c CFLAGS+= -DHAVE_AVX2 -DHAVE_AVX -D__x86_64 -DHAVE_AVX512F \ -DHAVE_AVX512BW .endif -.if ${MACHINE_ARCH} == "aarch64" +.if ${MACHINE_CPUARCH} == "aarch64" ARCH_C += zfs_fletcher_aarch64_neon.c .endif |