kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

devel/llvm-devel: update to a fresh snapshot

Browse source 
Fix builds with clang15 using with the patch applied to devel/llvm15 in
830bbdd84a.

PR:		268196
This commit is contained in:
Brooks Davis 2022-12-09 22:44:29 +00:00
parent d3fea590a1
commit e9c750b7ee
5 changed files with 64 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
devel/llvm-devel/Makefile
View file

@ -419,7 +419,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} == 20221128
.if ${SNAPDATE} == 20221209
# expected to be temporary
${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/flang-new \
${STAGEDIR}${LLVM_PREFIX}/bin/flang

4
devel/llvm-devel/Makefile.snapshot
View file

@ -4,6 +4,6 @@
#
LLVM_MAJOR= 16
LLVM_RELEASE= ${LLVM_MAJOR}.0.0
SNAPDATE= 20221128
SNAPDATE= 20221209
LLVM_PROJECT_COMMIT= 699ae92f045331b555394b8b9757d7e0fbf97100
LLVM_PROJECT_COMMIT= 1ebe8f4c45b8715c34c5a56e930694fa98478c93

6
devel/llvm-devel/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1669665195
SHA256 (llvm-llvm-project-16.0.d20221128-699ae92f045331b555394b8b9757d7e0fbf97100_GH0.tar.gz) = 69b62fe8b57384153e9001c8bd54085ca4a574693bb9eefa5d80d8938b941a83
SIZE (llvm-llvm-project-16.0.d20221128-699ae92f045331b555394b8b9757d7e0fbf97100_GH0.tar.gz) = 171578618
TIMESTAMP = 1670618386
SHA256 (llvm-llvm-project-16.0.d20221209-1ebe8f4c45b8715c34c5a56e930694fa98478c93_GH0.tar.gz) = 35cb1c028aaad79f3776e26f3cc19715ae9ad7292cd175a0fc4bf8aba699fe57
SIZE (llvm-llvm-project-16.0.d20221209-1ebe8f4c45b8715c34c5a56e930694fa98478c93_GH0.tar.gz) = 172174303

50
devel/llvm-devel/files/patch-compiler-rt_lib_builtins_CMakeLists.txt Normal file
View file

@ -0,0 +1,50 @@
--- compiler-rt/lib/builtins/CMakeLists.txt.orig 2022-11-29 10:05:58 UTC
+++ compiler-rt/lib/builtins/CMakeLists.txt
@@ -183,11 +183,14 @@ if(COMPILER_RT_HAS_BFLOAT16 AND NOT APPLE)
# Build BF16 files only when "__bf16" is available.
if(COMPILER_RT_HAS_BFLOAT16 AND NOT APPLE)
- set(GENERIC_SOURCES
- ${GENERIC_SOURCES}
+ set(GENERIC_BF_SOURCES
truncdfbf2.c
truncsfbf2.c
)
+ set(GENERIC_SOURCES
+ ${GENERIC_SOURCES}
+ ${GENERIC_BF_SOURCES}
+ )
endif()
# TODO: Several "tf" files (and divtc3.c, but not multc3.c) are in
@@ -360,6 +363,10 @@ if (NOT MSVC)
i386/chkstk2.S
)
endif()
+
+ if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+ list(REMOVE_ITEM i386_SOURCES ${GENERIC_BF_SOURCES})
+ endif()
else () # MSVC
# Use C versions of functions when building on MSVC
# MSVC's assembler takes Intel syntax, not AT&T syntax.
@@ -703,8 +710,6 @@ else ()
append_list_if(COMPILER_RT_ENABLE_CET -fcf-protection=full BUILTIN_CFLAGS)
endif()
- append_list_if(COMPILER_RT_HAS_FLOAT16 -DCOMPILER_RT_HAS_FLOAT16 BUILTIN_CFLAGS)
-
append_list_if(COMPILER_RT_HAS_STD_C11_FLAG -std=c11 BUILTIN_CFLAGS)
# These flags would normally be added to CMAKE_C_FLAGS by the llvm
@@ -775,6 +780,10 @@ else ()
)
set(deps_aarch64 lse_builtin_symlinks)
+ endif()
+
+ if(NOT (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" AND ${arch} STREQUAL "i386"))
+ append_list_if(COMPILER_RT_HAS_FLOAT16 -DCOMPILER_RT_HAS_FLOAT16 BUILTIN_CFLAGS)
endif()
add_compiler_rt_runtime(clang_rt.builtins

11
devel/llvm-devel/pkg-plist
View file

@ -529,6 +529,7 @@ llvm-devel/bin/verify-uselistorder
%%EXTRAS%%llvm-devel/include/clang-tidy/misc/UnusedAliasDeclsCheck.h
%%EXTRAS%%llvm-devel/include/clang-tidy/misc/UnusedParametersCheck.h
%%EXTRAS%%llvm-devel/include/clang-tidy/misc/UnusedUsingDeclsCheck.h
%%EXTRAS%%llvm-devel/include/clang-tidy/misc/UseAnonymousNamespaceCheck.h
%%EXTRAS%%llvm-devel/include/clang-tidy/modernize/AvoidBindCheck.h
%%EXTRAS%%llvm-devel/include/clang-tidy/modernize/AvoidCArraysCheck.h
%%EXTRAS%%llvm-devel/include/clang-tidy/modernize/ConcatNestedNamespacesCheck.h
@ -828,6 +829,7 @@ llvm-devel/bin/verify-uselistorder
%%CLANG%%llvm-devel/include/clang/Analysis/Analyses/ThreadSafetyTraverse.h
%%CLANG%%llvm-devel/include/clang/Analysis/Analyses/ThreadSafetyUtil.h
%%CLANG%%llvm-devel/include/clang/Analysis/Analyses/UninitializedValues.h
%%CLANG%%llvm-devel/include/clang/Analysis/Analyses/UnsafeBufferUsage.h
%%CLANG%%llvm-devel/include/clang/Analysis/AnalysisDeclContext.h
%%CLANG%%llvm-devel/include/clang/Analysis/AnalysisDiagnostic.h
%%CLANG%%llvm-devel/include/clang/Analysis/AnyCall.h
@ -957,6 +959,7 @@ llvm-devel/bin/verify-uselistorder
%%CLANG%%llvm-devel/include/clang/Basic/FileSystemOptions.h
%%CLANG%%llvm-devel/include/clang/Basic/FileSystemStatCache.h
%%CLANG%%llvm-devel/include/clang/Basic/HLSLRuntime.h
%%CLANG%%llvm-devel/include/clang/Basic/HeaderInclude.h
%%CLANG%%llvm-devel/include/clang/Basic/IdentifierTable.h
%%CLANG%%llvm-devel/include/clang/Basic/JsonSupport.h
%%CLANG%%llvm-devel/include/clang/Basic/LLVM.h
@ -1364,6 +1367,7 @@ llvm-devel/bin/verify-uselistorder
%%FLANG%%llvm-devel/include/flang/Common/bit-population-count.h
%%FLANG%%llvm-devel/include/flang/Common/constexpr-bitset.h
%%FLANG%%llvm-devel/include/flang/Common/default-kinds.h
%%FLANG%%llvm-devel/include/flang/Common/enum-class.h
%%FLANG%%llvm-devel/include/flang/Common/enum-set.h
%%FLANG%%llvm-devel/include/flang/Common/fast-int-set.h
%%FLANG%%llvm-devel/include/flang/Common/format.h
@ -2480,6 +2484,7 @@ llvm-devel/include/llvm/CodeGen/Analysis.h
llvm-devel/include/llvm/CodeGen/AntiDepBreaker.h
llvm-devel/include/llvm/CodeGen/AsmPrinter.h
llvm-devel/include/llvm/CodeGen/AsmPrinterHandler.h
llvm-devel/include/llvm/CodeGen/AssignmentTrackingAnalysis.h
llvm-devel/include/llvm/CodeGen/AtomicExpandUtils.h
llvm-devel/include/llvm/CodeGen/BasicBlockSectionUtils.h
llvm-devel/include/llvm/CodeGen/BasicBlockSectionsProfileReader.h
@ -4081,8 +4086,6 @@ llvm-devel/include/llvm/XRay/YAMLXRayRecord.h
%%MLIR%%llvm-devel/include/mlir/Conversion/LLVMCommon/TypeConverter.h
%%MLIR%%llvm-devel/include/mlir/Conversion/LLVMCommon/VectorPattern.h
%%MLIR%%llvm-devel/include/mlir/Conversion/LinalgToLLVM/LinalgToLLVM.h
%%MLIR%%llvm-devel/include/mlir/Conversion/LinalgToSPIRV/LinalgToSPIRV.h
%%MLIR%%llvm-devel/include/mlir/Conversion/LinalgToSPIRV/LinalgToSPIRVPass.h
%%MLIR%%llvm-devel/include/mlir/Conversion/LinalgToStandard/LinalgToStandard.h
%%MLIR%%llvm-devel/include/mlir/Conversion/MathToFuncs/MathToFuncs.h
%%MLIR%%llvm-devel/include/mlir/Conversion/MathToLLVM/MathToLLVM.h
@ -4657,6 +4660,7 @@ llvm-devel/include/llvm/XRay/YAMLXRayRecord.h
%%MLIR%%llvm-devel/include/mlir/Dialect/SPIRV/IR/SPIRVGLOps.td
%%MLIR%%llvm-devel/include/mlir/Dialect/SPIRV/IR/SPIRVGroupOps.td
%%MLIR%%llvm-devel/include/mlir/Dialect/SPIRV/IR/SPIRVImageOps.td
%%MLIR%%llvm-devel/include/mlir/Dialect/SPIRV/IR/SPIRVIntegerDotProductOps.td
%%MLIR%%llvm-devel/include/mlir/Dialect/SPIRV/IR/SPIRVJointMatrixOps.td
%%MLIR%%llvm-devel/include/mlir/Dialect/SPIRV/IR/SPIRVLogicalOps.td
%%MLIR%%llvm-devel/include/mlir/Dialect/SPIRV/IR/SPIRVMatrixOps.td
@ -4787,6 +4791,7 @@ llvm-devel/include/llvm/XRay/YAMLXRayRecord.h
%%MLIR%%llvm-devel/include/mlir/Dialect/Transform/IR/TransformTypes.h
%%MLIR%%llvm-devel/include/mlir/Dialect/Transform/IR/TransformTypes.h.inc
%%MLIR%%llvm-devel/include/mlir/Dialect/Transform/IR/TransformTypes.td
%%MLIR%%llvm-devel/include/mlir/Dialect/Transform/IR/TransformUtils.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
@ -5635,6 +5640,7 @@ llvm-devel/lib/libLTO.so.%%LLVM_MAJOR%%git
%%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRAsyncToLLVM.a
%%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRAsyncTransforms.a
%%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRBufferizationDialect.a
%%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRBufferizationTestPasses.a
%%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRBufferizationToMemRef.a
%%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRBufferizationTransformOps.a
%%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRBufferizationTransforms.a
@ -5711,7 +5717,6 @@ llvm-devel/lib/libLTO.so.%%LLVM_MAJOR%%git
%%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRLinalgDialect.a
%%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRLinalgTestPasses.a
%%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRLinalgToLLVM.a
%%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRLinalgToSPIRV.a
%%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRLinalgToStandard.a
%%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRLinalgTransformOps.a
%%STATIC_LIBS%%%%MLIR%%llvm-devel/lib/libMLIRLinalgTransforms.a