git: 3e1f69523bf0 - main - modules: Use MACHINE_CPUARCH more

The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=3e1f69523bf00ecf89f21c015e2a7bc2a36104e3

commit 3e1f69523bf00ecf89f21c015e2a7bc2a36104e3
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2023-08-08 16:50:39 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2023-08-08 17:44:51 +0000

    modules: Use MACHINE_CPUARCH more
    
    Replace two cases of MACHINE_ARCH with MACHINE_CPUARCH and also use
    `aarch64` instead of the improper `arm64` for that test.
    
    Noticed by:             Mark Millard
    Sponsored by:           Netflix
---
 sys/modules/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 2f9e9ec0f931..0ef69528b45e 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -634,11 +634,12 @@ _cxgbe=		cxgbe
 .endif
 
 # This has only been tested on amd64 and arm64
-.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "arm64"
+.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "aarch64"
 _mpi3mr=mpi3mr
 .endif
 
-.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "arm64" || ${MACHINE_ARCH:Mpowerpc64*}
+.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "aarch64" || \
+	${MACHINE_ARCH:Mpowerpc64*}
 _ice=		ice
 .if ${MK_SOURCELESS_UCODE} != "no"
 _ice_ddp=	ice_ddp