Skip to content

Commit

Permalink
devel/llvm*: Fix BE_NATIVE on aarch64
Browse files Browse the repository at this point in the history
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
  • Loading branch information
brooksdavis committed May 20, 2021
1 parent 70d1eb8 commit 72f87a5
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions devel/llvm10/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion devel/llvm11/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion devel/llvm12/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions devel/llvm80/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions devel/llvm90/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 72f87a5

Please sign in to comment.