git: 20283e1aecca - main - devel/llvm-devel: Update to a new snapshot

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Brooks Davis <brooks_at_FreeBSD.org>
Date: Thu, 07 Oct 2021 22:37:10 UTC
The branch main has been updated by brooks:

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

commit 20283e1aecca279bc7d58d17b00e20be6c8da393
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2021-10-07 22:33:06 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2021-10-07 22:36:55 +0000

    devel/llvm-devel: Update to a new snapshot
    
    Fix build without FLANG (plist issue).
    
    Fix LLDB build on non-CURRENT, I accidently committed the removal of
    the workaround patch (which didn't work on i386) with an llvm13 update
    in ef505eaca6425dd075e64e166f7be7a0ead3fa59.  This snapshot includes
    the correct fix from upstream.
    
    Sponsored by:   DARPA
---
 devel/llvm-devel/Makefile          |  8 +++-----
 devel/llvm-devel/Makefile.snapshot |  4 ++--
 devel/llvm-devel/distinfo          |  6 +++---
 devel/llvm-devel/pkg-plist         | 21 +++++++++++++++++----
 4 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index a63877d2cc2a..5fe5b1e8267b 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -140,7 +140,7 @@ COMPILER_RT_USES=	localbase
 COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \
 			${_COMPILER_RT_IGNORELISTS:S|^|${_CRTBLDIR}/|}
 DOCS_PORTDOCS=		llvm
-DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \
+DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx-markdown-tables>=0:textproc/py-sphinx-markdown-tables@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR}
 DOCS_CMAKE_ON=		-DLLVM_ENABLE_SPHINX=ON \
 			-DSPHINX_EXECUTABLE=${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} \
@@ -152,10 +152,8 @@ EXTRAS_IMPLIES=		CLANG
 EXTRAS_PLIST_DIRS=	${LLVM_DIR}/include/clang-tidy/plugin
 FLANG_DESC=		Flang FORTRAN compiler
 FLANG_IMPLIES=		MLIR
-#FLANG_PORTDOCS=		flang
+FLANG_PORTDOCS=		flang
 FLANG_PLIST_DIRS=	${LLVM_DIR}/include/flang/Config
-# Docs require sphinx-markdown-tables which requires py-markdown > 3.0.1
-FLANG_CMAKE_ON=		-DFLANG_INCLUDE_DOCS=OFF
 LIT_DESC=		Install lit and FileCheck test tools
 LLD_DESC=		Install lld, the LLVM linker
 LLDB_BUILD_DEPENDS=	swig:devel/swig
@@ -253,7 +251,7 @@ EXTRAS_LIBS=	\
 EXTRAS_FILES=	index.js
 EXTRAS_PATTERN=	${EXTRAS_COMMANDS:tW:C/  */|/g}|${EXTRAS_LIBS:tW:C/  */|/g}|${EXTRAS_FILES:tW:C/  */|/g}
 
-FLANG_PATTERN=	${FLANG_COMMANDS:S/^/bin./:tW:C/  */|/g}|flang|libFIROptimizer|libFortran
+FLANG_PATTERN=	${FLANG_COMMANDS:S/^/bin./:tW:C/  */|/g}|flang|libFIR|libFortran
 
 MLIR_PATTERN=	${MLIR_COMMANDS:S/^/bin./:tW:C/  */|/g}|mlir|libMLIR
 
diff --git a/devel/llvm-devel/Makefile.snapshot b/devel/llvm-devel/Makefile.snapshot
index d4b97f63c5d0..d6c18f3c7395 100644
--- a/devel/llvm-devel/Makefile.snapshot
+++ b/devel/llvm-devel/Makefile.snapshot
@@ -4,6 +4,6 @@
 #
 LLVM_MAJOR=	14
 LLVM_RELEASE=	${LLVM_MAJOR}.0.0
-SNAPDATE=	20211005
+SNAPDATE=	20211007
 
-LLVM_PROJECT_COMMIT=		7d541eb4d49aaaab6a51a3568b9214fd8691e2d3
+LLVM_PROJECT_COMMIT=		e356027016c6365b3d8924f54c33e2c63d931492
diff --git a/devel/llvm-devel/distinfo b/devel/llvm-devel/distinfo
index 25dafd095a31..2560da4e82e6 100644
--- a/devel/llvm-devel/distinfo
+++ b/devel/llvm-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633469733
-SHA256 (llvm-llvm-project-14.0.d20211005-7d541eb4d49aaaab6a51a3568b9214fd8691e2d3_GH0.tar.gz) = 23788c802e1c6b39aa3d1562a514feec9efe145204aa08ecf3deea7ac228f184
-SIZE (llvm-llvm-project-14.0.d20211005-7d541eb4d49aaaab6a51a3568b9214fd8691e2d3_GH0.tar.gz) = 149515726
+TIMESTAMP = 1633631838
+SHA256 (llvm-llvm-project-14.0.d20211007-e356027016c6365b3d8924f54c33e2c63d931492_GH0.tar.gz) = 9c06883183498b335e8125b5ba4567c04581f383880644aa103e47fc12352eb5
+SIZE (llvm-llvm-project-14.0.d20211007-e356027016c6365b3d8924f54c33e2c63d931492_GH0.tar.gz) = 149592683
diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist
index 2d3f84774cfd..144c01d5adea 100644
--- a/devel/llvm-devel/pkg-plist
+++ b/devel/llvm-devel/pkg-plist
@@ -3795,6 +3795,17 @@ llvm-devel/include/llvm/XRay/YAMLXRayRecord.h
 %%MLIR%%llvm-devel/include/mlir/Dialect/Affine/Passes.h.inc
 %%MLIR%%llvm-devel/include/mlir/Dialect/Affine/Passes.td
 %%MLIR%%llvm-devel/include/mlir/Dialect/Affine/Utils.h
+%%MLIR%%llvm-devel/include/mlir/Dialect/Arithmetic/IR/Arithmetic.h
+%%MLIR%%llvm-devel/include/mlir/Dialect/Arithmetic/IR/ArithmeticBase.td
+%%MLIR%%llvm-devel/include/mlir/Dialect/Arithmetic/IR/ArithmeticOps.cpp.inc
+%%MLIR%%llvm-devel/include/mlir/Dialect/Arithmetic/IR/ArithmeticOps.h.inc
+%%MLIR%%llvm-devel/include/mlir/Dialect/Arithmetic/IR/ArithmeticOps.td
+%%MLIR%%llvm-devel/include/mlir/Dialect/Arithmetic/IR/ArithmeticOpsDialect.cpp.inc
+%%MLIR%%llvm-devel/include/mlir/Dialect/Arithmetic/IR/ArithmeticOpsDialect.h.inc
+%%MLIR%%llvm-devel/include/mlir/Dialect/Arithmetic/IR/ArithmeticOpsEnums.cpp.inc
+%%MLIR%%llvm-devel/include/mlir/Dialect/Arithmetic/IR/ArithmeticOpsEnums.h.inc
+%%MLIR%%llvm-devel/include/mlir/Dialect/Arithmetic/IR/ArithmeticOpsTypes.cpp.inc
+%%MLIR%%llvm-devel/include/mlir/Dialect/Arithmetic/IR/ArithmeticOpsTypes.h.inc
 %%MLIR%%llvm-devel/include/mlir/Dialect/ArmNeon/ArmNeon.cpp.inc
 %%MLIR%%llvm-devel/include/mlir/Dialect/ArmNeon/ArmNeon.h.inc
 %%MLIR%%llvm-devel/include/mlir/Dialect/ArmNeon/ArmNeon.td
@@ -4477,6 +4488,7 @@ llvm-devel/include/llvm/XRay/YAMLXRayRecord.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_math.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_math_forward_declares.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_runtime_wrapper.h
+%%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_texture_intrinsics.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/__clang_hip_cmath.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/__clang_hip_libdevice_declares.h
 %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/__clang_hip_math.h
@@ -4703,10 +4715,10 @@ llvm-devel/lib/cmake/llvm/VersionFromVCS.cmake
 %%MLIR%%llvm-devel/lib/cmake/mlir/MLIRTargets-%%CMAKE_BUILD_TYPE%%.cmake
 %%MLIR%%llvm-devel/lib/cmake/mlir/MLIRTargets.cmake
 %%OPENMP%%llvm-devel/lib/cmake/openmp/FindOpenMPTarget.cmake
-%%STATIC_LIBS%%llvm-devel/lib/libFIRCodeGen.a
-%%STATIC_LIBS%%llvm-devel/lib/libFIRDialect.a
-%%STATIC_LIBS%%llvm-devel/lib/libFIRSupport.a
-%%STATIC_LIBS%%llvm-devel/lib/libFIRTransforms.a
+%%STATIC_LIBS%%%%FLANG%%llvm-devel/lib/libFIRCodeGen.a
+%%STATIC_LIBS%%%%FLANG%%llvm-devel/lib/libFIRDialect.a
+%%STATIC_LIBS%%%%FLANG%%llvm-devel/lib/libFIRSupport.a
+%%STATIC_LIBS%%%%FLANG%%llvm-devel/lib/libFIRTransforms.a
 %%STATIC_LIBS%%%%FLANG%%llvm-devel/lib/libFortranCommon.a
 %%STATIC_LIBS%%%%FLANG%%llvm-devel/lib/libFortranDecimal.a
 %%STATIC_LIBS%%%%FLANG%%llvm-devel/lib/libFortranEvaluate.a
@@ -4893,6 +4905,7 @@ llvm-devel/lib/libLTO.so.%%LLVM_MAJOR%%git
 %%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRAffineTransformsTestPasses.a
 %%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRAffineUtils.a
 %%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRAnalysis.a
+%%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRArithmetic.a
 %%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRArmNeon.a
 %%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRArmNeon2dToIntr.a
 %%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRArmNeonToLLVMIRTranslation.a