From 2a6803de1cdbc7e34dfe4dc185a2dd98b9a787fb Mon Sep 17 00:00:00 2001
From: Andrew Turner <andrew@FreeBSD.org>
Date: Mon, 14 Sep 2020 16:12:28 +0000
Subject: [PATCH] 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
---
 cddl/lib/libzfs/Makefile   | 2 +-
 cddl/lib/libzpool/Makefile | 2 +-
 lib/libpmc/Makefile        | 4 ++--
 share/mk/bsd.endian.mk     | 2 +-
 share/mk/bsd.sys.mk        | 2 +-
 sys/conf/dtb.build.mk      | 2 +-
 tests/sys/kern/Makefile    | 2 +-
 usr.bin/gcore/Makefile     | 2 +-
 8 files changed, 9 insertions(+), 9 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
 
diff --git a/lib/libpmc/Makefile b/lib/libpmc/Makefile
index 0097d5454bcd..15ea1e2d510c 100644
--- a/lib/libpmc/Makefile
+++ b/lib/libpmc/Makefile
@@ -7,10 +7,10 @@ INCS=	pmc.h pmclog.h pmcformat.h
 
 CFLAGS+= -I${SRCTOP}/${RELDIR:H}/libpmcstat
 
-.if ${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "amd64" || \
+.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_ARCH} == "amd64" || \
     ${MACHINE_ARCH} == "i386"
 
-.if ${MACHINE_ARCH} == "aarch64"
+.if ${MACHINE_CPUARCH} == "aarch64"
 EVENT_ARCH="arm64"
 .elif ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
 EVENT_ARCH="x86"
diff --git a/share/mk/bsd.endian.mk b/share/mk/bsd.endian.mk
index 5d057266dca7..03c997e1e59b 100644
--- a/share/mk/bsd.endian.mk
+++ b/share/mk/bsd.endian.mk
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.if ${MACHINE_ARCH} == "aarch64" || \
+.if ${MACHINE_CPUARCH} == "aarch64" || \
     ${MACHINE_ARCH} == "amd64" || \
     ${MACHINE_ARCH} == "i386" || \
     (${MACHINE} == "arm" && ${MACHINE_ARCH:Marm*eb*} == "") || \
diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
index ee685f6e99d8..7702ddfe15a7 100644
--- a/share/mk/bsd.sys.mk
+++ b/share/mk/bsd.sys.mk
@@ -187,7 +187,7 @@ CWARNFLAGS+=	-Wno-error=aggressive-loop-optimizations	\
 .endif
 
 # GCC's own arm_neon.h triggers various warnings
-.if ${MACHINE_ARCH} == "aarch64"
+.if ${MACHINE_CPUARCH} == "aarch64"
 CWARNFLAGS+=	-Wno-system-headers
 .endif
 .endif	# gcc
diff --git a/sys/conf/dtb.build.mk b/sys/conf/dtb.build.mk
index 1966bee19460..edaa6db225c8 100644
--- a/sys/conf/dtb.build.mk
+++ b/sys/conf/dtb.build.mk
@@ -22,7 +22,7 @@ SYSDIR=	${S}
 .for _dts in ${DTS}
 # DTB for aarch64 needs to preserve the immediate parent of the .dts, because
 # these DTS are vendored and should be installed into their vendored directory.
-.if ${MACHINE_ARCH} == "aarch64"
+.if ${MACHINE_CPUARCH} == "aarch64"
 DTB+=	${_dts:R:S/$/.dtb/}
 .else
 DTB+=	${_dts:T:R:S/$/.dtb/}
diff --git a/tests/sys/kern/Makefile b/tests/sys/kern/Makefile
index c73699266178..ed33bc52ecd1 100644
--- a/tests/sys/kern/Makefile
+++ b/tests/sys/kern/Makefile
@@ -57,7 +57,7 @@ LIBADD.mqueue_test+=	rt
 
 .if ${MACHINE_ARCH} == "amd64" || \
     ${MACHINE_ARCH} == "i386" || \
-    ${MACHINE_ARCH} == "aarch64"
+    ${MACHINE_CPUARCH} == "aarch64"
 ATF_TESTS_C+=	libkern_crc32
 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
 LDADD.libkern_crc32+=	${SRCTOP}/sys/libkern/x86/crc32_sse42.c
diff --git a/usr.bin/gcore/Makefile b/usr.bin/gcore/Makefile
index e58f4ede82b3..c774d8e423d5 100644
--- a/usr.bin/gcore/Makefile
+++ b/usr.bin/gcore/Makefile
@@ -5,7 +5,7 @@ PROG=	gcore
 SRCS=	elfcore.c gcore.c
 LIBADD=	sbuf util
 
-.if ${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "amd64" || \
+.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_ARCH} == "amd64" || \
     ${MACHINE_ARCH} == "powerpc64"
 SRCS+=	elf32core.c
 .endif