aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrooks Davis <brooks@FreeBSD.org>2022-09-29 22:48:41 +0000
committerBrooks Davis <brooks@FreeBSD.org>2022-09-29 22:48:41 +0000
commit547397723678cd4d68d95ac24b7e98ccf197f0c2 (patch)
tree79db92a14b0fc54baeaf6138ffde6cb234369933
parent4ca5c8c042c7e7123b63e31936d5f1edc5d42969 (diff)
downloadports-547397723678cd4d68d95ac24b7e98ccf197f0c2.tar.gz
ports-547397723678cd4d68d95ac24b7e98ccf197f0c2.zip
devel/llvm-devel: new snapshot
Fix a plist bug with EXTRAS disabled. This update contains a workaround for an issue causing flang not to compile on amd64 due to a lack of __float128 support. Power may need a similar fix, but I'd prefer not to apply it blindly. PR: 266662
-rw-r--r--devel/llvm-devel/Makefile4
-rw-r--r--devel/llvm-devel/Makefile.snapshot4
-rw-r--r--devel/llvm-devel/distinfo6
-rw-r--r--devel/llvm-devel/files/patch-flang_include_flang_Runtime_float128.h11
-rw-r--r--devel/llvm-devel/pkg-plist20
5 files changed, 34 insertions, 11 deletions
diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index a258d186172d..1758c7103d9a 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -182,8 +182,10 @@ EXTRAS_LIBS= \
libclangChangeNamespace \
libclangDaemon \
libclangDoc \
+ libclangIncludeCleaner \
libclangIncludeFixer \
libclangMove \
+ libclangPseudo \
libclangQuery \
libclangRename \
libclangReorderFields \
@@ -415,7 +417,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} == 20220921
+.if ${SNAPDATE} == 20220928
# expected to be temporary
${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/flang-new \
${STAGEDIR}${LLVM_PREFIX}/bin/flang
diff --git a/devel/llvm-devel/Makefile.snapshot b/devel/llvm-devel/Makefile.snapshot
index be394761b92c..990deaa18894 100644
--- a/devel/llvm-devel/Makefile.snapshot
+++ b/devel/llvm-devel/Makefile.snapshot
@@ -4,6 +4,6 @@
#
LLVM_MAJOR= 16
LLVM_RELEASE= ${LLVM_MAJOR}.0.0
-SNAPDATE= 20220921
+SNAPDATE= 20220928
-LLVM_PROJECT_COMMIT= e347c0fc9bf8a9c415ca09887bf707e718b8fb1c
+LLVM_PROJECT_COMMIT= 60727d856927383daf304fcf8f19fcc8ade828ad
diff --git a/devel/llvm-devel/distinfo b/devel/llvm-devel/distinfo
index 886cbdeb7cb1..c765b38781b7 100644
--- a/devel/llvm-devel/distinfo
+++ b/devel/llvm-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1663792510
-SHA256 (llvm-llvm-project-16.0.d20220921-e347c0fc9bf8a9c415ca09887bf707e718b8fb1c_GH0.tar.gz) = 3adb2476c2d71dc0a34d161c7aa514bbb15134a7d5fb684b13426dfa05d0e58f
-SIZE (llvm-llvm-project-16.0.d20220921-e347c0fc9bf8a9c415ca09887bf707e718b8fb1c_GH0.tar.gz) = 167722919
+TIMESTAMP = 1664386770
+SHA256 (llvm-llvm-project-16.0.d20220928-60727d856927383daf304fcf8f19fcc8ade828ad_GH0.tar.gz) = 71ffc52c9040df69b59f74ed336f5b104b38f6c1f2dbb20f7fbf3f4d1063a5e5
+SIZE (llvm-llvm-project-16.0.d20220928-60727d856927383daf304fcf8f19fcc8ade828ad_GH0.tar.gz) = 168890962
diff --git a/devel/llvm-devel/files/patch-flang_include_flang_Runtime_float128.h b/devel/llvm-devel/files/patch-flang_include_flang_Runtime_float128.h
new file mode 100644
index 000000000000..99794dd0124a
--- /dev/null
+++ b/devel/llvm-devel/files/patch-flang_include_flang_Runtime_float128.h
@@ -0,0 +1,11 @@
+--- flang/include/flang/Runtime/float128.h.orig
++++ flang/include/flang/Runtime/float128.h
+@@ -22,7 +22,7 @@
+
+ #undef HAS_FLOAT128
+ #if __x86_64__
+-#if __GNUC__ >= 7 || __clang_major__ >= 7
++#if !defined(__FreeBSD__) && (__GNUC__ >= 7 || __clang_major__ >= 7)
+ #define HAS_FLOAT128 1
+ #endif
+ #elif defined __PPC__ && __GNUC__ >= 8
diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist
index 64445d660574..cc9f00c5dedd 100644
--- a/devel/llvm-devel/pkg-plist
+++ b/devel/llvm-devel/pkg-plist
@@ -2172,6 +2172,7 @@ llvm-devel/include/llvm/ADT/ImmutableSet.h
llvm-devel/include/llvm/ADT/IndexedMap.h
llvm-devel/include/llvm/ADT/IntEqClasses.h
llvm-devel/include/llvm/ADT/IntervalMap.h
+llvm-devel/include/llvm/ADT/IntervalTree.h
llvm-devel/include/llvm/ADT/IntrusiveRefCntPtr.h
llvm-devel/include/llvm/ADT/MapVector.h
llvm-devel/include/llvm/ADT/None.h
@@ -2520,6 +2521,7 @@ llvm-devel/include/llvm/CodeGen/MachORelocation.h
llvm-devel/include/llvm/CodeGen/MachineBasicBlock.h
llvm-devel/include/llvm/CodeGen/MachineBlockFrequencyInfo.h
llvm-devel/include/llvm/CodeGen/MachineBranchProbabilityInfo.h
+llvm-devel/include/llvm/CodeGen/MachineCFGPrinter.h
llvm-devel/include/llvm/CodeGen/MachineCombinerPattern.h
llvm-devel/include/llvm/CodeGen/MachineConstantPool.h
llvm-devel/include/llvm/CodeGen/MachineCycleAnalysis.h
@@ -2628,6 +2630,7 @@ llvm-devel/include/llvm/CodeGen/WinEHFuncInfo.h
llvm-devel/include/llvm/Config/AsmParsers.def
llvm-devel/include/llvm/Config/AsmPrinters.def
llvm-devel/include/llvm/Config/Disassemblers.def
+llvm-devel/include/llvm/Config/TargetExegesis.def
llvm-devel/include/llvm/Config/TargetMCAs.def
llvm-devel/include/llvm/Config/Targets.def
llvm-devel/include/llvm/Config/abi-breaking.h
@@ -4094,6 +4097,7 @@ 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/Affine/ViewLikeInterfaceUtils.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
@@ -4320,6 +4324,7 @@ llvm-devel/include/llvm/XRay/YAMLXRayRecord.h
%%MLIR%%llvm-devel/include/mlir/Dialect/Linalg/IR/Linalg.h
%%MLIR%%llvm-devel/include/mlir/Dialect/Linalg/IR/LinalgBase.td
%%MLIR%%llvm-devel/include/mlir/Dialect/Linalg/IR/LinalgDoc.td
+%%MLIR%%llvm-devel/include/mlir/Dialect/Linalg/IR/LinalgEnums.td
%%MLIR%%llvm-devel/include/mlir/Dialect/Linalg/IR/LinalgInterfaces.cpp.inc
%%MLIR%%llvm-devel/include/mlir/Dialect/Linalg/IR/LinalgInterfaces.h
%%MLIR%%llvm-devel/include/mlir/Dialect/Linalg/IR/LinalgInterfaces.h.inc
@@ -4648,10 +4653,13 @@ llvm-devel/include/llvm/XRay/YAMLXRayRecord.h
%%MLIR%%llvm-devel/include/mlir/Dialect/Transform/Transforms/Passes.h
%%MLIR%%llvm-devel/include/mlir/Dialect/Transform/Transforms/Passes.h.inc
%%MLIR%%llvm-devel/include/mlir/Dialect/Transform/Transforms/Passes.td
+%%MLIR%%llvm-devel/include/mlir/Dialect/Utils/DialectUtilsEnums.cpp.inc
+%%MLIR%%llvm-devel/include/mlir/Dialect/Utils/DialectUtilsEnums.h.inc
%%MLIR%%llvm-devel/include/mlir/Dialect/Utils/IndexingUtils.h
%%MLIR%%llvm-devel/include/mlir/Dialect/Utils/ReshapeOpsUtils.h
%%MLIR%%llvm-devel/include/mlir/Dialect/Utils/StaticValueUtils.h
%%MLIR%%llvm-devel/include/mlir/Dialect/Utils/StructuredOpsUtils.h
+%%MLIR%%llvm-devel/include/mlir/Dialect/Utils/StructuredOpsUtils.td
%%MLIR%%llvm-devel/include/mlir/Dialect/Vector/IR/VectorOps.cpp.inc
%%MLIR%%llvm-devel/include/mlir/Dialect/Vector/IR/VectorOps.h
%%MLIR%%llvm-devel/include/mlir/Dialect/Vector/IR/VectorOps.h.inc
@@ -4941,6 +4949,7 @@ llvm-devel/include/llvm/XRay/YAMLXRayRecord.h
%%MLIR%%llvm-devel/include/mlir/Tools/PDLL/ODS/Operation.h
%%MLIR%%llvm-devel/include/mlir/Tools/PDLL/Parser/CodeComplete.h
%%MLIR%%llvm-devel/include/mlir/Tools/PDLL/Parser/Parser.h
+%%MLIR%%llvm-devel/include/mlir/Tools/ParseUtilties.h
%%MLIR%%llvm-devel/include/mlir/Tools/mlir-lsp-server/MlirLspServerMain.h
%%MLIR%%llvm-devel/include/mlir/Tools/mlir-opt/MlirOptMain.h
%%MLIR%%llvm-devel/include/mlir/Tools/mlir-pdll-lsp-server/MlirPdllLspServerMain.h
@@ -5193,6 +5202,7 @@ llvm-devel/lib/cmake/llvm/FindTerminfo.cmake
llvm-devel/lib/cmake/llvm/FindZ3.cmake
llvm-devel/lib/cmake/llvm/GenerateVersionFromVCS.cmake
llvm-devel/lib/cmake/llvm/GetErrcMessages.cmake
+llvm-devel/lib/cmake/llvm/GetHostTriple.cmake
llvm-devel/lib/cmake/llvm/GetLibraryName.cmake
llvm-devel/lib/cmake/llvm/HandleLLVMOptions.cmake
llvm-devel/lib/cmake/llvm/HandleLLVMStdlib.cmake
@@ -5684,7 +5694,7 @@ llvm-devel/lib/libRemarks.so.%%LLVM_MAJOR%%git
%%STATIC_LIBS%%%%CLANG%%llvm-devel/lib/libclangFrontendTool.a
%%STATIC_LIBS%%%%CLANG%%llvm-devel/lib/libclangHandleCXX.a
%%STATIC_LIBS%%%%CLANG%%llvm-devel/lib/libclangHandleLLVM.a
-%%STATIC_LIBS%%%%CLANG%%llvm-devel/lib/libclangIncludeCleaner.a
+%%STATIC_LIBS%%%%EXTRAS%%llvm-devel/lib/libclangIncludeCleaner.a
%%STATIC_LIBS%%%%EXTRAS%%llvm-devel/lib/libclangIncludeFixer.a
%%STATIC_LIBS%%%%EXTRAS%%llvm-devel/lib/libclangIncludeFixerPlugin.a
%%STATIC_LIBS%%%%CLANG%%llvm-devel/lib/libclangIndex.a
@@ -5693,10 +5703,10 @@ llvm-devel/lib/libRemarks.so.%%LLVM_MAJOR%%git
%%STATIC_LIBS%%%%CLANG%%llvm-devel/lib/libclangLex.a
%%STATIC_LIBS%%%%EXTRAS%%llvm-devel/lib/libclangMove.a
%%STATIC_LIBS%%%%CLANG%%llvm-devel/lib/libclangParse.a
-%%STATIC_LIBS%%%%CLANG%%llvm-devel/lib/libclangPseudo.a
-%%STATIC_LIBS%%%%CLANG%%llvm-devel/lib/libclangPseudoCLI.a
-%%STATIC_LIBS%%%%CLANG%%llvm-devel/lib/libclangPseudoCXX.a
-%%STATIC_LIBS%%%%CLANG%%llvm-devel/lib/libclangPseudoGrammar.a
+%%STATIC_LIBS%%%%EXTRAS%%llvm-devel/lib/libclangPseudo.a
+%%STATIC_LIBS%%%%EXTRAS%%llvm-devel/lib/libclangPseudoCLI.a
+%%STATIC_LIBS%%%%EXTRAS%%llvm-devel/lib/libclangPseudoCXX.a
+%%STATIC_LIBS%%%%EXTRAS%%llvm-devel/lib/libclangPseudoGrammar.a
%%STATIC_LIBS%%%%EXTRAS%%llvm-devel/lib/libclangQuery.a
%%STATIC_LIBS%%%%EXTRAS%%llvm-devel/lib/libclangReorderFields.a
%%STATIC_LIBS%%%%CLANG%%llvm-devel/lib/libclangRewrite.a