devel/llvm-devel: Update to new snapshot

Enable OPENMP for aarch64 and disable it for i386. The lack of aarch64
support was an oversite. Upstream has broken 32-bit support (at least
for libomptarget).

Fix plist with COMPILER_RT disabled.

5 files changed, 33 insertions, 11 deletions

diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index 4013920e2f9d..88235e1589e6 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -83,16 +83,18 @@ GH_TAGNAME=	${LLVM_PROJECT_COMMIT}
 OPTIONS_DEFINE=		CLANG DOCS LLD STATIC_LIBS
 OPTIONS_DEFAULT=	CLANG LLD
 .if !${FLAVOR:Mlite}
+OPTIONS_DEFINE_aarch64=	OPENMP
 OPTIONS_DEFINE+=	EXTRAS FLANG LIT LLDB MLIR
 OPTIONS_DEFINE_amd64=	COMPILER_RT GOLD OPENMP
-OPTIONS_DEFINE_i386=	COMPILER_RT OPENMP
+OPTIONS_DEFINE_i386=	COMPILER_RT
 OPTIONS_DEFINE_powerpc=	COMPILER_RT GOLD
 OPTIONS_DEFINE_powerpc64=	COMPILER_RT GOLD OPENMP
 OPTIONS_DEFINE_powerpc64le=	COMPILER_RT GOLD OPENMP
 OPTIONS_DEFINE_riscv64=	COMPILER_RT OPENMP
 OPTIONS_DEFAULT+=	EXTRAS FLANG LIT LLDB STATIC_LIBS
+OPTIONS_DEFAULT_aarch64=	OPENMP
 OPTIONS_DEFAULT_amd64=	COMPILER_RT GOLD OPENMP
-OPTIONS_DEFAULT_i386=	COMPILER_RT OPENMP
+OPTIONS_DEFAULT_i386=	COMPILER_RT
 OPTIONS_DEFAULT_powerpc=	COMPILER_RT GOLD
 OPTIONS_DEFAULT_powerpc64=	COMPILER_RT GOLD OPENMP
 OPTIONS_DEFAULT_powerpc64le=	COMPILER_RT GOLD OPENMP
@@ -238,7 +240,7 @@ USES+=	gnome
 
 .if ${PORT_OPTIONS:MCOMPILER_RT}
 LLVM_ENABLE_PROJECTS+=	compiler-rt
-COMPILER_RT_PATTERN=	(sanitizer|include.xray|include\/fuzzer|profile\/InstrProfData.inc)
+COMPILER_RT_PATTERN=	(sanitizer|include.xray|include\/(fuzzer|orc)|profile\/InstrProfData.inc)
 .if ${OSVERSION} < 1300525
 # An unwind.h is require to build.  I think an in-tree one should be used
 # but this seems to work as a workaround...
@@ -551,7 +553,7 @@ post-install-FLANG-on:
 	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/flang/Optimizer/Transforms/CMakeFiles
 	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/flang/Optimizer/CMakeFiles
 	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/flang/CMakeFiles
-.if ${SNAPDATE} == 20220701
+.if ${SNAPDATE} == 20220709
 	# expected to be temporary
 	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/flang-new \
 	    ${STAGEDIR}${LLVM_PREFIX}/bin/flang
diff --git a/devel/llvm-devel/Makefile.COMMANDS b/devel/llvm-devel/Makefile.COMMANDS
index 7b2ba422ee79..7517c0d1d7e9 100644
--- a/devel/llvm-devel/Makefile.COMMANDS
+++ b/devel/llvm-devel/Makefile.COMMANDS
@@ -14,6 +14,7 @@ LLVM_COMMANDS=	\
 		llvm-cov \
 		llvm-cvtres \
 		llvm-cxxmap \
+		llvm-debuginfod \
 		llvm-debuginfod-find \
 		llvm-diff \
 		llvm-dis \
diff --git a/devel/llvm-devel/Makefile.snapshot b/devel/llvm-devel/Makefile.snapshot
index 8779d083b8eb..06627b361c29 100644
--- a/devel/llvm-devel/Makefile.snapshot
+++ b/devel/llvm-devel/Makefile.snapshot
@@ -4,6 +4,6 @@
 #
 LLVM_MAJOR=	15
 LLVM_RELEASE=	${LLVM_MAJOR}.0.0
-SNAPDATE=	20220701
+SNAPDATE=	20220709
 
-LLVM_PROJECT_COMMIT=		4a782252127761b60d33e74f9d9acb0aad6f742f
+LLVM_PROJECT_COMMIT=		fb89c4126904e4d82f235e492042c16c87cc8e3d
diff --git a/devel/llvm-devel/distinfo b/devel/llvm-devel/distinfo
index 1162227b06b1..b63cc317d791 100644
--- a/devel/llvm-devel/distinfo
+++ b/devel/llvm-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1656658880
-SHA256 (llvm-llvm-project-15.0.d20220701-4a782252127761b60d33e74f9d9acb0aad6f742f_GH0.tar.gz) = af3eab1ba79636654113121a606290884fcbda0ad90da6bfde36549bb77c981b
-SIZE (llvm-llvm-project-15.0.d20220701-4a782252127761b60d33e74f9d9acb0aad6f742f_GH0.tar.gz) = 167227340
+TIMESTAMP = 1657357617
+SHA256 (llvm-llvm-project-15.0.d20220709-fb89c4126904e4d82f235e492042c16c87cc8e3d_GH0.tar.gz) = 3b62eeeaabc9e384527f64336ee9a7d55f0579fac9f2db0adda7ec3868499df3
+SIZE (llvm-llvm-project-15.0.d20220709-fb89c4126904e4d82f235e492042c16c87cc8e3d_GH0.tar.gz) = 165604819
diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist
index 4871a9a2d9de..26510f5fbc8c 100644
--- a/devel/llvm-devel/pkg-plist
+++ b/devel/llvm-devel/pkg-plist
@@ -15,6 +15,7 @@ bin/llvm-config-devel
 bin/llvm-cov-devel
 bin/llvm-cvtres-devel
 bin/llvm-cxxmap-devel
+bin/llvm-debuginfod-devel
 bin/llvm-debuginfod-find-devel
 bin/llvm-diff-devel
 bin/llvm-dis-devel
@@ -219,6 +220,7 @@ llvm-devel/bin/llvm-cvtres
 llvm-devel/bin/llvm-cxxdump
 llvm-devel/bin/llvm-cxxfilt
 llvm-devel/bin/llvm-cxxmap
+llvm-devel/bin/llvm-debuginfod
 llvm-devel/bin/llvm-debuginfod-find
 llvm-devel/bin/llvm-diff
 llvm-devel/bin/llvm-dis
@@ -359,6 +361,7 @@ llvm-devel/bin/verify-uselistorder
 %%EXTRAS%%llvm-devel/include/clang-tidy/boost/UseToStringCheck.h
 %%EXTRAS%%llvm-devel/include/clang-tidy/bugprone/ArgumentCommentCheck.h
 %%EXTRAS%%llvm-devel/include/clang-tidy/bugprone/AssertSideEffectCheck.h
+%%EXTRAS%%llvm-devel/include/clang-tidy/bugprone/AssignmentInIfConditionCheck.h
 %%EXTRAS%%llvm-devel/include/clang-tidy/bugprone/BadSignalToKillThreadCheck.h
 %%EXTRAS%%llvm-devel/include/clang-tidy/bugprone/BoolPointerImplicitConversionCheck.h
 %%EXTRAS%%llvm-devel/include/clang-tidy/bugprone/BranchCloneCheck.h
@@ -1147,6 +1150,7 @@ llvm-devel/bin/verify-uselistorder
 %%CLANG%%llvm-devel/include/clang/Sema/DelayedDiagnostic.h
 %%CLANG%%llvm-devel/include/clang/Sema/Designator.h
 %%CLANG%%llvm-devel/include/clang/Sema/ExternalSemaSource.h
+%%CLANG%%llvm-devel/include/clang/Sema/HLSLExternalSemaSource.h
 %%CLANG%%llvm-devel/include/clang/Sema/IdentifierResolver.h
 %%CLANG%%llvm-devel/include/clang/Sema/Initialization.h
 %%CLANG%%llvm-devel/include/clang/Sema/Lookup.h
@@ -1365,6 +1369,7 @@ llvm-devel/bin/verify-uselistorder
 %%FLANG%%llvm-devel/include/flang/Evaluate/rounding-bits.h
 %%FLANG%%llvm-devel/include/flang/Evaluate/shape.h
 %%FLANG%%llvm-devel/include/flang/Evaluate/static-data.h
+%%FLANG%%llvm-devel/include/flang/Evaluate/target.h
 %%FLANG%%llvm-devel/include/flang/Evaluate/tools.h
 %%FLANG%%llvm-devel/include/flang/Evaluate/traverse.h
 %%FLANG%%llvm-devel/include/flang/Evaluate/type.h
@@ -2858,6 +2863,7 @@ llvm-devel/include/llvm/DebugInfo/Symbolize/Symbolize.h
 llvm-devel/include/llvm/Debuginfod/DIFetcher.h
 llvm-devel/include/llvm/Debuginfod/Debuginfod.h
 llvm-devel/include/llvm/Debuginfod/HTTPClient.h
+llvm-devel/include/llvm/Debuginfod/HTTPServer.h
 llvm-devel/include/llvm/Demangle/Demangle.h
 llvm-devel/include/llvm/Demangle/DemangleConfig.h
 llvm-devel/include/llvm/Demangle/ItaniumDemangle.h
@@ -3036,6 +3042,8 @@ llvm-devel/include/llvm/IR/IntrinsicsARM.h
 llvm-devel/include/llvm/IR/IntrinsicsARM.td
 llvm-devel/include/llvm/IR/IntrinsicsBPF.h
 llvm-devel/include/llvm/IR/IntrinsicsBPF.td
+llvm-devel/include/llvm/IR/IntrinsicsDirectX.h
+llvm-devel/include/llvm/IR/IntrinsicsDirectX.td
 llvm-devel/include/llvm/IR/IntrinsicsHexagon.h
 llvm-devel/include/llvm/IR/IntrinsicsHexagon.td
 llvm-devel/include/llvm/IR/IntrinsicsHexagonDep.td
@@ -3305,6 +3313,7 @@ llvm-devel/include/llvm/ObjectYAML/ELFYAML.h
 llvm-devel/include/llvm/ObjectYAML/MachOYAML.h
 llvm-devel/include/llvm/ObjectYAML/MinidumpYAML.h
 llvm-devel/include/llvm/ObjectYAML/ObjectYAML.h
+llvm-devel/include/llvm/ObjectYAML/OffloadYAML.h
 llvm-devel/include/llvm/ObjectYAML/WasmYAML.h
 llvm-devel/include/llvm/ObjectYAML/XCOFFYAML.h
 llvm-devel/include/llvm/ObjectYAML/YAML.h
@@ -3881,11 +3890,12 @@ llvm-devel/include/llvm/XRay/YAMLXRayRecord.h
 %%MLIR%%llvm-devel/include/mlir/Analysis/CallGraph.h
 %%MLIR%%llvm-devel/include/mlir/Analysis/DataFlow/ConstantPropagationAnalysis.h
 %%MLIR%%llvm-devel/include/mlir/Analysis/DataFlow/DeadCodeAnalysis.h
+%%MLIR%%llvm-devel/include/mlir/Analysis/DataFlow/DenseAnalysis.h
+%%MLIR%%llvm-devel/include/mlir/Analysis/DataFlow/IntegerRangeAnalysis.h
 %%MLIR%%llvm-devel/include/mlir/Analysis/DataFlow/SparseAnalysis.h
 %%MLIR%%llvm-devel/include/mlir/Analysis/DataFlowAnalysis.h
 %%MLIR%%llvm-devel/include/mlir/Analysis/DataFlowFramework.h
 %%MLIR%%llvm-devel/include/mlir/Analysis/DataLayoutAnalysis.h
-%%MLIR%%llvm-devel/include/mlir/Analysis/IntRangeAnalysis.h
 %%MLIR%%llvm-devel/include/mlir/Analysis/Liveness.h
 %%MLIR%%llvm-devel/include/mlir/Analysis/Presburger/Fraction.h
 %%MLIR%%llvm-devel/include/mlir/Analysis/Presburger/IntegerRelation.h
@@ -3913,6 +3923,7 @@ llvm-devel/include/llvm/XRay/YAMLXRayRecord.h
 %%MLIR%%llvm-devel/include/mlir/CAPI/Utils.h
 %%MLIR%%llvm-devel/include/mlir/CAPI/Wrap.h
 %%MLIR%%llvm-devel/include/mlir/Conversion/AMDGPUToROCDL/AMDGPUToROCDL.h
+%%MLIR%%llvm-devel/include/mlir/Conversion/AMDGPUToROCDL/Chipset.h
 %%MLIR%%llvm-devel/include/mlir/Conversion/AffineToStandard/AffineToStandard.h
 %%MLIR%%llvm-devel/include/mlir/Conversion/ArithmeticToLLVM/ArithmeticToLLVM.h
 %%MLIR%%llvm-devel/include/mlir/Conversion/ArithmeticToSPIRV/ArithmeticToSPIRV.h
@@ -4371,6 +4382,7 @@ llvm-devel/include/llvm/XRay/YAMLXRayRecord.h
 %%MLIR%%llvm-devel/include/mlir/Dialect/OpenMP/OpenMPOpsInterfaces.td
 %%MLIR%%llvm-devel/include/mlir/Dialect/OpenMP/OpenMPTypeInterfaces.cpp.inc
 %%MLIR%%llvm-devel/include/mlir/Dialect/OpenMP/OpenMPTypeInterfaces.h.inc
+%%MLIR%%llvm-devel/include/mlir/Dialect/OpenMP/OpenMPTypeInterfaces.td
 %%MLIR%%llvm-devel/include/mlir/Dialect/PDL/IR/PDL.h
 %%MLIR%%llvm-devel/include/mlir/Dialect/PDL/IR/PDLDialect.td
 %%MLIR%%llvm-devel/include/mlir/Dialect/PDL/IR/PDLOps.cpp.inc
@@ -4761,6 +4773,10 @@ llvm-devel/include/llvm/XRay/YAMLXRayRecord.h
 %%MLIR%%llvm-devel/include/mlir/Interfaces/LoopLikeInterface.h
 %%MLIR%%llvm-devel/include/mlir/Interfaces/LoopLikeInterface.h.inc
 %%MLIR%%llvm-devel/include/mlir/Interfaces/LoopLikeInterface.td
+%%MLIR%%llvm-devel/include/mlir/Interfaces/ParallelCombiningOpInterface.cpp.inc
+%%MLIR%%llvm-devel/include/mlir/Interfaces/ParallelCombiningOpInterface.h
+%%MLIR%%llvm-devel/include/mlir/Interfaces/ParallelCombiningOpInterface.h.inc
+%%MLIR%%llvm-devel/include/mlir/Interfaces/ParallelCombiningOpInterface.td
 %%MLIR%%llvm-devel/include/mlir/Interfaces/SideEffectInterfaceBase.td
 %%MLIR%%llvm-devel/include/mlir/Interfaces/SideEffectInterfaces.cpp.inc
 %%MLIR%%llvm-devel/include/mlir/Interfaces/SideEffectInterfaces.h
@@ -4779,6 +4795,7 @@ llvm-devel/include/llvm/XRay/YAMLXRayRecord.h
 %%MLIR%%llvm-devel/include/mlir/Interfaces/ViewLikeInterface.h.inc
 %%MLIR%%llvm-devel/include/mlir/Interfaces/ViewLikeInterface.td
 %%MLIR%%llvm-devel/include/mlir/Parser/AsmParserState.h
+%%MLIR%%llvm-devel/include/mlir/Parser/CodeComplete.h
 %%MLIR%%llvm-devel/include/mlir/Parser/Parser.h
 %%MLIR%%llvm-devel/include/mlir/Pass/AnalysisManager.h
 %%MLIR%%llvm-devel/include/mlir/Pass/Pass.h
@@ -5013,7 +5030,7 @@ llvm-devel/include/llvm/XRay/YAMLXRayRecord.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/openmp_wrappers/complex_cmath.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/openmp_wrappers/math.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/openmp_wrappers/new
-%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/orc/c_api.h
+%%COMPILER_RT%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/orc/c_api.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/pconfigintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/pkuintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/pmmintrin.h
@@ -5033,6 +5050,7 @@ llvm-devel/include/llvm/XRay/YAMLXRayRecord.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/prfchwintrin.h
 %%COMPILER_RT%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/profile/InstrProfData.inc
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/ptwriteintrin.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/rdpruintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/rdseedintrin.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/riscv_vector.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/rtmintrin.h
@@ -5469,6 +5487,7 @@ llvm-devel/lib/libLTO.so.%%LLVM_MAJOR%%git
 %%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRPDLLCodeGen.a
 %%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRPDLLODS.a
 %%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRPDLToPDLInterp.a
+%%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRParallelCombiningOpInterface.a
 %%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRParser.a
 %%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRPass.a
 %%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRPresburger.a