git: d952cecfb0e5 - main - devel/llvm16: enable MLIR by default, fix aarch64

The branch main has been updated by brooks:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d952cecfb0e509a9a80bbe05d985cc155c0e4672

commit d952cecfb0e509a9a80bbe05d985cc155c0e4672
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2023-03-06 23:21:53 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2023-03-06 23:27:24 +0000

    devel/llvm16: enable MLIR by default, fix aarch64
    
    Some ports require on MLIR so reenable it by default.  This turns it on
    for all platforms where it was previously disabled for 32-bit platforms
    and pulled in indirectly by FLANG.  If this proves to cause too many
    user issues we'll disable it for 32-bit again.[0]
    
    Fix a missed 16.0.0->16 change in backend include directories which
    broke aarch64 with BE_NATIVE.  Also enable the ARM (32-bit) backend on
    aarch64 as it's plausiably useful.[1]
    
    PR:             269927 [0]
    Reported by:    yuri [0], Mark Millard <marklmi@yahoo.com> [1]
---
 devel/llvm16/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/devel/llvm16/Makefile b/devel/llvm16/Makefile
index 477772b2b24e..70161bda7030 100644
--- a/devel/llvm16/Makefile
+++ b/devel/llvm16/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	llvm
 DISTVERSION=	16.0.0rc3
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	devel lang
 MASTER_SITES=	https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \
 		https://${PRE_}releases.llvm.org/${LLVM_RELEASE}${RCDIR}/
@@ -91,7 +91,7 @@ OPTIONS_DEFINE_amd64=	GOLD
 OPTIONS_DEFINE_powerpc=	GOLD
 OPTIONS_DEFINE_powerpc64=	GOLD
 OPTIONS_DEFINE_powerpc64le=	GOLD
-OPTIONS_DEFAULT=	BE_AMDGPU BE_STANDARD BE_WASM CLANG COMPILER_RT EXTRAS LIT LLD LLDB OPENMP PYCLANG
+OPTIONS_DEFAULT=	BE_AMDGPU BE_STANDARD BE_WASM CLANG COMPILER_RT EXTRAS LIT LLD LLDB MLIR OPENMP PYCLANG
 OPTIONS_DEFAULT_amd64=	GOLD
 OPTIONS_DEFAULT_powerpc=	GOLD
 OPTIONS_DEFAULT_powerpc64=	GOLD
@@ -117,7 +117,7 @@ BE_STANDARD_DESC=	All non-experimental backends
 BE_WASM_DESC=		WebAssembly backend (required by firefox via wasi)
 .for BE in FREEBSD NATIVE STANDARD
 BE_${BE}_PLIST_FILES=	${_BE_LIBS_${BE}:O:S/$/.a/:S|^|${LLVM_DIR}/lib/libLLVM|} \
-			${_BE_INCS_${BE}:S|^|${LLVM_DIR}/lib/clang/${LLVM_MAJOR}/include/|:N${LLVM_DIR}/lib/clang/${LLVM_RELEASE}/include/$}
+			${_BE_INCS_${BE}:S|^|${LLVM_DIR}/lib/clang/${LLVM_MAJOR}/include/|:N${LLVM_DIR}/lib/clang/${LLVM_MAJOR}/include/$}
 .endfor
 CLANG_DESC=	Build clang
 CLANG_CMAKE_ON=		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
@@ -324,7 +324,7 @@ FREEBSD_BACKENDS=	${_FREEBSD_BACKENDS}
 .if ${ARCH} == amd64
 _NATIVE_BACKENDS=	X86
 .elif ${ARCH} == aarch64
-_NATIVE_BACKENDS=	AArch64
+_NATIVE_BACKENDS=	AArch64 ARM
 .elif ${ARCH:Marmv*}
 _NATIVE_BACKENDS=	ARM
 .elif ${ARCH} == i386