From 72f87a53eddfea7940f2378a9a218b15d489e493 Mon Sep 17 00:00:00 2001
From: Brooks Davis <brooks@FreeBSD.org>
Date: Fri, 21 May 2021 00:16:54 +0100
Subject: devel/llvm*: Fix BE_NATIVE on aarch64

Fix two bugs in native-only backend support (BE_NATIVE).  First, ARCH
is aarch64 not arm64.  Second, consistently spell AArch64 not AAarch64
(extra 'a').

Because this only effects aarch64 in a non-default configuration, skip
the PORTREVISION bump that is technically required to reduce excess
heating in common cases.

Reported by:	Mark Millard
---
 devel/llvm10/Makefile | 4 ++--
 devel/llvm11/Makefile | 2 +-
 devel/llvm12/Makefile | 2 +-
 devel/llvm80/Makefile | 4 ++--
 devel/llvm90/Makefile | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/devel/llvm10/Makefile b/devel/llvm10/Makefile
index 69a6bbfb1ebe..64c8be1bd046 100644
--- a/devel/llvm10/Makefile
+++ b/devel/llvm10/Makefile
@@ -310,8 +310,8 @@ _FREEBSD_BACKENDS=	AArch64 ARM Mips PowerPC RISCV Sparc X86
 FREEBSD_BACKENDS=	${_FREEBSD_BACKENDS}
 .if ${ARCH} == amd64
 _NATIVE_BACKENDS=	X86
-.elif ${ARCH} == arm64
-_NATIVE_BACKENDS=	AAarch64
+.elif ${ARCH} == aarch64
+_NATIVE_BACKENDS=	AArch64
 .elif ${ARCH:Marmv*}
 _NATIVE_BACKENDS=	ARM
 .elif ${ARCH} == i386
diff --git a/devel/llvm11/Makefile b/devel/llvm11/Makefile
index 10dacf513ea1..a844b6e69fd5 100644
--- a/devel/llvm11/Makefile
+++ b/devel/llvm11/Makefile
@@ -305,7 +305,7 @@ _FREEBSD_BACKENDS=	AArch64 ARM Mips PowerPC RISCV Sparc X86
 FREEBSD_BACKENDS=	${_FREEBSD_BACKENDS}
 .if ${ARCH} == amd64
 _NATIVE_BACKENDS=	X86
-.elif ${ARCH} == arm64
+.elif ${ARCH} == aarch64
 _NATIVE_BACKENDS=	AArch64
 .elif ${ARCH:Marmv*}
 _NATIVE_BACKENDS=	ARM
diff --git a/devel/llvm12/Makefile b/devel/llvm12/Makefile
index 7f371832fed3..373735bbff6a 100644
--- a/devel/llvm12/Makefile
+++ b/devel/llvm12/Makefile
@@ -314,7 +314,7 @@ _FREEBSD_BACKENDS=	AArch64 ARM Mips PowerPC RISCV Sparc X86
 FREEBSD_BACKENDS=	${_FREEBSD_BACKENDS}
 .if ${ARCH} == amd64
 _NATIVE_BACKENDS=	X86
-.elif ${ARCH} == arm64
+.elif ${ARCH} == aarch64
 _NATIVE_BACKENDS=	AArch64
 .elif ${ARCH:Marmv*}
 _NATIVE_BACKENDS=	ARM
diff --git a/devel/llvm80/Makefile b/devel/llvm80/Makefile
index dbf123d6bdf4..9a218f566ede 100644
--- a/devel/llvm80/Makefile
+++ b/devel/llvm80/Makefile
@@ -246,8 +246,8 @@ _FREEBSD_BACKENDS=	AArch64 ARM Mips PowerPC Sparc X86
 FREEBSD_BACKENDS=	${_FREEBSD_BACKENDS}
 .if ${ARCH} == amd64
 _NATIVE_BACKENDS=	X86
-.elif ${ARCH} == arm64
-_NATIVE_BACKENDS=	AAarch64
+.elif ${ARCH} == aarch64
+_NATIVE_BACKENDS=	AArch64
 .elif ${ARCH:Marmv*}
 _NATIVE_BACKENDS=	ARM
 .elif ${ARCH} == i386
diff --git a/devel/llvm90/Makefile b/devel/llvm90/Makefile
index 51f1bb7d8ff0..9ecfec47c48d 100644
--- a/devel/llvm90/Makefile
+++ b/devel/llvm90/Makefile
@@ -283,8 +283,8 @@ _FREEBSD_BACKENDS=	AArch64 ARM Mips PowerPC RISCV Sparc X86
 FREEBSD_BACKENDS=	${_FREEBSD_BACKENDS}
 .if ${ARCH} == amd64
 _NATIVE_BACKENDS=	X86
-.elif ${ARCH} == arm64
-_NATIVE_BACKENDS=	AAarch64
+.elif ${ARCH} == aarch64
+_NATIVE_BACKENDS=	AArch64
 .elif ${ARCH:Marmv*}
 _NATIVE_BACKENDS=	ARM
 .elif ${ARCH} == i386
-- 
cgit v1.2.3