diff options
| author | wiz <wiz@pkgsrc.org> | 2021-11-23 20:55:42 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2021-11-23 20:55:42 +0000 |
| commit | f89f247d7f667a0b206d6ab3942b498075dc78ae (patch) | |
| tree | 7a7a5fb2be6f6146f467cb3b77ac92c99fbd5ee6 | |
| parent | 56c5e751ab6b834be202685f5ff325ad387d5e3c (diff) | |
| download | pkgsrc-f89f247d7f667a0b206d6ab3942b498075dc78ae.tar.gz | |
llvm: update llvm and friends to 13.0.0
Tested on NetBSD-current and 9.1/amd64.
Also update packages tightly coupled to llvm, if new versions are
available.
Mark creduce, include-what-you-use, and zig broken (waiting for a
new release).
Changes:
Non-comprehensive list of changes in this release
Windows Control-flow Enforcement Technology: the -ehcontguard
option now emits valid unwind entrypoints which are validated
when the context is being set during exception handling.
Flang is now included in the binary packages released by LLVM.
The debuginfo-test project has been renamed cross-project-tests
and is now intended for testing components from multiple
projects, not just debug information. The new “cross-project-tests”
name replaces “debuginfo-test” in LLVM_ENABLE_PROJECTS, and a
new check-cross-project-tests target has been added for running
all tests in the project. The pre-existing check-debuginfo-
test target remains for running just the debug information
tests. (D95339 and D96513)
Changes to the LLVM IR
The inalloca attribute now has a mandatory type field, similar
to byval and sret.
The opaque pointer type ptr has been introduced. It is still
in the process of being worked on and should not be used yet.
Using the legacy pass manager for the optimization pipeline is
deprecated and will be removed after LLVM 14. In the meantime,
only minimal effort will be made to maintain the legacy pass
manager for the optimization pipeline.
Changes to building LLVM
The build system now supports building multiple distributions,
so that you can e.g. have one distribution containing just
tools and another for libraries (to enable development). See
Multi-distribution configurations for details.
Changes to the AArch64 Backend
Introduced assembly support for Armv9-A’s Realm Management
Extension (RME) and Scalable Matrix Extension (SME).
Produce proper cross-section relative relocations on COFF
Fixed the calling convention on Windows for variadic functions
involving floats in the fixed arguments
Changes to the ARM Backend
Produce proper cross-section relative relocations on COFF
Changes to the Hexagon Target
The Hexagon target now supports V68/HVX ISA.
Changes to the C API
The C API functions LLVMGetAlignment and LLVMSetAlignment now
allow changing alignment on atomicrmw and cmpxchg instructions
A new entry LLVMDIArgListMetadataKind was added to the
LLVMMetadataKind enum, representing DIArgLists (D88175)
Type attributes have been added to LLVM-C, introducing
LLVMCreateTypeAttribute, LLVMGetTypeAttributeValue and
LLVMIsTypeAttribute. (D977763’)
The LTO_API_VERSION was bumped to 28, introducing a new function
lto_set_debug_options for parsing LTO debug options (D92611)
LLVMJITTargetSymbolFlags was renamed to LLVMJITSymbolTargetFlags
(rG8d718a0bff73af066675a6258c01307937c33cf9)
The C API received support for creating custom ORCv2
MaterializationUnits and APIs to retrieve an LLJIT instance’s
linking layers. An ABI breaking change for LLVMOrcAbsoluteSymbols
was introduced to make it consistent with
LLVMOrcCreateCustomMaterializationUnit.
(rGc8fc5e3ba942057d6c4cdcd1faeae69a28e7b671)
The C API received support for adding ORCv2 object buffers
directly to an object layer.
(rG7b73cd684a8d5fb44d34064200f10e2723085c33)
A breaking change to LLVMGetInlineAsm was introduced, adding
a ninth argument LLVMBool CanThrow (D95745)
The C API received support for calling into the new pass manager.
(D102136)
The C API function LLVMIntrinsicCopyOverloadedName has been
deprecated. Please migrate to LLVMIntrinsicCopyOverloadedName2
which takes an extra module argument and which also handles
unnamed types. (D99173)
The C API received support for dumping objects from ORCv2
(rGcec8e69f01c3374cb38c6683058381b96fab8f89)
A breaking change to LLVMOrcObjectTransformLayerTransformFunction
was introduced, changing the order of the function pointer’s
arguments. (rG8962c68ad007a525f9daa987c99eda57e0d0069a)
The C API received support for accessing utilities from the
LLJIT IRTransformLayer and ThreadSafeModule classes. (D103855)
The C API received support for creating lazy-export
MaterializationUnits (D104672)
The C API function LLVMPassBuilderOptionsSetCoroutines was
removed because couroutine passes have been enabled by default.
(D105877)
comdat noduplicates was renamed to comdat nodeduplicate and as
a result, LLVMNoDuplicatesComdatSelectionKind was renamed to
LLVMNoDeduplicateComdatSelectionKind. (D106319)
Changes to the FastISel infrastructure
FastISel no longer tracks killed registers, and instead leaves
this to the register allocator. This means that hasTrivialKill()
is removed, as well as the OpNIsKill parameters to the fastEmit_*()
family of functions.
Changes to the LLVM tools
The options --build-id-link-{dir,input,output} have been deleted.
(D96310)
Support for in-order processors has been added to llvm-mca.
(D94928)
llvm-objdump supports -M {att,intel} now. --x86-asm-syntax is
a deprecated internal option which will be removed in LLVM
14.0.0. (D101695)
The llvm-readobj short aliases -s (previously --sections) and
-t (previously --syms) have been changed to --syms and
--section-details respectively, to match llvm-readelf. (D105055)
The llvm-nm short aliases -M (--print-armap), -U (--defined-only),
and -W (--no-weak) are now deprecated. Use the long form versions
instead. The alias --just-symbol-name is now deprecated in
favor of --format=just-symbols and -j. (D105330)
In lli the default JIT engine switched from MCJIT (-jit-kind=mcjit)
to ORC (-jit-kind=orc). (D98931)
llvm-rc got support for invoking Clang to preprocess its input.
(D100755)
llvm-rc got a GNU windres compatible frontend, llvm-windres.
(D100756)
llvm-ml has improved compatibility with MS ml.exe, managing to
assemble more asm files.
Changes to LLDB
LLDB executable is now included in pre-built LLVM binaries.
LLDB now includes full featured support for AArch64 SVE register
access.
LLDB now supports AArch64 Pointer Authentication, allowing
stack unwind with signed return address.
LLDB now supports debugging programs on AArch64 Linux that use
memory tagging (MTE).
Added memory tag read and memory tag write commands.
The memory region command will note when a region has memory
tagging enabled.
Synchronous and asynchronous tag faults are recognised.
Synchronous tag faults have memory tag annotations in addition
to the usual fault address.
58 files changed, 902 insertions, 295 deletions
diff --git a/devel/creduce/Makefile b/devel/creduce/Makefile index eae8ce57512..c98fe89426c 100644 --- a/devel/creduce/Makefile +++ b/devel/creduce/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2021/07/14 09:08:48 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2021/11/23 20:55:42 wiz Exp $ DISTNAME= creduce-2.10.0 PKGREVISION= 8 @@ -17,6 +17,9 @@ DEPENDS+= p5-Term-ReadKey-[0-9]*:../../devel/p5-Term-ReadKey DEPENDS+= p5-Sys-CPU-[0-9]*:../../sysutils/p5-Sys-CPU DEPENDS+= p5-Regexp-Common-[0-9]*:../../textproc/p5-Regexp-Common +BROKEN= "Needs to be updated to work with llvm-13.0.0" +# https://github.com/csmith-project/creduce/issues/232 + USE_LANGUAGES= c c++14 USE_TOOLS+= flex perl:run gmake GNU_CONFIGURE= yes diff --git a/devel/include-what-you-use/Makefile b/devel/include-what-you-use/Makefile index 4d9f9b9679e..bcc84fbe4ef 100644 --- a/devel/include-what-you-use/Makefile +++ b/devel/include-what-you-use/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2021/07/12 18:49:29 adam Exp $ +# $NetBSD: Makefile,v 1.26 2021/11/23 20:55:42 wiz Exp $ DISTNAME= include-what-you-use-0.16.src PKGNAME= ${DISTNAME:S/.src//1} @@ -18,6 +18,9 @@ GCC_REQD+= 5 CMAKE_ARGS= -DIWYU_LLVM_ROOT_PATH:PATH=${BUILDLINK_PREFIX.clang} +BROKEN= "Needs to be updated for llvm-13.0.0" +# https://github.com/include-what-you-use/include-what-you-use/issues/974 + REPLACE_PYTHON= *.py .include "../../lang/clang/buildlink3.mk" diff --git a/devel/lld/PLIST b/devel/lld/PLIST index fdc210501a0..0fdae855683 100644 --- a/devel/lld/PLIST +++ b/devel/lld/PLIST @@ -1,11 +1,13 @@ -@comment $NetBSD: PLIST,v 1.5 2021/07/12 18:47:15 adam Exp $ +@comment $NetBSD: PLIST,v 1.6 2021/11/23 20:55:42 wiz Exp $ bin/ld.lld bin/ld64.lld bin/ld64.lld.darwinnew +bin/ld64.lld.darwinold bin/lld bin/lld-link bin/wasm-ld include/lld/Common/Args.h +include/lld/Common/Arrays.h include/lld/Common/DWARF.h include/lld/Common/Driver.h include/lld/Common/ErrorHandler.h diff --git a/devel/lld/distinfo b/devel/lld/distinfo index 0c0aa788b21..5ce28cc4e12 100644 --- a/devel/lld/distinfo +++ b/devel/lld/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.14 2021/10/26 10:15:31 nia Exp $ +$NetBSD: distinfo,v 1.15 2021/11/23 20:55:42 wiz Exp $ -BLAKE2s (lld-12.0.1.src.tar.xz) = 053b3f43cdd958fbac2d06391c460818b379239bca55238a24aec4540fb895e7 -SHA512 (lld-12.0.1.src.tar.xz) = 4292e45c54f61b8bf8b0a412f1423e062fb7c88ab3d143de3bccf010ea84fcf672ec432068a6adc461f605993d5c4e7e720e9b719d7bf8cbe670115f75e1fb2a -Size (lld-12.0.1.src.tar.xz) = 1351580 bytes +BLAKE2s (lld-13.0.0.src.tar.xz) = 6b5bc74bd7873eba4da52b895740e406cac305cd647bdd07428b8578b10052fc +SHA512 (lld-13.0.0.src.tar.xz) = bec719dd7349eb5e9d2d5f2dcbb3f63c4756b0ee82aef228f9fa2bf4e6913596aacb4a0dd8d66146b7e81432c51d811ec8cf211fe67d2de74747938d3543d54d +Size (lld-13.0.0.src.tar.xz) = 1472476 bytes SHA1 (patch-CMakeLists.txt) = 32163a5bcd7d9456065e48ef6e6f0e2c3380a820 SHA1 (patch-ELF_Config.h) = c449bf971088da671df5da507347fe8dc8c9da82 -SHA1 (patch-ELF_Driver.cpp) = 7de88cf37fb7045fb2af73faaeac79d6880ddb52 SHA1 (patch-ELF_Options.td) = 22a1f293681b86a9aac87624efcfeeb20a4ba51c diff --git a/devel/lld/patches/patch-ELF_Driver.cpp b/devel/lld/patches/patch-ELF_Driver.cpp deleted file mode 100644 index bc15e6924d0..00000000000 --- a/devel/lld/patches/patch-ELF_Driver.cpp +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-ELF_Driver.cpp,v 1.9 2021/07/12 18:47:15 adam Exp $ - -Add dummy option for an AArch64 erratum. - ---- ELF/Driver.cpp.orig 2020-10-07 10:10:48.000000000 +0000 -+++ ELF/Driver.cpp -@@ -135,7 +135,7 @@ static std::tuple<ELFKind, uint16_t, uin - std::pair<ELFKind, uint16_t> ret = - StringSwitch<std::pair<ELFKind, uint16_t>>(s) - .Cases("aarch64elf", "aarch64linux", "aarch64_elf64_le_vec", -- {ELF64LEKind, EM_AARCH64}) -+ "aarch64nbsd", {ELF64LEKind, EM_AARCH64}) - .Cases("armelf", "armelf_linux_eabi", {ELF32LEKind, EM_ARM}) - .Case("elf32_x86_64", {ELF32LEKind, EM_X86_64}) - .Cases("elf32btsmip", "elf32btsmipn32", {ELF32BEKind, EM_MIPS}) -@@ -300,6 +300,9 @@ static void checkOptions() { - if (config->emachine == EM_MIPS && config->gnuHash) - error("the .gnu.hash section is not compatible with the MIPS target"); - -+ if (config->fixCortexA53Errata835769 && config->emachine != EM_AARCH64) -+ error("--fix-cortex-a53-835769 is only supported on AArch64 targets"); -+ - if (config->fixCortexA53Errata843419 && config->emachine != EM_AARCH64) - error("--fix-cortex-a53-843419 is only supported on AArch64 targets"); - -@@ -937,6 +940,8 @@ static void readConfigs(opt::InputArgLis - args.hasFlag(OPT_export_dynamic, OPT_no_export_dynamic, false); - config->filterList = args::getStrings(args, OPT_filter); - config->fini = args.getLastArgValue(OPT_fini, "_fini"); -+ config->fixCortexA53Errata835769 = args.hasArg(OPT_fix_cortex_a53_843419) && -+ !args.hasArg(OPT_relocatable); - config->fixCortexA53Errata843419 = args.hasArg(OPT_fix_cortex_a53_843419) && - !args.hasArg(OPT_relocatable); - config->fixCortexA8 = diff --git a/devel/lldb/PLIST b/devel/lldb/PLIST index 4f157772639..188d4b0266c 100644 --- a/devel/lldb/PLIST +++ b/devel/lldb/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.13 2021/07/12 18:47:15 adam Exp $ +@comment $NetBSD: PLIST,v 1.14 2021/11/23 20:55:42 wiz Exp $ bin/lldb bin/lldb-argdumper bin/lldb-instr @@ -61,7 +61,6 @@ include/lldb/API/SBThread.h include/lldb/API/SBThreadCollection.h include/lldb/API/SBThreadPlan.h include/lldb/API/SBTrace.h -include/lldb/API/SBTraceOptions.h include/lldb/API/SBType.h include/lldb/API/SBTypeCategory.h include/lldb/API/SBTypeEnumMember.h @@ -104,10 +103,10 @@ include/lldb/Core/Address.h include/lldb/Core/AddressRange.h include/lldb/Core/AddressResolver.h include/lldb/Core/AddressResolverFileLine.h -include/lldb/Core/AddressResolverName.h include/lldb/Core/Architecture.h include/lldb/Core/Communication.h include/lldb/Core/Debugger.h +include/lldb/Core/Declaration.h include/lldb/Core/Disassembler.h include/lldb/Core/DumpDataExtractor.h include/lldb/Core/DumpRegisterValue.h @@ -129,9 +128,11 @@ include/lldb/Core/ModuleSpec.h include/lldb/Core/Opcode.h include/lldb/Core/PluginInterface.h include/lldb/Core/PluginManager.h +include/lldb/Core/Progress.h include/lldb/Core/RichManglingContext.h include/lldb/Core/SearchFilter.h include/lldb/Core/Section.h +include/lldb/Core/SourceLocationSpec.h include/lldb/Core/SourceManager.h include/lldb/Core/StreamAsynchronousIO.h include/lldb/Core/StreamBuffer.h @@ -155,6 +156,7 @@ include/lldb/Core/ValueObjectList.h include/lldb/Core/ValueObjectMemory.h include/lldb/Core/ValueObjectRegister.h include/lldb/Core/ValueObjectSyntheticFilter.h +include/lldb/Core/ValueObjectUpdater.h include/lldb/Core/ValueObjectVariable.h include/lldb/Core/dwarf.h include/lldb/DataFormatters/CXXFunctionPointer.h @@ -244,6 +246,7 @@ include/lldb/Host/common/TCPSocket.h include/lldb/Host/common/UDPSocket.h include/lldb/Host/freebsd/HostInfoFreeBSD.h include/lldb/Host/linux/AbstractSocket.h +include/lldb/Host/linux/Host.h include/lldb/Host/linux/HostInfoLinux.h include/lldb/Host/linux/Ptrace.h include/lldb/Host/linux/Support.h @@ -270,7 +273,6 @@ include/lldb/Host/windows/LockFileWindows.h include/lldb/Host/windows/PipeWindows.h include/lldb/Host/windows/PosixApi.h include/lldb/Host/windows/ProcessLauncherWindows.h -include/lldb/Host/windows/editlinewin.h include/lldb/Host/windows/windows.h include/lldb/Initialization/SystemInitializer.h include/lldb/Initialization/SystemInitializerCommon.h @@ -322,6 +324,7 @@ include/lldb/Interpreter/OptionValues.h include/lldb/Interpreter/Options.h include/lldb/Interpreter/Property.h include/lldb/Interpreter/ScriptInterpreter.h +include/lldb/Interpreter/ScriptedProcessInterface.h include/lldb/Symbol/ArmUnwindInfo.h include/lldb/Symbol/Block.h include/lldb/Symbol/CallFrameInfo.h @@ -333,7 +336,6 @@ include/lldb/Symbol/CompilerType.h include/lldb/Symbol/DWARFCallFrameInfo.h include/lldb/Symbol/DebugMacros.h include/lldb/Symbol/DeclVendor.h -include/lldb/Symbol/Declaration.h include/lldb/Symbol/FuncUnwinders.h include/lldb/Symbol/Function.h include/lldb/Symbol/LineEntry.h @@ -372,6 +374,7 @@ include/lldb/Target/LanguageRuntime.h include/lldb/Target/Memory.h include/lldb/Target/MemoryHistory.h include/lldb/Target/MemoryRegionInfo.h +include/lldb/Target/MemoryTagManager.h include/lldb/Target/ModuleCache.h include/lldb/Target/OperatingSystem.h include/lldb/Target/PathMappingList.h @@ -423,9 +426,10 @@ include/lldb/Target/ThreadPlanStepThrough.h include/lldb/Target/ThreadPlanStepUntil.h include/lldb/Target/ThreadPlanTracer.h include/lldb/Target/ThreadSpec.h -include/lldb/Target/ThreadTrace.h include/lldb/Target/Trace.h -include/lldb/Target/TraceSessionFileParser.h +include/lldb/Target/TraceCursor.h +include/lldb/Target/TraceExporter.h +include/lldb/Target/TraceInstructionDumper.h include/lldb/Target/UnixSignals.h include/lldb/Target/Unwind.h include/lldb/Target/UnwindAssembly.h @@ -435,6 +439,7 @@ include/lldb/Utility/ArchSpec.h include/lldb/Utility/Args.h include/lldb/Utility/Baton.h include/lldb/Utility/Broadcaster.h +include/lldb/Utility/Cloneable.h include/lldb/Utility/CompletionRequest.h include/lldb/Utility/Connection.h include/lldb/Utility/ConstString.h @@ -482,7 +487,8 @@ include/lldb/Utility/StructuredData.h include/lldb/Utility/TildeExpressionResolver.h include/lldb/Utility/Timeout.h include/lldb/Utility/Timer.h -include/lldb/Utility/TraceOptions.h +include/lldb/Utility/TraceGDBRemotePackets.h +include/lldb/Utility/TraceIntelPTGDBRemotePackets.h include/lldb/Utility/UUID.h include/lldb/Utility/UnimplementedError.h include/lldb/Utility/UriParser.h @@ -504,8 +510,8 @@ include/lldb/lldb-public.h include/lldb/lldb-types.h include/lldb/lldb-versioning.h lib/liblldb.so +lib/liblldb.so.13 lib/liblldb.so.${PKGVERSION} -${PLIST.posix}lib/liblldb.so.12 ${PYSITELIB}/lldb/__init__.py ${PYSITELIB}/lldb/_lldb.so ${PYSITELIB}/lldb/embedded_interpreter.py @@ -519,6 +525,8 @@ ${PYSITELIB}/lldb/formatters/cpp/libcxx.py ${PYSITELIB}/lldb/formatters/metrics.py ${PYSITELIB}/lldb/formatters/synth.py ${PYSITELIB}/lldb/lldb-argdumper +${PYSITELIB}/lldb/plugins/__init__.py +${PYSITELIB}/lldb/plugins/scripted_process.py ${PYSITELIB}/lldb/utils/__init__.py ${PYSITELIB}/lldb/utils/in_call_stack.py ${PYSITELIB}/lldb/utils/symbolication.py diff --git a/devel/lldb/distinfo b/devel/lldb/distinfo index 132e875d600..63d92677d69 100644 --- a/devel/lldb/distinfo +++ b/devel/lldb/distinfo @@ -1,10 +1,9 @@ -$NetBSD: distinfo,v 1.27 2021/10/26 10:15:31 nia Exp $ +$NetBSD: distinfo,v 1.28 2021/11/23 20:55:42 wiz Exp $ -BLAKE2s (lldb-12.0.1.src.tar.xz) = ff0db22ac57be181a7e5eee5129f00dfa6654f489ebfca0ccd21a0b86ccf3401 -SHA512 (lldb-12.0.1.src.tar.xz) = df3c8e088bf69fb843cd7365fd2df4cefb72c9a313511fb0d0fa3e06e7d12cada35a1d621ec4312c99799e68ff76955423993ce0310c58f74ccd5151984f38ee -Size (lldb-12.0.1.src.tar.xz) = 9837800 bytes +BLAKE2s (lldb-13.0.0.src.tar.xz) = bf5efb18d7fecca9d964b4939029a844d8bddbbd2252ba74178f923b63c1cb75 +SHA512 (lldb-13.0.0.src.tar.xz) = 4f3484dc3da7a303e395ec67c812f93b87b626ee3f5cd21fc065942b35a2355bfc034eaaed4a26a13a337bdf86cf4f08d722182432917ee418a5c964c6037a9c +Size (lldb-13.0.0.src.tar.xz) = 9905788 bytes SHA1 (patch-cmake_modules_LLDBStandalone.cmake) = 55a8d614cc52872968fc7c7c205c7d6e4021b538 SHA1 (patch-source_API_CMakeLists.txt) = edc7bdaa39436dd8df6c5e8172f39c5329fa8cb2 -SHA1 (patch-source_Plugins_ObjectFile_Mach-O_ObjectFileMachO.cpp) = 8c7047e88223724c7800e1c4399885ab704b49ff SHA1 (patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.cpp) = b2fcd2a6fbe7c9c514df657d60b21a93d9d4667c SHA1 (patch-source_Plugins_Process_NetBSD_NativeProcessNetBSD.h) = 1a01bed99b146a7c3e8bcdc559dc2755f997ac4c diff --git a/devel/lldb/patches/patch-source_Plugins_ObjectFile_Mach-O_ObjectFileMachO.cpp b/devel/lldb/patches/patch-source_Plugins_ObjectFile_Mach-O_ObjectFileMachO.cpp deleted file mode 100644 index d846438b532..00000000000 --- a/devel/lldb/patches/patch-source_Plugins_ObjectFile_Mach-O_ObjectFileMachO.cpp +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-source_Plugins_ObjectFile_Mach-O_ObjectFileMachO.cpp,v 1.1 2021/09/20 15:53:01 adam Exp $ - ---- source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp.orig 2021-03-04 11:38:58.000000000 +0000 -+++ source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp -@@ -2596,7 +2596,7 @@ size_t ObjectFileMachO::ParseSymtab() { - typedef std::set<ConstString> IndirectSymbols; - IndirectSymbols indirect_symbol_names; - --#if defined(__APPLE__) && TARGET_OS_EMBEDDED -+#if defined(__APPLE__) && defined(TARGET_OS_EMBEDDED) - - // Some recent builds of the dyld_shared_cache (hereafter: DSC) have been - // optimized by moving LOCAL symbols out of the memory mapped portion of diff --git a/devel/polly/PLIST b/devel/polly/PLIST index 5de9f299c85..388c324c522 100644 --- a/devel/polly/PLIST +++ b/devel/polly/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2019/10/19 14:01:36 adam Exp $ +@comment $NetBSD: PLIST,v 1.8 2021/11/23 20:55:42 wiz Exp $ include/polly/Canonicalization.h include/polly/CodeGen/BlockGenerators.h include/polly/CodeGen/CodeGeneration.h @@ -17,16 +17,20 @@ include/polly/CodeGen/Utils.h include/polly/CodePreparation.h include/polly/Config/config.h include/polly/DeLICM.h +include/polly/DeadCodeElimination.h include/polly/DependenceInfo.h include/polly/FlattenAlgo.h include/polly/FlattenSchedule.h include/polly/ForwardOpTree.h include/polly/JSONExporter.h include/polly/LinkAllPasses.h +include/polly/ManualOptimizer.h +include/polly/MatmulOptimizer.h include/polly/Options.h include/polly/PolyhedralInfo.h include/polly/PruneUnprofitable.h include/polly/RegisterPasses.h +include/polly/RewriteByReferenceParameters.h include/polly/ScheduleOptimizer.h include/polly/ScheduleTreeTransform.h include/polly/ScopBuilder.h @@ -100,6 +104,7 @@ include/polly/isl/space_type.h include/polly/isl/stdint.h include/polly/isl/stream.h include/polly/isl/stride_info.h +include/polly/isl/typed_cpp.h include/polly/isl/union_map.h include/polly/isl/union_map_type.h include/polly/isl/union_set.h @@ -115,4 +120,3 @@ lib/cmake/polly/PollyConfig.cmake lib/cmake/polly/PollyExports-all.cmake lib/libPolly.a lib/libPollyISL.a -lib/libPollyPPCG.a diff --git a/devel/polly/distinfo b/devel/polly/distinfo index 64ffb33d467..5c3ecf909d8 100644 --- a/devel/polly/distinfo +++ b/devel/polly/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.21 2021/10/26 10:18:05 nia Exp $ +$NetBSD: distinfo,v 1.22 2021/11/23 20:55:42 wiz Exp $ -BLAKE2s (polly-12.0.1.src.tar.xz) = ee5471cd30e8d35505dbc01d77c12fb1649cff76c6fd244608a7937c5155b105 -SHA512 (polly-12.0.1.src.tar.xz) = 91fa3c540798faa0c1b1315798a49cbb5df25eb435186c2913845704d96e2fdd9190925670e99d4cc2be4f30cfa3bafe58d45f7a4f02655e0b1fc7d5c2537847 -Size (polly-12.0.1.src.tar.xz) = 9034612 bytes +BLAKE2s (polly-13.0.0.src.tar.xz) = fd690aaf8bf9ee57ce84dc5c6a49282a32b685f47b8ad8fe16ffaca6ae2dbc23 +SHA512 (polly-13.0.0.src.tar.xz) = e20b4da2f9b4dba3d3487b39e844d2e1e5fffc2d84b5dd12818324b9a479b2fa6c5f5182898db8f00b0509ff363b3784ec105eadf76b61168d16fcc06119b8c8 +Size (polly-13.0.0.src.tar.xz) = 9186852 bytes SHA1 (patch-CMakeLists.txt) = 8138e11f858f23e0069c8fa0c07eff2b7aaf8c43 -SHA1 (patch-lib_External_isl_configure) = 97c83ab1d2f83e60ab39b41cf055c18074167e66 diff --git a/devel/polly/patches/patch-lib_External_isl_configure b/devel/polly/patches/patch-lib_External_isl_configure deleted file mode 100644 index 68d8a87712e..00000000000 --- a/devel/polly/patches/patch-lib_External_isl_configure +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-lib_External_isl_configure,v 1.3 2017/12/01 19:22:12 adam Exp $ - -Fix shell portability issue. - ---- lib/External/isl/configure.orig 2017-07-04 15:54:11.000000000 +0000 -+++ lib/External/isl/configure -@@ -18843,7 +18843,7 @@ else - HAVE_CXX11_FALSE= - fi - -- if test "x$with_int" == "ximath-32"; then -+ if test "x$with_int" = "ximath-32"; then - SMALL_INT_OPT_TRUE= - SMALL_INT_OPT_FALSE='#' - else -@@ -18851,7 +18851,7 @@ else - SMALL_INT_OPT_FALSE= - fi - --if test "x$with_int" == "ximath-32"; then : -+if test "x$with_int" = "ximath-32"; then : - - - $as_echo "#define USE_SMALL_INT_OPT /**/" >>confdefs.h -@@ -23261,4 +23261,3 @@ if test -n "$ac_unrecognized_opts" && te - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 - $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} - fi -- diff --git a/lang/clang-tools-extra/PLIST b/lang/clang-tools-extra/PLIST index b194e5f935f..e546a54698a 100644 --- a/lang/clang-tools-extra/PLIST +++ b/lang/clang-tools-extra/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2021/07/12 18:45:07 adam Exp $ +@comment $NetBSD: PLIST,v 1.5 2021/11/23 20:55:43 wiz Exp $ bin/clang-apply-replacements bin/clang-change-namespace bin/clang-doc @@ -11,6 +11,7 @@ bin/clangd bin/find-all-symbols bin/modularize bin/pp-trace +bin/run-clang-tidy include/clang-tidy/ClangTidy.h include/clang-tidy/ClangTidyCheck.h include/clang-tidy/ClangTidyDiagnosticConsumer.h @@ -41,9 +42,11 @@ include/clang-tidy/abseil/StringFindStrContainsCheck.h include/clang-tidy/abseil/TimeComparisonCheck.h include/clang-tidy/abseil/TimeSubtractionCheck.h include/clang-tidy/abseil/UpgradeDurationConversionsCheck.h +include/clang-tidy/altera/IdDependentBackwardBranchCheck.h include/clang-tidy/altera/KernelNameRestrictionCheck.h include/clang-tidy/altera/SingleWorkItemBarrierCheck.h include/clang-tidy/altera/StructPackAlignCheck.h +include/clang-tidy/altera/UnrollLoopsCheck.h include/clang-tidy/android/CloexecAccept4Check.h include/clang-tidy/android/CloexecAcceptCheck.h include/clang-tidy/android/CloexecCheck.h @@ -69,10 +72,12 @@ include/clang-tidy/bugprone/BranchCloneCheck.h include/clang-tidy/bugprone/CopyConstructorInitCheck.h include/clang-tidy/bugprone/DanglingHandleCheck.h include/clang-tidy/bugprone/DynamicStaticInitializersCheck.h +include/clang-tidy/bugprone/EasilySwappableParametersCheck.h include/clang-tidy/bugprone/ExceptionEscapeCheck.h include/clang-tidy/bugprone/FoldInitTypeCheck.h include/clang-tidy/bugprone/ForwardDeclarationNamespaceCheck.h include/clang-tidy/bugprone/ForwardingReferenceOverloadCheck.h +include/clang-tidy/bugprone/ImplicitWideningOfMultiplicationResultCheck.h include/clang-tidy/bugprone/InaccurateEraseCheck.h include/clang-tidy/bugprone/IncorrectRoundingsCheck.h include/clang-tidy/bugprone/InfiniteLoopCheck.h @@ -111,6 +116,7 @@ include/clang-tidy/bugprone/ThrowKeywordMissingCheck.h include/clang-tidy/bugprone/TooSmallLoopVariableCheck.h include/clang-tidy/bugprone/UndefinedMemoryManipulationCheck.h include/clang-tidy/bugprone/UndelegatedConstructorCheck.h +include/clang-tidy/bugprone/UnhandledExceptionAtNewCheck.h include/clang-tidy/bugprone/UnhandledSelfAssignmentCheck.h include/clang-tidy/bugprone/UnusedRaiiCheck.h include/clang-tidy/bugprone/UnusedReturnValueCheck.h @@ -131,6 +137,7 @@ include/clang-tidy/cert/StrToNumCheck.h include/clang-tidy/cert/ThrownExceptionTypeCheck.h include/clang-tidy/cert/VariadicFunctionDefCheck.h include/clang-tidy/concurrency/MtUnsafeCheck.h +include/clang-tidy/concurrency/ThreadCanceltypeAsynchronousCheck.h include/clang-tidy/cppcoreguidelines/AvoidGotoCheck.h include/clang-tidy/cppcoreguidelines/AvoidNonConstGlobalVariablesCheck.h include/clang-tidy/cppcoreguidelines/InitVariablesCheck.h @@ -139,6 +146,7 @@ include/clang-tidy/cppcoreguidelines/MacroUsageCheck.h include/clang-tidy/cppcoreguidelines/NarrowingConversionsCheck.h include/clang-tidy/cppcoreguidelines/NoMallocCheck.h include/clang-tidy/cppcoreguidelines/OwningMemoryCheck.h +include/clang-tidy/cppcoreguidelines/PreferMemberInitializerCheck.h include/clang-tidy/cppcoreguidelines/ProBoundsArrayToPointerDecayCheck.h include/clang-tidy/cppcoreguidelines/ProBoundsConstantArrayIndexCheck.h include/clang-tidy/cppcoreguidelines/ProBoundsPointerArithmeticCheck.h @@ -270,7 +278,6 @@ include/clang-tidy/readability/ConstReturnTypeCheck.h include/clang-tidy/readability/ContainerSizeEmptyCheck.h include/clang-tidy/readability/ConvertMemberFunctionsToStatic.h include/clang-tidy/readability/DeleteNullPointerCheck.h -include/clang-tidy/readability/DeletedDefaultCheck.h include/clang-tidy/readability/ElseAfterReturnCheck.h include/clang-tidy/readability/FunctionCognitiveComplexityCheck.h include/clang-tidy/readability/FunctionSizeCheck.h @@ -300,6 +307,7 @@ include/clang-tidy/readability/SimplifySubscriptExprCheck.h include/clang-tidy/readability/StaticAccessedThroughInstanceCheck.h include/clang-tidy/readability/StaticDefinitionInAnonymousNamespaceCheck.h include/clang-tidy/readability/StringCompareCheck.h +include/clang-tidy/readability/SuspiciousCallArgumentCheck.h include/clang-tidy/readability/UniqueptrDeleteReleaseCheck.h include/clang-tidy/readability/UppercaseLiteralSuffixCheck.h include/clang-tidy/readability/UseAnyOfAllOfCheck.h @@ -369,5 +377,5 @@ share/clang/clang-include-fixer.el share/clang/clang-include-fixer.py share/clang/clang-tidy-diff.py share/clang/index.js -share/clang/run-clang-tidy.py share/clang/run-find-all-symbols.py +@pkgdir include/clang-tidy/plugin diff --git a/lang/clang-tools-extra/distinfo b/lang/clang-tools-extra/distinfo index 64db2e964f7..705be52d2ce 100644 --- a/lang/clang-tools-extra/distinfo +++ b/lang/clang-tools-extra/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.10 2021/10/26 10:51:32 nia Exp $ +$NetBSD: distinfo,v 1.11 2021/11/23 20:55:43 wiz Exp $ -BLAKE2s (clang-12.0.1.src.tar.xz) = 92c1821dcbffbcaa1784dc583fef539de64c05985c3bacbb1524269db3e8d8bf -SHA512 (clang-12.0.1.src.tar.xz) = 405011f0974b239427ca87c65e7485709c77705a9b7d51d679fe2abec79865f8c51c7ab085b4e6bf7aa4d0eade4b1438d88dd5feb56b434dc5d718ebf5715efa -Size (clang-12.0.1.src.tar.xz) = 15323860 bytes -BLAKE2s (clang-tools-extra-12.0.1.src.tar.xz) = 5ad205df6002ceb3e46f6cbba5115a66764264be3591800030f22288637c1bdd -SHA512 (clang-tools-extra-12.0.1.src.tar.xz) = be4975c81c83f98deb5f6e0cc170fb6740bc46396d5bd8f25b55270ed874bb099b6d6f0e413617396f5ab67182314735580f44be1913d9be44ae288cf8c4fd7c -Size (clang-tools-extra-12.0.1.src.tar.xz) = 2635020 bytes +BLAKE2s (clang-13.0.0.src.tar.xz) = 3a07b8456c7bb3e6a5446d01dbe7606cd0caeacc38606dd59632d14f89480850 +SHA512 (clang-13.0.0.src.tar.xz) = b9ae85a7f0a66ae42a6d76a4e1ea0940bf622f7fbd21d078c9fef146087c70abb0a597a1cfda4e8706b1fbc74d170986451f5f2d642f685a5c355da8a572fb26 +Size (clang-13.0.0.src.tar.xz) = 17846828 bytes +BLAKE2s (clang-tools-extra-13.0.0.src.tar.xz) = a12640fb25de58756a06a14505a1dbae47d986d0b3521c5f5ed9ea1b6233017f +SHA512 (clang-tools-extra-13.0.0.src.tar.xz) = e8fc33441b6845984f3d1c947efb48f141700ebb4c146323d78eb6e28e36042f3d7179abfcfad2ec1c2c1a0bd3e5ef55ceda2c20fcc794b895cfe732fb095f2a +Size (clang-tools-extra-13.0.0.src.tar.xz) = 2739604 bytes diff --git a/lang/clang/Makefile b/lang/clang/Makefile index e36a0ea0dcb..3e5ba6bc96a 100644 --- a/lang/clang/Makefile +++ b/lang/clang/Makefile @@ -1,15 +1,9 @@ -# $NetBSD: Makefile,v 1.64 2021/07/12 18:42:06 adam Exp $ +# $NetBSD: Makefile,v 1.65 2021/11/23 20:55:43 wiz Exp $ .include "Makefile.common" PKGNAME= ${DISTNAME:S/.src//} -PYTHON_FOR_BUILD_ONLY= yes - USE_TOOLS+= perl:run -# There are some contrib utilities written in python here. -# We don't want to add a python runtime dependency for that. -CHECK_INTERPRETER_SKIP+= share/clang/* - .include "../../mk/bsd.pkg.mk" diff --git a/lang/clang/Makefile.common b/lang/clang/Makefile.common index 26240f08a72..96685ea271e 100644 --- a/lang/clang/Makefile.common +++ b/lang/clang/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.46 2020/07/02 10:45:38 wiz Exp $ +# $NetBSD: Makefile.common,v 1.47 2021/11/23 20:55:43 wiz Exp $ # used by lang/clang/Makefile # used by lang/clang-tools-extra/Makefile @@ -31,6 +31,13 @@ CMAKE_ARGS.Darwin+= -DCMAKE_LIBTOOL=/usr/bin/libtool CMAKE_ARGS.Darwin+= -DDEFAULT_SYSROOT=${OSX_SDK_PATH:Q} .endif +# NetBSD < 10 did not provide ENOTRECOVERABLE +# https://bugs.llvm.org/show_bug.cgi?id=52587 +.if ${OPSYS} == "NetBSD" && !empty(OS_VERSION:M[123456789].*) +CXXFLAGS+= -D_GLIBCXX_HAVE_ENOTRECOVERABLE=1 +CXXFLAGS+= -DENOTRECOVERABLE=98 +.endif + REPLACE_PERL+= test/make_test_dirs.pl REPLACE_PERL+= tools/scan-build/bin/scan-build REPLACE_PERL+= tools/scan-build/libexec/c++-analyzer @@ -44,10 +51,24 @@ REPLACE_PYTHON+= bindings/python/examples/cindex/cindex-dump.py REPLACE_PYTHON+= bindings/python/examples/cindex/cindex-includes.py REPLACE_PYTHON+= docs/tools/dump_ast_matchers.py REPLACE_PYTHON+= docs/tools/dump_format_style.py +REPLACE_PYTHON+= docs/tools/generate_formatted_state.py +REPLACE_PYTHON+= lib/Tooling/DumpTool/generate_cxx_src_locs.py +REPLACE_PYTHON+= test/AST/gen_ast_dump_json_test.py +REPLACE_PYTHON+= test/Analysis/check-analyzer-fixit.py +REPLACE_PYTHON+= test/Driver/check-time-trace-sections.py REPLACE_PYTHON+= tools/clang-format/clang-format-diff.py REPLACE_PYTHON+= tools/clang-format/git-clang-format +REPLACE_PYTHON+= tools/scan-build-py/bin/analyze-build +REPLACE_PYTHON+= tools/scan-build-py/bin/intercept-build +REPLACE_PYTHON+= tools/scan-build-py/bin/scan-build +REPLACE_PYTHON+= tools/scan-build-py/libexec/analyze-c++ +REPLACE_PYTHON+= tools/scan-build-py/libexec/analyze-cc +REPLACE_PYTHON+= tools/scan-build-py/libexec/intercept-c++ +REPLACE_PYTHON+= tools/scan-build-py/libexec/intercept-cc REPLACE_PYTHON+= tools/scan-build/bin/set-xcode-analyzer REPLACE_PYTHON+= tools/scan-view/bin/scan-view +REPLACE_PYTHON+= tools/scan-view/share/Reporter.py +REPLACE_PYTHON+= tools/scan-view/share/startfile.py REPLACE_PYTHON+= utils/ABITest/ABITestGen.py REPLACE_PYTHON+= utils/CIndex/completion_logger_server.py REPLACE_PYTHON+= utils/CaptureCmd @@ -56,15 +77,24 @@ REPLACE_PYTHON+= utils/FindSpecRefs REPLACE_PYTHON+= utils/FuzzTest REPLACE_PYTHON+= utils/TestUtils/deep-stack.py REPLACE_PYTHON+= utils/analyzer/CmpRuns.py +REPLACE_PYTHON+= utils/analyzer/SATest.py REPLACE_PYTHON+= utils/analyzer/SATestAdd.py REPLACE_PYTHON+= utils/analyzer/SATestBuild.py +REPLACE_PYTHON+= utils/analyzer/SATestUpdateDiffs.py REPLACE_PYTHON+= utils/analyzer/SumTimerInfo.py +REPLACE_PYTHON+= utils/analyzer/exploded-graph-rewriter.py REPLACE_PYTHON+= utils/check_cfc/check_cfc.py REPLACE_PYTHON+= utils/check_cfc/obj_diff.py REPLACE_PYTHON+= utils/check_cfc/test_check_cfc.py +REPLACE_PYTHON+= utils/clangdiag.py +REPLACE_PYTHON+= utils/convert_arm_neon.py +REPLACE_PYTHON+= utils/creduce-clang-crash.py REPLACE_PYTHON+= utils/hmaptool/hmaptool +REPLACE_PYTHON+= utils/modfuzz.py +REPLACE_PYTHON+= utils/module-deps-to-rsp.py REPLACE_PYTHON+= utils/token-delta.py REPLACE_PYTHON+= www/builtins.py +REPLACE_PYTHON+= www/make_cxx_dr_status .if ${OPSYS} == "NetBSD" && ${PKGSRC_COMPILER:Mclang} # command to check if clang is using libc++ or libstdc++ diff --git a/lang/clang/PLIST b/lang/clang/PLIST index cac0ecf6b50..b9fdf543f31 100644 --- a/lang/clang/PLIST +++ b/lang/clang/PLIST @@ -1,8 +1,9 @@ -@comment $NetBSD: PLIST,v 1.31 2021/07/12 18:42:06 adam Exp $ +@comment $NetBSD: PLIST,v 1.32 2021/11/23 20:55:43 wiz Exp $ +bin/analyze-build bin/c-index-test bin/clang bin/clang++ -bin/clang-12 +bin/clang-13 bin/clang-check bin/clang-cl bin/clang-cpp @@ -12,11 +13,14 @@ bin/clang-offload-bundler bin/clang-offload-wrapper bin/clang-refactor bin/clang-rename +bin/clang-repl bin/clang-scan-deps bin/diagtool bin/git-clang-format bin/hmaptool +bin/intercept-build bin/scan-build +bin/scan-build-py bin/scan-view include/clang-c/BuildSystem.h include/clang-c/CXCompilationDatabase.h @@ -210,6 +214,7 @@ include/clang/Analysis/DomainSpecific/ObjCNoReturn.h include/clang/Analysis/FlowSensitive/DataflowValues.h include/clang/Analysis/FlowSensitive/DataflowWorklist.h include/clang/Analysis/IssueHash.h +include/clang/Analysis/MacroExpansionContext.h include/clang/Analysis/PathDiagnostic.h include/clang/Analysis/ProgramPoint.h include/clang/Analysis/RetainSummaryManager.h @@ -237,11 +242,11 @@ include/clang/Basic/BuiltinsBPF.def include/clang/Basic/BuiltinsHexagon.def include/clang/Basic/BuiltinsHexagonDep.def include/clang/Basic/BuiltinsHexagonMapCustomDep.def -include/clang/Basic/BuiltinsLe64.def include/clang/Basic/BuiltinsMips.def include/clang/Basic/BuiltinsNEON.def include/clang/Basic/BuiltinsNVPTX.def include/clang/Basic/BuiltinsPPC.def +include/clang/Basic/BuiltinsRISCV.def include/clang/Basic/BuiltinsSVE.def include/clang/Basic/BuiltinsSystemZ.def include/clang/Basic/BuiltinsWebAssembly.def @@ -254,6 +259,7 @@ include/clang/Basic/CodeGenOptions.def include/clang/Basic/CodeGenOptions.h include/clang/Basic/CommentOptions.h include/clang/Basic/Cuda.h +include/clang/Basic/DarwinSDKInfo.h include/clang/Basic/DebugInfoOptions.h include/clang/Basic/Diagnostic.h include/clang/Basic/DiagnosticAST.h @@ -307,6 +313,7 @@ include/clang/Basic/Linkage.h include/clang/Basic/MSP430Target.def include/clang/Basic/MacroBuilder.h include/clang/Basic/Module.h +include/clang/Basic/NoSanitizeList.h include/clang/Basic/ObjCRuntime.h include/clang/Basic/OpenCLExtensionTypes.def include/clang/Basic/OpenCLExtensions.def @@ -323,7 +330,7 @@ include/clang/Basic/PlistSupport.h include/clang/Basic/PragmaKinds.h include/clang/Basic/PrettyStackTrace.h include/clang/Basic/ProfileList.h -include/clang/Basic/SanitizerBlacklist.h +include/clang/Basic/RISCVVTypes.def include/clang/Basic/SanitizerSpecialCaseList.h include/clang/Basic/Sanitizers.def include/clang/Basic/Sanitizers.h @@ -334,11 +341,13 @@ include/clang/Basic/Specifiers.h include/clang/Basic/Stack.h include/clang/Basic/SyncScope.h include/clang/Basic/TargetBuiltins.h +include/clang/Basic/TargetCXXABI.def include/clang/Basic/TargetCXXABI.h include/clang/Basic/TargetID.h include/clang/Basic/TargetInfo.h include/clang/Basic/TargetOptions.h include/clang/Basic/TemplateKinds.h +include/clang/Basic/Thunk.h include/clang/Basic/TokenKinds.def include/clang/Basic/TokenKinds.h include/clang/Basic/TypeTraits.h @@ -362,6 +371,8 @@ include/clang/Basic/arm_sve_builtin_cg.inc include/clang/Basic/arm_sve_builtins.inc include/clang/Basic/arm_sve_sema_rangechecks.inc include/clang/Basic/arm_sve_typeflags.inc +include/clang/Basic/riscv_vector_builtin_cg.inc +include/clang/Basic/riscv_vector_builtins.inc include/clang/CodeGen/BackendUtil.h include/clang/CodeGen/CGFunctionInfo.h include/clang/CodeGen/CodeGenABITypes.h @@ -377,10 +388,10 @@ include/clang/CrossTU/CrossTranslationUnit.h include/clang/DirectoryWatcher/DirectoryWatcher.h include/clang/Driver/Action.h include/clang/Driver/Compilation.h -include/clang/Driver/DarwinSDKInfo.h include/clang/Driver/Distro.h include/clang/Driver/Driver.h include/clang/Driver/DriverDiagnostic.h +include/clang/Driver/InputInfo.h include/clang/Driver/Job.h include/clang/Driver/Multilib.h include/clang/Driver/OptionUtils.h @@ -437,6 +448,8 @@ include/clang/Index/IndexingAction.h include/clang/Index/IndexingOptions.h include/clang/Index/USRGeneration.h include/clang/IndexSerialization/SerializablePathCollection.h +include/clang/Interpreter/Interpreter.h +include/clang/Interpreter/PartialTranslationUnit.h include/clang/Lex/CodeCompletionHandler.h include/clang/Lex/DependencyDirectivesSourceMinimizer.h include/clang/Lex/DirectoryLookup.h @@ -563,7 +576,7 @@ include/clang/StaticAnalyzer/Core/PathSensitive/CheckerHelpers.h include/clang/StaticAnalyzer/Core/PathSensitive/ConstraintManager.h include/clang/StaticAnalyzer/Core/PathSensitive/CoreEngine.h include/clang/StaticAnalyzer/Core/PathSensitive/DynamicCastInfo.h -include/clang/StaticAnalyzer/Core/PathSensitive/DynamicSize.h +include/clang/StaticAnalyzer/Core/PathSensitive/DynamicExtent.h include/clang/StaticAnalyzer/Core/PathSensitive/DynamicType.h include/clang/StaticAnalyzer/Core/PathSensitive/DynamicTypeInfo.h include/clang/StaticAnalyzer/Core/PathSensitive/Environment.h @@ -620,6 +633,8 @@ include/clang/Tooling/FixIt.h include/clang/Tooling/Inclusions/HeaderIncludes.h include/clang/Tooling/Inclusions/IncludeStyle.h include/clang/Tooling/JSONCompilationDatabase.h +include/clang/Tooling/NodeIntrospection.h +include/clang/Tooling/NodeIntrospection.inc include/clang/Tooling/Refactoring.h include/clang/Tooling/Refactoring/ASTSelection.h include/clang/Tooling/Refactoring/AtomicChange.h @@ -725,6 +740,7 @@ lib/clang/${PKGVERSION}/include/avxintrin.h lib/clang/${PKGVERSION}/include/avxvnniintrin.h lib/clang/${PKGVERSION}/include/bmi2intrin.h lib/clang/${PKGVERSION}/include/bmiintrin.h +lib/clang/${PKGVERSION}/include/builtins.h lib/clang/${PKGVERSION}/include/cet.h lib/clang/${PKGVERSION}/include/cetintrin.h lib/clang/${PKGVERSION}/include/cldemoteintrin.h @@ -743,9 +759,13 @@ lib/clang/${PKGVERSION}/include/fma4intrin.h lib/clang/${PKGVERSION}/include/fmaintrin.h lib/clang/${PKGVERSION}/include/fxsrintrin.h lib/clang/${PKGVERSION}/include/gfniintrin.h +lib/clang/${PKGVERSION}/include/hexagon_circ_brev_intrinsics.h +lib/clang/${PKGVERSION}/include/hexagon_protos.h +lib/clang/${PKGVERSION}/include/hexagon_types.h lib/clang/${PKGVERSION}/include/hresetintrin.h lib/clang/${PKGVERSION}/include/htmintrin.h lib/clang/${PKGVERSION}/include/htmxlintrin.h +lib/clang/${PKGVERSION}/include/hvx_hexagon_protos.h lib/clang/${PKGVERSION}/include/ia32intrin.h lib/clang/${PKGVERSION}/include/immintrin.h lib/clang/${PKGVERSION}/include/intrin.h @@ -787,6 +807,7 @@ lib/clang/${PKGVERSION}/include/ppc_wrappers/xmmintrin.h lib/clang/${PKGVERSION}/include/prfchwintrin.h lib/clang/${PKGVERSION}/include/ptwriteintrin.h lib/clang/${PKGVERSION}/include/rdseedintrin.h +lib/clang/${PKGVERSION}/include/riscv_vector.h lib/clang/${PKGVERSION}/include/rtmintrin.h lib/clang/${PKGVERSION}/include/s390intrin.h lib/clang/${PKGVERSION}/include/serializeintrin.h @@ -824,13 +845,15 @@ lib/clang/${PKGVERSION}/include/xsaveintrin.h lib/clang/${PKGVERSION}/include/xsaveoptintrin.h lib/clang/${PKGVERSION}/include/xsavesintrin.h lib/clang/${PKGVERSION}/include/xtestintrin.h +lib/cmake/clang/AddClang.cmake lib/cmake/clang/ClangConfig.cmake lib/cmake/clang/ClangTargets-release.cmake lib/cmake/clang/ClangTargets.cmake lib/libclang-cpp.${SOEXT} -lib/libclang-cpp.so.12 +lib/libclang-cpp.so.13 lib/libclang.${SOEXT} -${PLIST.notdylib}lib/libclang.${SOEXT}.12 +${PLIST.notdylib}lib/libclang.${SOEXT}.13 +${PLIST.notdylib}lib/libclang.${SOEXT}.${PKGVERSION} lib/libclangAPINotes.a lib/libclangARCMigrate.a lib/libclangAST.a @@ -851,6 +874,7 @@ lib/libclangHandleCXX.a lib/libclangHandleLLVM.a lib/libclangIndex.a lib/libclangIndexSerialization.a +lib/libclangInterpreter.a lib/libclangLex.a lib/libclangParse.a lib/libclangRewrite.a @@ -868,8 +892,26 @@ lib/libclangToolingInclusions.a lib/libclangToolingRefactoring.a lib/libclangToolingSyntax.a lib/libclangTransformer.a +lib/libear/__init__.py +lib/libear/config.h.in +lib/libear/ear.c +lib/libscanbuild/__init__.py +lib/libscanbuild/analyze.py +lib/libscanbuild/arguments.py +lib/libscanbuild/clang.py +lib/libscanbuild/compilation.py +lib/libscanbuild/intercept.py +lib/libscanbuild/report.py +lib/libscanbuild/resources/scanview.css +lib/libscanbuild/resources/selectable.js +lib/libscanbuild/resources/sorttable.js +lib/libscanbuild/shell.py +libexec/analyze-c++ +libexec/analyze-cc libexec/c++-analyzer libexec/ccc-analyzer +libexec/intercept-c++ +libexec/intercept-cc man/man1/scan-build.1 share/clang/bash-autocomplete.sh share/clang/clang-format-bbedit.applescript diff --git a/lang/clang/buildlink3.mk b/lang/clang/buildlink3.mk index ff71127932b..c38c4655825 100644 --- a/lang/clang/buildlink3.mk +++ b/lang/clang/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.15 2021/07/12 18:42:06 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2021/11/23 20:55:43 wiz Exp $ BUILDLINK_TREE+= clang @@ -6,13 +6,13 @@ BUILDLINK_TREE+= clang CLANG_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.clang+= clang>=9.0.1 -BUILDLINK_ABI_DEPENDS.clang?= clang>=12.0.0 +BUILDLINK_ABI_DEPENDS.clang?= clang>=13.0.0 BUILDLINK_PKGSRCDIR.clang?= ../../lang/clang BUILDLINK_FILES.clang+= bin/c-index-test BUILDLINK_FILES.clang+= bin/clang BUILDLINK_FILES.clang+= bin/clang++ -BUILDLINK_FILES.clang+= bin/clang-12 +BUILDLINK_FILES.clang+= bin/clang-13 BUILDLINK_FILES.clang+= bin/clang-check BUILDLINK_FILES.clang+= bin/clang-cl BUILDLINK_FILES.clang+= bin/clang-cpp @@ -23,11 +23,14 @@ BUILDLINK_FILES.clang+= bin/clang-offload-bundler BUILDLINK_FILES.clang+= bin/clang-offload-wrapper BUILDLINK_FILES.clang+= bin/clang-refactor BUILDLINK_FILES.clang+= bin/clang-rename +BUILDLINK_FILES.clang+= bin/clang-repl BUILDLINK_FILES.clang+= bin/clang-scan-deps BUILDLINK_FILES.clang+= bin/diagtool BUILDLINK_FILES.clang+= bin/git-clang-format BUILDLINK_FILES.clang+= bin/hmaptool +BUILDLINK_FILES.clang+= bin/intercept-build BUILDLINK_FILES.clang+= bin/scan-build +BUILDLINK_FILES.clang+= bin/scan-build-py BUILDLINK_FILES.clang+= bin/scan-view .include "../../textproc/libxml2/buildlink3.mk" diff --git a/lang/clang/distinfo b/lang/clang/distinfo index 8ba9a70ea51..8e8b15783b5 100644 --- a/lang/clang/distinfo +++ b/lang/clang/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.69 2021/10/26 10:51:32 nia Exp $ +$NetBSD: distinfo,v 1.70 2021/11/23 20:55:43 wiz Exp $ -BLAKE2s (clang-12.0.1.src.tar.xz) = 92c1821dcbffbcaa1784dc583fef539de64c05985c3bacbb1524269db3e8d8bf -SHA512 (clang-12.0.1.src.tar.xz) = 405011f0974b239427ca87c65e7485709c77705a9b7d51d679fe2abec79865f8c51c7ab085b4e6bf7aa4d0eade4b1438d88dd5feb56b434dc5d718ebf5715efa -Size (clang-12.0.1.src.tar.xz) = 15323860 bytes +BLAKE2s (clang-13.0.0.src.tar.xz) = 3a07b8456c7bb3e6a5446d01dbe7606cd0caeacc38606dd59632d14f89480850 +SHA512 (clang-13.0.0.src.tar.xz) = b9ae85a7f0a66ae42a6d76a4e1ea0940bf622f7fbd21d078c9fef146087c70abb0a597a1cfda4e8706b1fbc74d170986451f5f2d642f685a5c355da8a572fb26 +Size (clang-13.0.0.src.tar.xz) = 17846828 bytes SHA1 (patch-lib_Basic_Targets_OSTargets.h) = 02533d1de2c92a431d9c5d4567f348deff056b99 SHA1 (patch-lib_Driver_ToolChain.cpp) = 33a8e346a72893140fde42245e4b108f3a9b9e3e -SHA1 (patch-lib_Driver_ToolChains_Solaris.cpp) = 36b08829c6f6fca2a5b6fecda790bf9af26eda5d +SHA1 (patch-lib_Driver_ToolChains_Solaris.cpp) = 1a139612ce181dfce1ea3a627dcd76bc81f05455 SHA1 (patch-lib_Driver_ToolChains_Solaris.h) = 22d1ddef34b8df3cc29c4632108d45904797aff3 SHA1 (patch-lib_Frontend_InitHeaderSearch.cpp) = 497ddbe1eac8726d736bed58557a795dce207d1a diff --git a/lang/clang/patches/patch-lib_Driver_ToolChains_Solaris.cpp b/lang/clang/patches/patch-lib_Driver_ToolChains_Solaris.cpp index 1afeae1c82b..2c62a765d75 100644 --- a/lang/clang/patches/patch-lib_Driver_ToolChains_Solaris.cpp +++ b/lang/clang/patches/patch-lib_Driver_ToolChains_Solaris.cpp @@ -1,4 +1,4 @@ -$NetBSD: patch-lib_Driver_ToolChains_Solaris.cpp,v 1.7 2021/07/12 18:42:06 adam Exp $ +$NetBSD: patch-lib_Driver_ToolChains_Solaris.cpp,v 1.8 2021/11/23 20:55:43 wiz Exp $ Use compiler-rt instead of libgcc. Pull in libcxx correctly. @@ -7,7 +7,7 @@ Don't specify --dynamic-linker, makes it impossible for the user to use -Wl,-r Ensure we reset to -zdefaultextract prior to adding compiler-rt. Test removing -Bdynamic for golang. ---- lib/Driver/ToolChains/Solaris.cpp.orig 2020-10-07 10:10:48.000000000 +0000 +--- lib/Driver/ToolChains/Solaris.cpp.orig 2021-09-24 16:18:10.000000000 +0000 +++ lib/Driver/ToolChains/Solaris.cpp @@ -50,8 +50,28 @@ void solaris::Linker::ConstructJob(Compi const InputInfoList &Inputs, @@ -181,7 +181,7 @@ Test removing -Bdynamic for golang. void Solaris::AddClangSystemIncludeArgs(const ArgList &DriverArgs, ArgStringList &CC1Args) const { const Driver &D = getDriver(); -@@ -252,40 +270,20 @@ void Solaris::AddClangSystemIncludeArgs( +@@ -252,38 +270,20 @@ void Solaris::AddClangSystemIncludeArgs( return; } @@ -199,17 +199,15 @@ Test removing -Bdynamic for golang. addExternCSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/include"); } --void Solaris::addLibStdCxxIncludePaths( -+void Solaris::addLibCxxIncludePaths( + void Solaris::addLibStdCxxIncludePaths( const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const { - // We need a detected GCC installation on Solaris (similar to Linux) - // to provide libstdc++'s headers. - if (!GCCInstallation.isValid()) - return; -+ addSystemInclude(DriverArgs, CC1Args, -+ llvm::sys::path::parent_path(getDriver().getInstalledDir()) -+ + "/include/c++/v1"); ++ // Location of GCC includes is not reliable so do not support it. ++ return; +} - // By default, look for the C++ headers in an include directory adjacent to @@ -221,14 +219,13 @@ Test removing -Bdynamic for golang. - const GCCVersion &Version = GCCInstallation.getVersion(); - - // The primary search for libstdc++ supports multiarch variants. -- addLibStdCXXIncludePaths(LibDir.str() + "/../include", "/c++/" + Version.Text, -- TripleStr, -- /*GCCMultiarchTriple*/ "", -- /*TargetMultiarchTriple*/ "", -- Multilib.includeSuffix(), DriverArgs, CC1Args); -+void Solaris::addLibStdCxxIncludePaths( -+ const llvm::opt::ArgList &DriverArgs, -+ llvm::opt::ArgStringList &CC1Args) const { -+ // Location of GCC includes is not reliable so do not support it. -+ return; +- addLibStdCXXIncludePaths(LibDir.str() + "/../include/c++/" + Version.Text, +- TripleStr, Multilib.includeSuffix(), DriverArgs, +- CC1Args); ++void Solaris::addLibCxxIncludePaths( ++ const llvm::opt::ArgList &DriverArgs, ++ llvm::opt::ArgStringList &CC1Args) const { ++ addSystemInclude(DriverArgs, CC1Args, ++ llvm::sys::path::parent_path(getDriver().getInstalledDir()) ++ + "/include/c++/v1"); } diff --git a/lang/compiler-rt/distinfo b/lang/compiler-rt/distinfo index 789dec810e2..b1bdfbd31a2 100644 --- a/lang/compiler-rt/distinfo +++ b/lang/compiler-rt/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.14 2021/10/26 10:51:32 nia Exp $ +$NetBSD: distinfo,v 1.15 2021/11/23 20:55:43 wiz Exp $ -BLAKE2s (compiler-rt-12.0.1.src.tar.xz) = 967e0734b09b0725e4502aa2cb6aa2b4f6bce23a007ccea1da0403d5e0801b5d -SHA512 (compiler-rt-12.0.1.src.tar.xz) = 708780aa47ef289a9700eb76c17cc1f3bab19b8245174e612b5f684c48448030263a72eeef1021b10bdffa6ace2df489adcbba9e7a790ccbcd5fe72056f63f92 -Size (compiler-rt-12.0.1.src.tar.xz) = 2201284 bytes +BLAKE2s (compiler-rt-13.0.0.src.tar.xz) = f21f2a1f9f696da75cd1d6a26bd9005e5314009fb2bd65ddf5d3ba752d15ba39 +SHA512 (compiler-rt-13.0.0.src.tar.xz) = b35643553d0d3d4deb2f31e2dad8bbac4b772ee3e0c86aa532ce7161da276620fe820193004ee08c62eb8dfd015e04d3853e6a7cc939ac3fb57345702386d583 +Size (compiler-rt-13.0.0.src.tar.xz) = 2287616 bytes SHA1 (patch-cmake_config-ix.cmake) = 50e38807363e9d4f18106bb2ff71f5247a24d764 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cpp) = 8a09da1e6e4476f50cfd5e8034060c6a87bfa92c diff --git a/lang/libcxx/PLIST b/lang/libcxx/PLIST index d62a108dc30..27e1a1c81a6 100644 --- a/lang/libcxx/PLIST +++ b/lang/libcxx/PLIST @@ -1,34 +1,217 @@ -@comment $NetBSD: PLIST,v 1.6 2021/07/12 18:46:07 adam Exp $ +@comment $NetBSD: PLIST,v 1.7 2021/11/23 20:55:43 wiz Exp $ +include/c++/v1/__algorithm/adjacent_find.h +include/c++/v1/__algorithm/all_of.h +include/c++/v1/__algorithm/any_of.h +include/c++/v1/__algorithm/binary_search.h +include/c++/v1/__algorithm/clamp.h +include/c++/v1/__algorithm/comp.h +include/c++/v1/__algorithm/comp_ref_type.h +include/c++/v1/__algorithm/copy.h +include/c++/v1/__algorithm/copy_backward.h +include/c++/v1/__algorithm/copy_if.h +include/c++/v1/__algorithm/copy_n.h +include/c++/v1/__algorithm/count.h +include/c++/v1/__algorithm/count_if.h +include/c++/v1/__algorithm/equal.h +include/c++/v1/__algorithm/equal_range.h +include/c++/v1/__algorithm/fill.h +include/c++/v1/__algorithm/fill_n.h +include/c++/v1/__algorithm/find.h +include/c++/v1/__algorithm/find_end.h +include/c++/v1/__algorithm/find_first_of.h +include/c++/v1/__algorithm/find_if.h +include/c++/v1/__algorithm/find_if_not.h +include/c++/v1/__algorithm/for_each.h +include/c++/v1/__algorithm/for_each_n.h +include/c++/v1/__algorithm/generate.h +include/c++/v1/__algorithm/generate_n.h +include/c++/v1/__algorithm/half_positive.h +include/c++/v1/__algorithm/includes.h +include/c++/v1/__algorithm/inplace_merge.h +include/c++/v1/__algorithm/is_heap.h +include/c++/v1/__algorithm/is_heap_until.h +include/c++/v1/__algorithm/is_partitioned.h +include/c++/v1/__algorithm/is_permutation.h +include/c++/v1/__algorithm/is_sorted.h +include/c++/v1/__algorithm/is_sorted_until.h +include/c++/v1/__algorithm/iter_swap.h +include/c++/v1/__algorithm/lexicographical_compare.h +include/c++/v1/__algorithm/lower_bound.h +include/c++/v1/__algorithm/make_heap.h +include/c++/v1/__algorithm/max.h +include/c++/v1/__algorithm/max_element.h +include/c++/v1/__algorithm/merge.h +include/c++/v1/__algorithm/min.h +include/c++/v1/__algorithm/min_element.h +include/c++/v1/__algorithm/minmax.h +include/c++/v1/__algorithm/minmax_element.h +include/c++/v1/__algorithm/mismatch.h +include/c++/v1/__algorithm/move.h +include/c++/v1/__algorithm/move_backward.h +include/c++/v1/__algorithm/next_permutation.h +include/c++/v1/__algorithm/none_of.h +include/c++/v1/__algorithm/nth_element.h +include/c++/v1/__algorithm/partial_sort.h +include/c++/v1/__algorithm/partial_sort_copy.h +include/c++/v1/__algorithm/partition.h +include/c++/v1/__algorithm/partition_copy.h +include/c++/v1/__algorithm/partition_point.h +include/c++/v1/__algorithm/pop_heap.h +include/c++/v1/__algorithm/prev_permutation.h +include/c++/v1/__algorithm/push_heap.h +include/c++/v1/__algorithm/remove.h +include/c++/v1/__algorithm/remove_copy.h +include/c++/v1/__algorithm/remove_copy_if.h +include/c++/v1/__algorithm/remove_if.h +include/c++/v1/__algorithm/replace.h +include/c++/v1/__algorithm/replace_copy.h +include/c++/v1/__algorithm/replace_copy_if.h +include/c++/v1/__algorithm/replace_if.h +include/c++/v1/__algorithm/reverse.h +include/c++/v1/__algorithm/reverse_copy.h +include/c++/v1/__algorithm/rotate.h +include/c++/v1/__algorithm/rotate_copy.h +include/c++/v1/__algorithm/sample.h +include/c++/v1/__algorithm/search.h +include/c++/v1/__algorithm/search_n.h +include/c++/v1/__algorithm/set_difference.h +include/c++/v1/__algorithm/set_intersection.h +include/c++/v1/__algorithm/set_symmetric_difference.h +include/c++/v1/__algorithm/set_union.h +include/c++/v1/__algorithm/shift_left.h +include/c++/v1/__algorithm/shift_right.h +include/c++/v1/__algorithm/shuffle.h +include/c++/v1/__algorithm/sift_down.h +include/c++/v1/__algorithm/sort.h +include/c++/v1/__algorithm/sort_heap.h +include/c++/v1/__algorithm/stable_partition.h +include/c++/v1/__algorithm/stable_sort.h +include/c++/v1/__algorithm/swap_ranges.h +include/c++/v1/__algorithm/transform.h +include/c++/v1/__algorithm/unique.h +include/c++/v1/__algorithm/unique_copy.h +include/c++/v1/__algorithm/unwrap_iter.h +include/c++/v1/__algorithm/upper_bound.h include/c++/v1/__availability include/c++/v1/__bit_reference include/c++/v1/__bits include/c++/v1/__bsd_locale_defaults.h include/c++/v1/__bsd_locale_fallbacks.h include/c++/v1/__config +include/c++/v1/__config_site include/c++/v1/__cxxabi_config.h include/c++/v1/__debug include/c++/v1/__errc -include/c++/v1/__functional_03 +include/c++/v1/__format/format_error.h +include/c++/v1/__format/format_parse_context.h +include/c++/v1/__function_like.h +include/c++/v1/__functional/binary_function.h +include/c++/v1/__functional/binary_negate.h +include/c++/v1/__functional/bind.h +include/c++/v1/__functional/bind_front.h +include/c++/v1/__functional/binder1st.h +include/c++/v1/__functional/binder2nd.h +include/c++/v1/__functional/default_searcher.h +include/c++/v1/__functional/function.h +include/c++/v1/__functional/hash.h +include/c++/v1/__functional/identity.h +include/c++/v1/__functional/invoke.h +include/c++/v1/__functional/is_transparent.h +include/c++/v1/__functional/mem_fn.h +include/c++/v1/__functional/mem_fun_ref.h +include/c++/v1/__functional/not_fn.h +include/c++/v1/__functional/operations.h +include/c++/v1/__functional/perfect_forward.h +include/c++/v1/__functional/pointer_to_binary_function.h +include/c++/v1/__functional/pointer_to_unary_function.h +include/c++/v1/__functional/ranges_operations.h +include/c++/v1/__functional/reference_wrapper.h +include/c++/v1/__functional/unary_function.h +include/c++/v1/__functional/unary_negate.h +include/c++/v1/__functional/unwrap_ref.h +include/c++/v1/__functional/weak_result_type.h include/c++/v1/__functional_base -include/c++/v1/__functional_base_03 include/c++/v1/__hash_table +include/c++/v1/__iterator/access.h +include/c++/v1/__iterator/advance.h +include/c++/v1/__iterator/back_insert_iterator.h +include/c++/v1/__iterator/common_iterator.h +include/c++/v1/__iterator/concepts.h +include/c++/v1/__iterator/counted_iterator.h +include/c++/v1/__iterator/data.h +include/c++/v1/__iterator/default_sentinel.h +include/c++/v1/__iterator/distance.h +include/c++/v1/__iterator/empty.h +include/c++/v1/__iterator/erase_if_container.h +include/c++/v1/__iterator/front_insert_iterator.h +include/c++/v1/__iterator/incrementable_traits.h +include/c++/v1/__iterator/insert_iterator.h +include/c++/v1/__iterator/istream_iterator.h +include/c++/v1/__iterator/istreambuf_iterator.h +include/c++/v1/__iterator/iter_move.h +include/c++/v1/__iterator/iter_swap.h +include/c++/v1/__iterator/iterator.h +include/c++/v1/__iterator/iterator_traits.h +include/c++/v1/__iterator/move_iterator.h +include/c++/v1/__iterator/next.h +include/c++/v1/__iterator/ostream_iterator.h +include/c++/v1/__iterator/ostreambuf_iterator.h +include/c++/v1/__iterator/prev.h +include/c++/v1/__iterator/projected.h +include/c++/v1/__iterator/readable_traits.h +include/c++/v1/__iterator/reverse_access.h +include/c++/v1/__iterator/reverse_iterator.h +include/c++/v1/__iterator/size.h +include/c++/v1/__iterator/wrap_iter.h include/c++/v1/__libcpp_version include/c++/v1/__locale +include/c++/v1/__memory/addressof.h +include/c++/v1/__memory/allocation_guard.h +include/c++/v1/__memory/allocator.h +include/c++/v1/__memory/allocator_arg_t.h include/c++/v1/__memory/allocator_traits.h -include/c++/v1/__memory/base.h +include/c++/v1/__memory/auto_ptr.h +include/c++/v1/__memory/compressed_pair.h +include/c++/v1/__memory/construct_at.h +include/c++/v1/__memory/pointer_safety.h include/c++/v1/__memory/pointer_traits.h -include/c++/v1/__memory/utilities.h +include/c++/v1/__memory/raw_storage_iterator.h +include/c++/v1/__memory/shared_ptr.h +include/c++/v1/__memory/temporary_buffer.h +include/c++/v1/__memory/uninitialized_algorithms.h +include/c++/v1/__memory/unique_ptr.h +include/c++/v1/__memory/uses_allocator.h include/c++/v1/__mutex_base include/c++/v1/__node_handle include/c++/v1/__nullptr +include/c++/v1/__random/uniform_int_distribution.h +include/c++/v1/__ranges/access.h +include/c++/v1/__ranges/all.h +include/c++/v1/__ranges/common_view.h +include/c++/v1/__ranges/concepts.h +include/c++/v1/__ranges/copyable_box.h +include/c++/v1/__ranges/dangling.h +include/c++/v1/__ranges/data.h +include/c++/v1/__ranges/drop_view.h +include/c++/v1/__ranges/empty.h +include/c++/v1/__ranges/empty_view.h +include/c++/v1/__ranges/enable_borrowed_range.h +include/c++/v1/__ranges/enable_view.h +include/c++/v1/__ranges/non_propagating_cache.h +include/c++/v1/__ranges/ref_view.h +include/c++/v1/__ranges/size.h +include/c++/v1/__ranges/subrange.h +include/c++/v1/__ranges/transform_view.h +include/c++/v1/__ranges/view_interface.h include/c++/v1/__split_buffer -include/c++/v1/__sso_allocator include/c++/v1/__std_stream include/c++/v1/__string include/c++/v1/__support/android/locale_bionic.h include/c++/v1/__support/fuchsia/xlocale.h +include/c++/v1/__support/ibm/gettod_zos.h include/c++/v1/__support/ibm/limits.h include/c++/v1/__support/ibm/locale_mgmt_aix.h +include/c++/v1/__support/ibm/locale_mgmt_zos.h include/c++/v1/__support/ibm/nanosleep.h include/c++/v1/__support/ibm/support.h include/c++/v1/__support/ibm/xlocale.h @@ -48,6 +231,21 @@ include/c++/v1/__threading_support include/c++/v1/__tree include/c++/v1/__tuple include/c++/v1/__undef_macros +include/c++/v1/__utility/__decay_copy.h +include/c++/v1/__utility/as_const.h +include/c++/v1/__utility/cmp.h +include/c++/v1/__utility/declval.h +include/c++/v1/__utility/exchange.h +include/c++/v1/__utility/forward.h +include/c++/v1/__utility/in_place.h +include/c++/v1/__utility/integer_sequence.h +include/c++/v1/__utility/move.h +include/c++/v1/__utility/pair.h +include/c++/v1/__utility/piecewise_construct.h +include/c++/v1/__utility/rel_ops.h +include/c++/v1/__utility/swap.h +include/c++/v1/__utility/to_underlying.h +include/c++/v1/__variant/monostate.h include/c++/v1/algorithm include/c++/v1/any include/c++/v1/array @@ -121,6 +319,7 @@ include/c++/v1/ext/hash_set include/c++/v1/fenv.h include/c++/v1/filesystem include/c++/v1/float.h +include/c++/v1/format include/c++/v1/forward_list include/c++/v1/fstream include/c++/v1/functional @@ -151,6 +350,7 @@ include/c++/v1/optional include/c++/v1/ostream include/c++/v1/queue include/c++/v1/random +include/c++/v1/ranges include/c++/v1/ratio include/c++/v1/regex include/c++/v1/scoped_allocator diff --git a/lang/libcxx/distinfo b/lang/libcxx/distinfo index ef6dde8a58e..fc4446fef65 100644 --- a/lang/libcxx/distinfo +++ b/lang/libcxx/distinfo @@ -1,13 +1,13 @@ -$NetBSD: distinfo,v 1.14 2021/10/26 10:51:40 nia Exp $ +$NetBSD: distinfo,v 1.15 2021/11/23 20:55:43 wiz Exp $ -BLAKE2s (libcxx-12.0.1.src.tar.xz) = abe6e024b0de83f6547a1f16a5e00f4afbe641a34331cecb458d849d661d079c -SHA512 (libcxx-12.0.1.src.tar.xz) = c9f9a546d6a312ff6e7c85a044ce801fe7bfca1c349767b3f3c5ea16656b8906a8078f25de38138c9844c4b2646238fd17d890438cd10391cd9e4a430f9064a0 -Size (libcxx-12.0.1.src.tar.xz) = 1882840 bytes -BLAKE2s (libcxxabi-12.0.1.src.tar.xz) = 7179060766a67620fa3d500e59ba78e61498deb34980880a0f5bc99e664ba8d1 -SHA512 (libcxxabi-12.0.1.src.tar.xz) = c7b236e9afe8d6bba297e1eca12ca0e03fbd1b028b9627154186d27eb2e035cd33eddb72511a38d0827de347a487e180c32c1798759c4283b9fbbf338a015bb9 -Size (libcxxabi-12.0.1.src.tar.xz) = 552980 bytes -BLAKE2s (llvm-12.0.1.src.tar.xz) = 7fd5bf0ff1277bba7dfec2e1451e833d0dc2e47aa1f3cacfd4940fd992fc3100 -SHA512 (llvm-12.0.1.src.tar.xz) = ff674afb4c8eea699a4756f1bb463f15098a7fa354c733de83c024f8f0cf238cd5f19ae3ec446831c7109235e293e2bf31d8562567ede163c8ec53af7306ba0f -Size (llvm-12.0.1.src.tar.xz) = 42898504 bytes +BLAKE2s (libcxx-13.0.0.src.tar.xz) = ade0de63ce72d50ae1276cf71da17aa5fa375e9ad767e2c1abecaa7f57953768 +SHA512 (libcxx-13.0.0.src.tar.xz) = deaf166ea9b5ffe4d7d1ace86fb4ed33317c610ff41947d2b0b18934b2a54601521f1021c5fd43bdba3a08779f3be98e13d2565c0d4374d849c5eff487eda2dd +Size (libcxx-13.0.0.src.tar.xz) = 2086032 bytes +BLAKE2s (libcxxabi-13.0.0.src.tar.xz) = d0d7712e3affd61a122fa4a305a1c05a6f3362cbe10c80bc93ed8b3065ecf6bb +SHA512 (libcxxabi-13.0.0.src.tar.xz) = e7c8177898f344d4a16bf199ddbae4c8ae0d31e2961c5946934abb30631c386d2d28bf4804e65faa9f6298aca01e6e925fd88a13c918d8e5d1b175720e600823 +Size (libcxxabi-13.0.0.src.tar.xz) = 554780 bytes +BLAKE2s (llvm-13.0.0.src.tar.xz) = ffdfed33e870715f2e8c0efdc2c29566a2bffe5a6efce90ea7ca4990c9067f0f +SHA512 (llvm-13.0.0.src.tar.xz) = c307500a5fdc2bf6d768a808cf879d33914e24437f4f794361eccedb28ac6a98ebc41ca6140d09364c9bdec565fabd049e364d3f5b39f1751ecff51b687c4eff +Size (llvm-13.0.0.src.tar.xz) = 45471992 bytes SHA1 (patch-include_____config) = ff0d5a0fcc1431f21ce25667cbc01c2307542212 SHA1 (patch-src_filesystem_directory__iterator.cpp) = 90ebbb80e4ec161405397d6d7c5d1d19a7284325 diff --git a/lang/libcxxabi/Makefile b/lang/libcxxabi/Makefile index 2765b17b9e3..8a31c0b2c01 100644 --- a/lang/libcxxabi/Makefile +++ b/lang/libcxxabi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2021/07/12 18:46:07 adam Exp $ +# $NetBSD: Makefile,v 1.12 2021/11/23 20:55:43 wiz Exp $ .include "../../lang/llvm/version.mk" @@ -44,6 +44,8 @@ post-extract: ${MKDIR} ${WRKDIR}/build ${LN} -f -s ${WRKDIR}/${LIBCXX} ${WRKDIR}/libcxx ${LN} -f -s ${WRKDIR}/${LLVMDIST} ${WRKDIR}/llvm + # TODO: not sure what should create this and with which contents + ${TOUCH} ${WRKDIR}/${LIBCXX}/include/__config_site .include "../../lang/libunwind/buildlink3.mk" .include "../../lang/llvm/buildlink3.mk" diff --git a/lang/libcxxabi/distinfo b/lang/libcxxabi/distinfo index 30fc4dcee04..747d277eb41 100644 --- a/lang/libcxxabi/distinfo +++ b/lang/libcxxabi/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.12 2021/10/26 10:51:41 nia Exp $ +$NetBSD: distinfo,v 1.13 2021/11/23 20:55:43 wiz Exp $ -BLAKE2s (libcxx-12.0.1.src.tar.xz) = abe6e024b0de83f6547a1f16a5e00f4afbe641a34331cecb458d849d661d079c -SHA512 (libcxx-12.0.1.src.tar.xz) = c9f9a546d6a312ff6e7c85a044ce801fe7bfca1c349767b3f3c5ea16656b8906a8078f25de38138c9844c4b2646238fd17d890438cd10391cd9e4a430f9064a0 -Size (libcxx-12.0.1.src.tar.xz) = 1882840 bytes -BLAKE2s (libcxxabi-12.0.1.src.tar.xz) = 7179060766a67620fa3d500e59ba78e61498deb34980880a0f5bc99e664ba8d1 -SHA512 (libcxxabi-12.0.1.src.tar.xz) = c7b236e9afe8d6bba297e1eca12ca0e03fbd1b028b9627154186d27eb2e035cd33eddb72511a38d0827de347a487e180c32c1798759c4283b9fbbf338a015bb9 -Size (libcxxabi-12.0.1.src.tar.xz) = 552980 bytes -BLAKE2s (llvm-12.0.1.src.tar.xz) = 7fd5bf0ff1277bba7dfec2e1451e833d0dc2e47aa1f3cacfd4940fd992fc3100 -SHA512 (llvm-12.0.1.src.tar.xz) = ff674afb4c8eea699a4756f1bb463f15098a7fa354c733de83c024f8f0cf238cd5f19ae3ec446831c7109235e293e2bf31d8562567ede163c8ec53af7306ba0f -Size (llvm-12.0.1.src.tar.xz) = 42898504 bytes +BLAKE2s (libcxx-13.0.0.src.tar.xz) = ade0de63ce72d50ae1276cf71da17aa5fa375e9ad767e2c1abecaa7f57953768 +SHA512 (libcxx-13.0.0.src.tar.xz) = deaf166ea9b5ffe4d7d1ace86fb4ed33317c610ff41947d2b0b18934b2a54601521f1021c5fd43bdba3a08779f3be98e13d2565c0d4374d849c5eff487eda2dd +Size (libcxx-13.0.0.src.tar.xz) = 2086032 bytes +BLAKE2s (libcxxabi-13.0.0.src.tar.xz) = d0d7712e3affd61a122fa4a305a1c05a6f3362cbe10c80bc93ed8b3065ecf6bb +SHA512 (libcxxabi-13.0.0.src.tar.xz) = e7c8177898f344d4a16bf199ddbae4c8ae0d31e2961c5946934abb30631c386d2d28bf4804e65faa9f6298aca01e6e925fd88a13c918d8e5d1b175720e600823 +Size (libcxxabi-13.0.0.src.tar.xz) = 554780 bytes +BLAKE2s (llvm-13.0.0.src.tar.xz) = ffdfed33e870715f2e8c0efdc2c29566a2bffe5a6efce90ea7ca4990c9067f0f +SHA512 (llvm-13.0.0.src.tar.xz) = c307500a5fdc2bf6d768a808cf879d33914e24437f4f794361eccedb28ac6a98ebc41ca6140d09364c9bdec565fabd049e364d3f5b39f1751ecff51b687c4eff +Size (llvm-13.0.0.src.tar.xz) = 45471992 bytes diff --git a/lang/libunwind/distinfo b/lang/libunwind/distinfo index 908eafbbd62..79ae12f5ae7 100644 --- a/lang/libunwind/distinfo +++ b/lang/libunwind/distinfo @@ -1,14 +1,14 @@ -$NetBSD: distinfo,v 1.22 2021/10/26 10:51:41 nia Exp $ +$NetBSD: distinfo,v 1.23 2021/11/23 20:55:43 wiz Exp $ -BLAKE2s (libcxx-12.0.1.src.tar.xz) = abe6e024b0de83f6547a1f16a5e00f4afbe641a34331cecb458d849d661d079c -SHA512 (libcxx-12.0.1.src.tar.xz) = c9f9a546d6a312ff6e7c85a044ce801fe7bfca1c349767b3f3c5ea16656b8906a8078f25de38138c9844c4b2646238fd17d890438cd10391cd9e4a430f9064a0 -Size (libcxx-12.0.1.src.tar.xz) = 1882840 bytes -BLAKE2s (libunwind-12.0.1.src.tar.xz) = 63e382b147962cef5729aaafc5fc5522e7b3a5fe8c2be3d3b1c7e920499a01db -SHA512 (libunwind-12.0.1.src.tar.xz) = 847b6ba03010a43f4fdbfdc49bf16d18fd18474d01584712e651b11191814bf7c1cf53475021d9ee447ed78413202b4ed97973d7bdd851d3e49f8d06f55a7af4 -Size (libunwind-12.0.1.src.tar.xz) = 98348 bytes -BLAKE2s (llvm-12.0.1.src.tar.xz) = 7fd5bf0ff1277bba7dfec2e1451e833d0dc2e47aa1f3cacfd4940fd992fc3100 -SHA512 (llvm-12.0.1.src.tar.xz) = ff674afb4c8eea699a4756f1bb463f15098a7fa354c733de83c024f8f0cf238cd5f19ae3ec446831c7109235e293e2bf31d8562567ede163c8ec53af7306ba0f -Size (llvm-12.0.1.src.tar.xz) = 42898504 bytes +BLAKE2s (libcxx-13.0.0.src.tar.xz) = ade0de63ce72d50ae1276cf71da17aa5fa375e9ad767e2c1abecaa7f57953768 +SHA512 (libcxx-13.0.0.src.tar.xz) = deaf166ea9b5ffe4d7d1ace86fb4ed33317c610ff41947d2b0b18934b2a54601521f1021c5fd43bdba3a08779f3be98e13d2565c0d4374d849c5eff487eda2dd +Size (libcxx-13.0.0.src.tar.xz) = 2086032 bytes +BLAKE2s (libunwind-13.0.0.src.tar.xz) = 7354c48417be507a5799bead2d6baf3aaf2be340770bc1824ad8ede45f46fb46 +SHA512 (libunwind-13.0.0.src.tar.xz) = 403ee8a34adb98fbcbba31d374cfffb974b82edb598b8b1d61203f8673a4c4e09704e4b9c78f87ff3b78192c82a9bfa5fa1428519cbb4209652baf767f4af2c1 +Size (libunwind-13.0.0.src.tar.xz) = 99668 bytes +BLAKE2s (llvm-13.0.0.src.tar.xz) = ffdfed33e870715f2e8c0efdc2c29566a2bffe5a6efce90ea7ca4990c9067f0f +SHA512 (llvm-13.0.0.src.tar.xz) = c307500a5fdc2bf6d768a808cf879d33914e24437f4f794361eccedb28ac6a98ebc41ca6140d09364c9bdec565fabd049e364d3f5b39f1751ecff51b687c4eff +Size (llvm-13.0.0.src.tar.xz) = 45471992 bytes SHA1 (patch-include_____libunwind__config.h) = b1727e79e7a00e4e5c412584dcfc357a696e2d6a SHA1 (patch-src_UnwindRegistersRestore.S) = bd8aa0754a87315efbe6cedcb81febcb32c8a020 SHA1 (patch-src_UnwindRegistersSave.S) = 6c976325c8d871550d75fa51047e6a0b92f00f52 diff --git a/lang/llvm/PLIST b/lang/llvm/PLIST index e40c20ffea9..ce72bc74d7a 100644 --- a/lang/llvm/PLIST +++ b/lang/llvm/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.17 2021/07/12 18:41:02 adam Exp $ +@comment $NetBSD: PLIST,v 1.18 2021/11/23 20:55:44 wiz Exp $ bin/FileCheck bin/bugpoint bin/count @@ -26,7 +26,6 @@ bin/llvm-dis bin/llvm-dlltool bin/llvm-dwarfdump bin/llvm-dwp -bin/llvm-elfabi bin/llvm-exegesis bin/llvm-extract bin/llvm-gsymutil @@ -49,6 +48,7 @@ bin/llvm-nm bin/llvm-objcopy bin/llvm-objdump bin/llvm-opt-report +bin/llvm-otool bin/llvm-pdbutil bin/llvm-profdata bin/llvm-profgen @@ -58,14 +58,17 @@ bin/llvm-readelf bin/llvm-readobj bin/llvm-reduce bin/llvm-rtdyld +bin/llvm-sim bin/llvm-size bin/llvm-split bin/llvm-stress bin/llvm-strings bin/llvm-strip bin/llvm-symbolizer +bin/llvm-tapi-diff bin/llvm-tblgen bin/llvm-undname +bin/llvm-windres bin/llvm-xray bin/not bin/obj2yaml @@ -104,6 +107,7 @@ include/llvm-c/Transforms/AggressiveInstCombine.h include/llvm-c/Transforms/Coroutines.h include/llvm-c/Transforms/IPO.h include/llvm-c/Transforms/InstCombine.h +include/llvm-c/Transforms/PassBuilder.h include/llvm-c/Transforms/PassManagerBuilder.h include/llvm-c/Transforms/Scalar.h include/llvm-c/Transforms/Utils.h @@ -158,6 +162,7 @@ include/llvm/ADT/PriorityQueue.h include/llvm/ADT/PriorityWorklist.h include/llvm/ADT/SCCIterator.h include/llvm/ADT/STLExtras.h +include/llvm/ADT/STLForwardCompat.h include/llvm/ADT/ScopeExit.h include/llvm/ADT/ScopedHashTable.h include/llvm/ADT/Sequence.h @@ -282,7 +287,9 @@ include/llvm/Analysis/MustExecute.h include/llvm/Analysis/ObjCARCAliasAnalysis.h include/llvm/Analysis/ObjCARCAnalysisUtils.h include/llvm/Analysis/ObjCARCInstKind.h +include/llvm/Analysis/ObjCARCUtil.h include/llvm/Analysis/OptimizationRemarkEmitter.h +include/llvm/Analysis/OverflowInstAnalysis.h include/llvm/Analysis/PHITransAddr.h include/llvm/Analysis/Passes.h include/llvm/Analysis/PhiValues.h @@ -322,6 +329,9 @@ include/llvm/Analysis/ValueLatticeUtils.h include/llvm/Analysis/ValueTracking.h include/llvm/Analysis/VecFuncs.def include/llvm/Analysis/VectorUtils.h +include/llvm/AsmParser/LLLexer.h +include/llvm/AsmParser/LLParser.h +include/llvm/AsmParser/LLToken.h include/llvm/AsmParser/Parser.h include/llvm/AsmParser/SlotMapping.h include/llvm/BinaryFormat/AMDGPUMetadataVerifier.h @@ -339,6 +349,7 @@ include/llvm/BinaryFormat/ELFRelocs/BPF.def include/llvm/BinaryFormat/ELFRelocs/CSKY.def include/llvm/BinaryFormat/ELFRelocs/Hexagon.def include/llvm/BinaryFormat/ELFRelocs/Lanai.def +include/llvm/BinaryFormat/ELFRelocs/M68k.def include/llvm/BinaryFormat/ELFRelocs/MSP430.def include/llvm/BinaryFormat/ELFRelocs/Mips.def include/llvm/BinaryFormat/ELFRelocs/PowerPC.def @@ -381,7 +392,6 @@ include/llvm/CodeGen/AsmPrinterHandler.h include/llvm/CodeGen/AtomicExpandUtils.h include/llvm/CodeGen/BasicBlockSectionUtils.h include/llvm/CodeGen/BasicTTIImpl.h -include/llvm/CodeGen/BuiltinGCs.h include/llvm/CodeGen/CSEConfigBase.h include/llvm/CodeGen/CalcSpillWeights.h include/llvm/CodeGen/CallingConvLower.h @@ -398,27 +408,28 @@ include/llvm/CodeGen/DwarfStringPoolEntry.h include/llvm/CodeGen/EdgeBundles.h include/llvm/CodeGen/ExecutionDomainFix.h include/llvm/CodeGen/ExpandReductions.h +include/llvm/CodeGen/ExpandVectorPredication.h include/llvm/CodeGen/FastISel.h include/llvm/CodeGen/FaultMaps.h include/llvm/CodeGen/FunctionLoweringInfo.h include/llvm/CodeGen/GCMetadata.h include/llvm/CodeGen/GCMetadataPrinter.h -include/llvm/CodeGen/GCStrategy.h include/llvm/CodeGen/GlobalISel/CSEInfo.h include/llvm/CodeGen/GlobalISel/CSEMIRBuilder.h include/llvm/CodeGen/GlobalISel/CallLowering.h include/llvm/CodeGen/GlobalISel/Combiner.h include/llvm/CodeGen/GlobalISel/CombinerHelper.h include/llvm/CodeGen/GlobalISel/CombinerInfo.h -include/llvm/CodeGen/GlobalISel/ConstantFoldingMIRBuilder.h include/llvm/CodeGen/GlobalISel/GISelChangeObserver.h include/llvm/CodeGen/GlobalISel/GISelKnownBits.h include/llvm/CodeGen/GlobalISel/GISelWorkList.h +include/llvm/CodeGen/GlobalISel/GenericMachineInstrs.h include/llvm/CodeGen/GlobalISel/IRTranslator.h include/llvm/CodeGen/GlobalISel/InlineAsmLowering.h include/llvm/CodeGen/GlobalISel/InstructionSelect.h include/llvm/CodeGen/GlobalISel/InstructionSelector.h include/llvm/CodeGen/GlobalISel/InstructionSelectorImpl.h +include/llvm/CodeGen/GlobalISel/LegacyLegalizerInfo.h include/llvm/CodeGen/GlobalISel/LegalizationArtifactCombiner.h include/llvm/CodeGen/GlobalISel/Legalizer.h include/llvm/CodeGen/GlobalISel/LegalizerHelper.h @@ -453,6 +464,7 @@ include/llvm/CodeGen/LiveVariables.h include/llvm/CodeGen/LoopTraversal.h include/llvm/CodeGen/LowLevelType.h include/llvm/CodeGen/MBFIWrapper.h +include/llvm/CodeGen/MIRFSDiscriminator.h include/llvm/CodeGen/MIRFormatter.h include/llvm/CodeGen/MIRParser/MIParser.h include/llvm/CodeGen/MIRParser/MIRParser.h @@ -479,6 +491,7 @@ include/llvm/CodeGen/MachineLoopUtils.h include/llvm/CodeGen/MachineMemOperand.h include/llvm/CodeGen/MachineModuleInfo.h include/llvm/CodeGen/MachineModuleInfoImpls.h +include/llvm/CodeGen/MachineModuleSlotTracker.h include/llvm/CodeGen/MachineOperand.h include/llvm/CodeGen/MachineOptimizationRemarkEmitter.h include/llvm/CodeGen/MachineOutliner.h @@ -512,6 +525,7 @@ include/llvm/CodeGen/RDFGraph.h include/llvm/CodeGen/RDFLiveness.h include/llvm/CodeGen/RDFRegisters.h include/llvm/CodeGen/ReachingDefAnalysis.h +include/llvm/CodeGen/RegAllocCommon.h include/llvm/CodeGen/RegAllocPBQP.h include/llvm/CodeGen/RegAllocRegistry.h include/llvm/CodeGen/Register.h @@ -519,6 +533,7 @@ include/llvm/CodeGen/RegisterClassInfo.h include/llvm/CodeGen/RegisterPressure.h include/llvm/CodeGen/RegisterScavenging.h include/llvm/CodeGen/RegisterUsageInfo.h +include/llvm/CodeGen/ReplaceWithVeclib.h include/llvm/CodeGen/ResourcePriorityQueue.h include/llvm/CodeGen/RuntimeLibcalls.h include/llvm/CodeGen/SDNodeProperties.td @@ -569,6 +584,9 @@ include/llvm/DWARFLinker/DWARFLinker.h include/llvm/DWARFLinker/DWARFLinkerCompileUnit.h include/llvm/DWARFLinker/DWARFLinkerDeclContext.h include/llvm/DWARFLinker/DWARFStreamer.h +include/llvm/DWP/DWP.h +include/llvm/DWP/DWPError.h +include/llvm/DWP/DWPStringPool.h include/llvm/DebugInfo/CodeView/AppendingTypeTableBuilder.h include/llvm/DebugInfo/CodeView/CVRecord.h include/llvm/DebugInfo/CodeView/CVSymbolVisitor.h @@ -821,6 +839,7 @@ include/llvm/ExecutionEngine/Interpreter.h include/llvm/ExecutionEngine/JITEventListener.h include/llvm/ExecutionEngine/JITLink/EHFrameSupport.h include/llvm/ExecutionEngine/JITLink/ELF.h +include/llvm/ExecutionEngine/JITLink/ELF_riscv.h include/llvm/ExecutionEngine/JITLink/ELF_x86_64.h include/llvm/ExecutionEngine/JITLink/JITLink.h include/llvm/ExecutionEngine/JITLink/JITLinkDylib.h @@ -828,6 +847,8 @@ include/llvm/ExecutionEngine/JITLink/JITLinkMemoryManager.h include/llvm/ExecutionEngine/JITLink/MachO.h include/llvm/ExecutionEngine/JITLink/MachO_arm64.h include/llvm/ExecutionEngine/JITLink/MachO_x86_64.h +include/llvm/ExecutionEngine/JITLink/riscv.h +include/llvm/ExecutionEngine/JITLink/x86_64.h include/llvm/ExecutionEngine/JITSymbol.h include/llvm/ExecutionEngine/MCJIT.h include/llvm/ExecutionEngine/OProfileWrapper.h @@ -835,13 +856,20 @@ include/llvm/ExecutionEngine/ObjectCache.h include/llvm/ExecutionEngine/Orc/CompileOnDemandLayer.h include/llvm/ExecutionEngine/Orc/CompileUtils.h include/llvm/ExecutionEngine/Orc/Core.h +include/llvm/ExecutionEngine/Orc/DebugObjectManagerPlugin.h include/llvm/ExecutionEngine/Orc/DebugUtils.h +include/llvm/ExecutionEngine/Orc/EPCDebugObjectRegistrar.h +include/llvm/ExecutionEngine/Orc/EPCDynamicLibrarySearchGenerator.h +include/llvm/ExecutionEngine/Orc/EPCEHFrameRegistrar.h +include/llvm/ExecutionEngine/Orc/EPCIndirectionUtils.h include/llvm/ExecutionEngine/Orc/ExecutionUtils.h +include/llvm/ExecutionEngine/Orc/ExecutorProcessControl.h include/llvm/ExecutionEngine/Orc/IRCompileLayer.h include/llvm/ExecutionEngine/Orc/IRTransformLayer.h include/llvm/ExecutionEngine/Orc/IndirectionUtils.h include/llvm/ExecutionEngine/Orc/JITTargetMachineBuilder.h include/llvm/ExecutionEngine/Orc/LLJIT.h +include/llvm/ExecutionEngine/Orc/LLVMSPSSerializers.h include/llvm/ExecutionEngine/Orc/Layer.h include/llvm/ExecutionEngine/Orc/LazyReexports.h include/llvm/ExecutionEngine/Orc/MachOPlatform.h @@ -849,27 +877,27 @@ include/llvm/ExecutionEngine/Orc/Mangling.h include/llvm/ExecutionEngine/Orc/ObjectLinkingLayer.h include/llvm/ExecutionEngine/Orc/ObjectTransformLayer.h include/llvm/ExecutionEngine/Orc/OrcABISupport.h -include/llvm/ExecutionEngine/Orc/OrcRPCTargetProcessControl.h +include/llvm/ExecutionEngine/Orc/OrcRPCExecutorProcessControl.h include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h include/llvm/ExecutionEngine/Orc/OrcRemoteTargetRPCAPI.h include/llvm/ExecutionEngine/Orc/OrcRemoteTargetServer.h include/llvm/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.h +include/llvm/ExecutionEngine/Orc/Shared/ExecutorAddress.h include/llvm/ExecutionEngine/Orc/Shared/FDRawByteChannel.h include/llvm/ExecutionEngine/Orc/Shared/OrcError.h include/llvm/ExecutionEngine/Orc/Shared/RPCUtils.h include/llvm/ExecutionEngine/Orc/Shared/RawByteChannel.h include/llvm/ExecutionEngine/Orc/Shared/Serialization.h +include/llvm/ExecutionEngine/Orc/Shared/SimplePackedSerialization.h include/llvm/ExecutionEngine/Orc/Shared/TargetProcessControlTypes.h +include/llvm/ExecutionEngine/Orc/Shared/WrapperFunctionUtils.h include/llvm/ExecutionEngine/Orc/SpeculateAnalyses.h include/llvm/ExecutionEngine/Orc/Speculation.h include/llvm/ExecutionEngine/Orc/SymbolStringPool.h -include/llvm/ExecutionEngine/Orc/TPCDynamicLibrarySearchGenerator.h -include/llvm/ExecutionEngine/Orc/TPCEHFrameRegistrar.h -include/llvm/ExecutionEngine/Orc/TPCIndirectionUtils.h +include/llvm/ExecutionEngine/Orc/TargetProcess/JITLoaderGDB.h include/llvm/ExecutionEngine/Orc/TargetProcess/OrcRPCTPCServer.h include/llvm/ExecutionEngine/Orc/TargetProcess/RegisterEHFrames.h include/llvm/ExecutionEngine/Orc/TargetProcess/TargetExecutionUtils.h -include/llvm/ExecutionEngine/Orc/TargetProcessControl.h include/llvm/ExecutionEngine/Orc/ThreadSafeModule.h include/llvm/ExecutionEngine/OrcMCJITReplacement.h include/llvm/ExecutionEngine/OrcV1Deprecation.h @@ -905,6 +933,7 @@ include/llvm/IR/Attributes.inc include/llvm/IR/Attributes.td include/llvm/IR/AutoUpgrade.h include/llvm/IR/BasicBlock.h +include/llvm/IR/BuiltinGCs.h include/llvm/IR/CFG.h include/llvm/IR/CallingConv.h include/llvm/IR/Comdat.h @@ -929,6 +958,7 @@ include/llvm/IR/FPEnv.h include/llvm/IR/FixedMetadataKinds.def include/llvm/IR/FixedPointBuilder.h include/llvm/IR/Function.h +include/llvm/IR/GCStrategy.h include/llvm/IR/GVMaterializer.h include/llvm/IR/GetElementPtrTypeIterator.h include/llvm/IR/GlobalAlias.h @@ -1033,8 +1063,8 @@ include/llvm/IR/Verifier.h include/llvm/IRReader/IRReader.h include/llvm/InitializePasses.h include/llvm/InterfaceStub/ELFObjHandler.h -include/llvm/InterfaceStub/ELFStub.h -include/llvm/InterfaceStub/TBEHandler.h +include/llvm/InterfaceStub/IFSHandler.h +include/llvm/InterfaceStub/IFSStub.h include/llvm/LTO/Caching.h include/llvm/LTO/Config.h include/llvm/LTO/LTO.h @@ -1105,6 +1135,7 @@ include/llvm/MC/MCSchedule.h include/llvm/MC/MCSection.h include/llvm/MC/MCSectionCOFF.h include/llvm/MC/MCSectionELF.h +include/llvm/MC/MCSectionGOFF.h include/llvm/MC/MCSectionMachO.h include/llvm/MC/MCSectionWasm.h include/llvm/MC/MCSectionXCOFF.h @@ -1113,6 +1144,7 @@ include/llvm/MC/MCSubtargetInfo.h include/llvm/MC/MCSymbol.h include/llvm/MC/MCSymbolCOFF.h include/llvm/MC/MCSymbolELF.h +include/llvm/MC/MCSymbolGOFF.h include/llvm/MC/MCSymbolMachO.h include/llvm/MC/MCSymbolWasm.h include/llvm/MC/MCSymbolXCOFF.h @@ -1133,6 +1165,7 @@ include/llvm/MC/StringTableBuilder.h include/llvm/MC/SubtargetFeature.h include/llvm/MCA/CodeEmitter.h include/llvm/MCA/Context.h +include/llvm/MCA/CustomBehaviour.h include/llvm/MCA/HWEventListener.h include/llvm/MCA/HardwareUnits/HardwareUnit.h include/llvm/MCA/HardwareUnits/LSUnit.h @@ -1147,6 +1180,7 @@ include/llvm/MCA/SourceMgr.h include/llvm/MCA/Stages/DispatchStage.h include/llvm/MCA/Stages/EntryStage.h include/llvm/MCA/Stages/ExecuteStage.h +include/llvm/MCA/Stages/InOrderIssueStage.h include/llvm/MCA/Stages/InstructionTables.h include/llvm/MCA/Stages/MicroOpQueueStage.h include/llvm/MCA/Stages/RetireStage.h @@ -1164,6 +1198,7 @@ include/llvm/Object/ELF.h include/llvm/Object/ELFObjectFile.h include/llvm/Object/ELFTypes.h include/llvm/Object/Error.h +include/llvm/Object/FaultMapParser.h include/llvm/Object/IRObjectFile.h include/llvm/Object/IRSymtab.h include/llvm/Object/MachO.h @@ -1253,7 +1288,9 @@ include/llvm/Support/AllocatorBase.h include/llvm/Support/ArrayRecycler.h include/llvm/Support/Atomic.h include/llvm/Support/AtomicOrdering.h +include/llvm/Support/AutoConvert.h include/llvm/Support/Automaton.h +include/llvm/Support/BCD.h include/llvm/Support/Base64.h include/llvm/Support/BinaryByteStream.h include/llvm/Support/BinaryItemStream.h @@ -1289,6 +1326,7 @@ include/llvm/Support/DataExtractor.h include/llvm/Support/DataTypes.h include/llvm/Support/Debug.h include/llvm/Support/DebugCounter.h +include/llvm/Support/Discriminator.h include/llvm/Support/DynamicLibrary.h include/llvm/Support/ELFAttributeParser.h include/llvm/Support/ELFAttributes.h @@ -1364,6 +1402,7 @@ include/llvm/Support/Regex.h include/llvm/Support/Registry.h include/llvm/Support/ReverseIteration.h include/llvm/Support/SHA1.h +include/llvm/Support/SHA256.h include/llvm/Support/SMLoc.h include/llvm/Support/SMTAPI.h include/llvm/Support/SaveAndRestore.h @@ -1450,16 +1489,16 @@ include/llvm/Target/TargetSelectionDAG.td include/llvm/Testing/Support/Annotations.h include/llvm/Testing/Support/Error.h include/llvm/Testing/Support/SupportHelpers.h -include/llvm/TextAPI/MachO/Architecture.def -include/llvm/TextAPI/MachO/Architecture.h -include/llvm/TextAPI/MachO/ArchitectureSet.h -include/llvm/TextAPI/MachO/InterfaceFile.h -include/llvm/TextAPI/MachO/PackedVersion.h -include/llvm/TextAPI/MachO/Platform.h -include/llvm/TextAPI/MachO/Symbol.h -include/llvm/TextAPI/MachO/Target.h -include/llvm/TextAPI/MachO/TextAPIReader.h -include/llvm/TextAPI/MachO/TextAPIWriter.h +include/llvm/TextAPI/Architecture.def +include/llvm/TextAPI/Architecture.h +include/llvm/TextAPI/ArchitectureSet.h +include/llvm/TextAPI/InterfaceFile.h +include/llvm/TextAPI/PackedVersion.h +include/llvm/TextAPI/Platform.h +include/llvm/TextAPI/Symbol.h +include/llvm/TextAPI/Target.h +include/llvm/TextAPI/TextAPIReader.h +include/llvm/TextAPI/TextAPIWriter.h include/llvm/ToolDrivers/llvm-dlltool/DlltoolDriver.h include/llvm/ToolDrivers/llvm-lib/LibDriver.h include/llvm/Transforms/AggressiveInstCombine/AggressiveInstCombine.h @@ -1469,7 +1508,6 @@ include/llvm/Transforms/Coroutines/CoroCleanup.h include/llvm/Transforms/Coroutines/CoroEarly.h include/llvm/Transforms/Coroutines/CoroElide.h include/llvm/Transforms/Coroutines/CoroSplit.h -include/llvm/Transforms/HelloNew/HelloWorld.h include/llvm/Transforms/IPO.h include/llvm/Transforms/IPO/AlwaysInliner.h include/llvm/Transforms/IPO/Annotation2Metadata.h @@ -1498,6 +1536,7 @@ include/llvm/Transforms/IPO/MergeFunctions.h include/llvm/Transforms/IPO/OpenMPOpt.h include/llvm/Transforms/IPO/PartialInlining.h include/llvm/Transforms/IPO/PassManagerBuilder.h +include/llvm/Transforms/IPO/ProfiledCallGraph.h include/llvm/Transforms/IPO/SCCP.h include/llvm/Transforms/IPO/SampleContextTracker.h include/llvm/Transforms/IPO/SampleProfile.h @@ -1513,6 +1552,7 @@ include/llvm/Transforms/InstCombine/InstCombiner.h include/llvm/Transforms/Instrumentation.h include/llvm/Transforms/Instrumentation/AddressSanitizer.h include/llvm/Transforms/Instrumentation/AddressSanitizerCommon.h +include/llvm/Transforms/Instrumentation/AddressSanitizerOptions.h include/llvm/Transforms/Instrumentation/BoundsChecking.h include/llvm/Transforms/Instrumentation/CGProfile.h include/llvm/Transforms/Instrumentation/ControlHeightReduction.h @@ -1538,6 +1578,7 @@ include/llvm/Transforms/Scalar/ConstantHoisting.h include/llvm/Transforms/Scalar/ConstraintElimination.h include/llvm/Transforms/Scalar/CorrelatedValuePropagation.h include/llvm/Transforms/Scalar/DCE.h +include/llvm/Transforms/Scalar/DFAJumpThreading.h include/llvm/Transforms/Scalar/DeadStoreElimination.h include/llvm/Transforms/Scalar/DivRemPairs.h include/llvm/Transforms/Scalar/EarlyCSE.h @@ -1553,6 +1594,7 @@ include/llvm/Transforms/Scalar/InstSimplifyPass.h include/llvm/Transforms/Scalar/JumpThreading.h include/llvm/Transforms/Scalar/LICM.h include/llvm/Transforms/Scalar/LoopAccessAnalysisPrinter.h +include/llvm/Transforms/Scalar/LoopBoundSplit.h include/llvm/Transforms/Scalar/LoopDataPrefetch.h include/llvm/Transforms/Scalar/LoopDeletion.h include/llvm/Transforms/Scalar/LoopDistribute.h @@ -1596,7 +1638,6 @@ include/llvm/Transforms/Scalar/SeparateConstOffsetFromGEP.h include/llvm/Transforms/Scalar/SimpleLoopUnswitch.h include/llvm/Transforms/Scalar/SimplifyCFG.h include/llvm/Transforms/Scalar/Sink.h -include/llvm/Transforms/Scalar/SpeculateAroundPHIs.h include/llvm/Transforms/Scalar/SpeculativeExecution.h include/llvm/Transforms/Scalar/StraightLineStrengthReduce.h include/llvm/Transforms/Scalar/StructurizeCFG.h @@ -1628,6 +1669,7 @@ include/llvm/Transforms/Utils/FunctionComparator.h include/llvm/Transforms/Utils/FunctionImportUtils.h include/llvm/Transforms/Utils/GlobalStatus.h include/llvm/Transforms/Utils/GuardUtils.h +include/llvm/Transforms/Utils/HelloWorld.h include/llvm/Transforms/Utils/InjectTLIMappings.h include/llvm/Transforms/Utils/InstructionNamer.h include/llvm/Transforms/Utils/IntegerDivision.h @@ -1644,14 +1686,19 @@ include/llvm/Transforms/Utils/LowerMemIntrinsics.h include/llvm/Transforms/Utils/LowerSwitch.h include/llvm/Transforms/Utils/MatrixUtils.h include/llvm/Transforms/Utils/Mem2Reg.h +include/llvm/Transforms/Utils/MemoryOpRemark.h include/llvm/Transforms/Utils/MetaRenamer.h include/llvm/Transforms/Utils/ModuleUtils.h include/llvm/Transforms/Utils/NameAnonGlobals.h include/llvm/Transforms/Utils/PredicateInfo.h include/llvm/Transforms/Utils/PromoteMemToReg.h +include/llvm/Transforms/Utils/RelLookupTableConverter.h +include/llvm/Transforms/Utils/SCCPSolver.h include/llvm/Transforms/Utils/SSAUpdater.h include/llvm/Transforms/Utils/SSAUpdaterBulk.h include/llvm/Transforms/Utils/SSAUpdaterImpl.h +include/llvm/Transforms/Utils/SampleProfileLoaderBaseImpl.h +include/llvm/Transforms/Utils/SampleProfileLoaderBaseUtil.h include/llvm/Transforms/Utils/SanitizerStats.h include/llvm/Transforms/Utils/ScalarEvolutionExpander.h include/llvm/Transforms/Utils/SimplifyCFGOptions.h @@ -1664,7 +1711,6 @@ include/llvm/Transforms/Utils/StripNonLineTableDebugInfo.h include/llvm/Transforms/Utils/SymbolRewriter.h include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h include/llvm/Transforms/Utils/UnifyLoopExits.h -include/llvm/Transforms/Utils/UniqueInternalLinkageNames.h include/llvm/Transforms/Utils/UnrollLoop.h include/llvm/Transforms/Utils/VNCoercion.h include/llvm/Transforms/Utils/ValueMapper.h @@ -1701,7 +1747,6 @@ lib/cmake/llvm/AddOCaml.cmake lib/cmake/llvm/AddSphinxTarget.cmake lib/cmake/llvm/CheckAtomic.cmake lib/cmake/llvm/CheckCompilerVersion.cmake -lib/cmake/llvm/CheckLinkerFlag.cmake lib/cmake/llvm/ChooseMSVCCRT.cmake lib/cmake/llvm/CrossCompile.cmake lib/cmake/llvm/DetermineGCCCompatible.cmake @@ -1711,11 +1756,13 @@ lib/cmake/llvm/FindOCaml.cmake lib/cmake/llvm/FindSphinx.cmake lib/cmake/llvm/FindZ3.cmake lib/cmake/llvm/GenerateVersionFromVCS.cmake +lib/cmake/llvm/GetErrcMessages.cmake lib/cmake/llvm/GetLibraryName.cmake lib/cmake/llvm/HandleLLVMOptions.cmake lib/cmake/llvm/HandleLLVMStdlib.cmake lib/cmake/llvm/LLVM-Build.cmake lib/cmake/llvm/LLVM-Config.cmake +lib/cmake/llvm/LLVMCheckLinkerFlag.cmake lib/cmake/llvm/LLVMConfig.cmake lib/cmake/llvm/LLVMConfigExtensions.cmake lib/cmake/llvm/LLVMConfigVersion.cmake @@ -1730,7 +1777,7 @@ lib/cmake/llvm/TensorFlowCompile.cmake lib/cmake/llvm/UseLibtool.cmake lib/cmake/llvm/VersionFromVCS.cmake lib/libLLVM-${PKGVERSION}.${SOEXT} -lib/libLLVM-12.so +lib/libLLVM-13.so lib/libLLVM.${SOEXT} ${PLIST.AArch64}lib/libLLVMAArch64AsmParser.a ${PLIST.AArch64}lib/libLLVMAArch64CodeGen.a @@ -1769,11 +1816,13 @@ lib/libLLVMBitReader.a lib/libLLVMBitWriter.a lib/libLLVMBitstreamReader.a lib/libLLVMCFGuard.a +lib/libLLVMCFIVerify.a lib/libLLVMCodeGen.a lib/libLLVMCore.a lib/libLLVMCoroutines.a lib/libLLVMCoverage.a lib/libLLVMDWARFLinker.a +lib/libLLVMDWP.a lib/libLLVMDebugInfoCodeView.a lib/libLLVMDebugInfoDWARF.a lib/libLLVMDebugInfoGSYM.a @@ -1782,13 +1831,17 @@ lib/libLLVMDebugInfoPDB.a lib/libLLVMDemangle.a lib/libLLVMDlltoolDriver.a lib/libLLVMExecutionEngine.a +lib/libLLVMExegesis.a +lib/libLLVMExegesisAArch64.a +lib/libLLVMExegesisMips.a +lib/libLLVMExegesisPowerPC.a +lib/libLLVMExegesisX86.a lib/libLLVMExtensions.a lib/libLLVMFileCheck.a lib/libLLVMFrontendOpenACC.a lib/libLLVMFrontendOpenMP.a lib/libLLVMFuzzMutate.a lib/libLLVMGlobalISel.a -lib/libLLVMHelloNew.a ${PLIST.Hexagon}lib/libLLVMHexagonAsmParser.a ${PLIST.Hexagon}lib/libLLVMHexagonCodeGen.a ${PLIST.Hexagon}lib/libLLVMHexagonDesc.a @@ -1811,6 +1864,7 @@ lib/libLLVMLineEditor.a lib/libLLVMLinker.a lib/libLLVMMC.a lib/libLLVMMCA.a +lib/libLLVMMCACustomBehaviourAMDGPU.a lib/libLLVMMCDisassembler.a lib/libLLVMMCJIT.a lib/libLLVMMCParser.a @@ -1864,6 +1918,7 @@ ${PLIST.SystemZ}lib/libLLVMSystemZDesc.a ${PLIST.SystemZ}lib/libLLVMSystemZDisassembler.a ${PLIST.SystemZ}lib/libLLVMSystemZInfo.a lib/libLLVMTableGen.a +lib/libLLVMTableGenGlobalISel.a lib/libLLVMTarget.a lib/libLLVMTextAPI.a lib/libLLVMTransformUtils.a @@ -1873,6 +1928,7 @@ ${PLIST.WebAssembly}lib/libLLVMWebAssemblyCodeGen.a ${PLIST.WebAssembly}lib/libLLVMWebAssemblyDesc.a ${PLIST.WebAssembly}lib/libLLVMWebAssemblyDisassembler.a ${PLIST.WebAssembly}lib/libLLVMWebAssemblyInfo.a +${PLIST.WebAssembly}lib/libLLVMWebAssemblyUtils.a lib/libLLVMWindowsManifest.a ${PLIST.X86}lib/libLLVMX86AsmParser.a ${PLIST.X86}lib/libLLVMX86CodeGen.a @@ -1886,9 +1942,9 @@ ${PLIST.XCore}lib/libLLVMXCoreInfo.a lib/libLLVMXRay.a lib/libLLVMipo.a lib/libLTO.${SOEXT} -${PLIST.notdylib}lib/libLTO.${SOEXT}.12 +${PLIST.notdylib}lib/libLTO.${SOEXT}.13 lib/libRemarks.${SOEXT} -${PLIST.notdylib}lib/libRemarks.${SOEXT}.12 +${PLIST.notdylib}lib/libRemarks.${SOEXT}.13 share/opt-viewer/opt-diff.py share/opt-viewer/opt-stats.py share/opt-viewer/opt-viewer.py diff --git a/lang/llvm/buildlink3.mk b/lang/llvm/buildlink3.mk index 45b294c3093..ff7e8284eb1 100644 --- a/lang/llvm/buildlink3.mk +++ b/lang/llvm/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.15 2021/07/12 18:41:02 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2021/11/23 20:55:44 wiz Exp $ BUILDLINK_TREE+= llvm @@ -6,6 +6,7 @@ BUILDLINK_TREE+= llvm LLVM_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.llvm+= llvm>=10.0.1 +BUILDLINK_ABI_DEPENDS.llvm+= llvm>=13.0.0 BUILDLINK_PKGSRCDIR.llvm?= ../../lang/llvm LLVM_CONFIG_PATH?= ${BUILDLINK_PREFIX.llvm}/bin/llvm-config @@ -37,7 +38,6 @@ BUILDLINK_FILES.llvm+= bin/llvm-dis BUILDLINK_FILES.llvm+= bin/llvm-dlltool BUILDLINK_FILES.llvm+= bin/llvm-dwarfdump BUILDLINK_FILES.llvm+= bin/llvm-dwp -BUILDLINK_FILES.llvm+= bin/llvm-elfabi BUILDLINK_FILES.llvm+= bin/llvm-exegesis BUILDLINK_FILES.llvm+= bin/llvm-extract BUILDLINK_FILES.llvm+= bin/llvm-gsymutil @@ -60,6 +60,7 @@ BUILDLINK_FILES.llvm+= bin/llvm-nm BUILDLINK_FILES.llvm+= bin/llvm-objcopy BUILDLINK_FILES.llvm+= bin/llvm-objdump BUILDLINK_FILES.llvm+= bin/llvm-opt-report +BUILDLINK_FILES.llvm+= bin/llvm-otool BUILDLINK_FILES.llvm+= bin/llvm-pdbutil BUILDLINK_FILES.llvm+= bin/llvm-profdata BUILDLINK_FILES.llvm+= bin/llvm-profgen @@ -69,14 +70,17 @@ BUILDLINK_FILES.llvm+= bin/llvm-readelf BUILDLINK_FILES.llvm+= bin/llvm-readobj BUILDLINK_FILES.llvm+= bin/llvm-reduce BUILDLINK_FILES.llvm+= bin/llvm-rtdyld +BUILDLINK_FILES.llvm+= bin/llvm-sim BUILDLINK_FILES.llvm+= bin/llvm-size BUILDLINK_FILES.llvm+= bin/llvm-split BUILDLINK_FILES.llvm+= bin/llvm-stress BUILDLINK_FILES.llvm+= bin/llvm-strings BUILDLINK_FILES.llvm+= bin/llvm-strip BUILDLINK_FILES.llvm+= bin/llvm-symbolizer +BUILDLINK_FILES.llvm+= bin/llvm-tapi-diff BUILDLINK_FILES.llvm+= bin/llvm-tblgen BUILDLINK_FILES.llvm+= bin/llvm-undname +BUILDLINK_FILES.llvm+= bin/llvm-windres BUILDLINK_FILES.llvm+= bin/llvm-xray BUILDLINK_FILES.llvm+= bin/not BUILDLINK_FILES.llvm+= bin/obj2yaml diff --git a/lang/llvm/distinfo b/lang/llvm/distinfo index 0775011cce3..dd211992983 100644 --- a/lang/llvm/distinfo +++ b/lang/llvm/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.31 2021/10/26 10:51:41 nia Exp $ +$NetBSD: distinfo,v 1.32 2021/11/23 20:55:44 wiz Exp $ -BLAKE2s (llvm-12.0.1.src.tar.xz) = 7fd5bf0ff1277bba7dfec2e1451e833d0dc2e47aa1f3cacfd4940fd992fc3100 -SHA512 (llvm-12.0.1.src.tar.xz) = ff674afb4c8eea699a4756f1bb463f15098a7fa354c733de83c024f8f0cf238cd5f19ae3ec446831c7109235e293e2bf31d8562567ede163c8ec53af7306ba0f -Size (llvm-12.0.1.src.tar.xz) = 42898504 bytes +BLAKE2s (llvm-13.0.0.src.tar.xz) = ffdfed33e870715f2e8c0efdc2c29566a2bffe5a6efce90ea7ca4990c9067f0f +SHA512 (llvm-13.0.0.src.tar.xz) = c307500a5fdc2bf6d768a808cf879d33914e24437f4f794361eccedb28ac6a98ebc41ca6140d09364c9bdec565fabd049e364d3f5b39f1751ecff51b687c4eff +Size (llvm-13.0.0.src.tar.xz) = 45471992 bytes SHA1 (patch-CMakeLists.txt) = 78e2dab2bf73f7e466ca2788fe6444e39b4ebd80 SHA1 (patch-cmake_config-ix.cmake) = 0c89e208e9e101a6d80aaa5007126eefb0d3647c -SHA1 (patch-cmake_modules_AddLLVM.cmake) = fe771db1846dc6abaecf0d4268f2ca567f143cef +SHA1 (patch-cmake_modules_AddLLVM.cmake) = 148897aeba8c29b9cf55eade62554710ae0f63f3 SHA1 (patch-include_llvm-c_DataTypes.h) = 790c9458d6590a0d6985fdcbd8785da340b9779b SHA1 (patch-include_llvm_Analysis_ConstantFolding.h) = 56b9374da236c346565897977040255b9766cab8 -SHA1 (patch-tools_llvm-shlib_CMakeLists.txt) = 28f417bbfa17f2e644042350da5b98c07b834968 +SHA1 (patch-tools_llvm-shlib_CMakeLists.txt) = 97b9c7c3487989c2909dd0294a67a5328d9ef309 diff --git a/lang/llvm/patches/patch-cmake_modules_AddLLVM.cmake b/lang/llvm/patches/patch-cmake_modules_AddLLVM.cmake index d404b4d31b7..788c13c2f6b 100644 --- a/lang/llvm/patches/patch-cmake_modules_AddLLVM.cmake +++ b/lang/llvm/patches/patch-cmake_modules_AddLLVM.cmake @@ -1,25 +1,25 @@ -$NetBSD: patch-cmake_modules_AddLLVM.cmake,v 1.7 2021/07/12 18:41:02 adam Exp $ +$NetBSD: patch-cmake_modules_AddLLVM.cmake,v 1.8 2021/11/23 20:55:44 wiz Exp $ On Darwin, create symbolic links to shared libraries. On Darwin, use correct install-name for shared libraries. ---- cmake/modules/AddLLVM.cmake.orig 2020-10-07 10:10:48.000000000 +0000 +--- cmake/modules/AddLLVM.cmake.orig 2021-09-24 16:18:10.000000000 +0000 +++ cmake/modules/AddLLVM.cmake -@@ -596,7 +596,7 @@ function(llvm_add_library name) +@@ -607,7 +607,7 @@ function(llvm_add_library name) endif() - if(ARG_SHARED AND UNIX) + if(ARG_SHARED) - if(NOT APPLE AND ARG_SONAME) + if(ARG_SONAME) get_target_property(output_name ${name} OUTPUT_NAME) if(${output_name} STREQUAL "output_name-NOTFOUND") set(output_name ${name}) -@@ -2063,7 +2063,7 @@ function(llvm_setup_rpath name) +@@ -2118,7 +2118,7 @@ function(llvm_setup_rpath name) endif() if (APPLE) - set(_install_name_dir INSTALL_NAME_DIR "@rpath") + set(_install_name_dir INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib") set(_install_rpath "@loader_path/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) - elseif(UNIX) - set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) + elseif(${CMAKE_SYSTEM_NAME} MATCHES "AIX" AND BUILD_SHARED_LIBS) + # $ORIGIN is not interpreted at link time by aix ld. diff --git a/lang/llvm/patches/patch-tools_llvm-shlib_CMakeLists.txt b/lang/llvm/patches/patch-tools_llvm-shlib_CMakeLists.txt index a8e697d8b9c..d881ebd51a7 100644 --- a/lang/llvm/patches/patch-tools_llvm-shlib_CMakeLists.txt +++ b/lang/llvm/patches/patch-tools_llvm-shlib_CMakeLists.txt @@ -1,10 +1,10 @@ -$NetBSD: patch-tools_llvm-shlib_CMakeLists.txt,v 1.6 2019/10/19 13:52:40 adam Exp $ +$NetBSD: patch-tools_llvm-shlib_CMakeLists.txt,v 1.7 2021/11/23 20:55:44 wiz Exp $ Use the Linux style linking everywhere except Darwin and SunOS. ---- tools/llvm-shlib/CMakeLists.txt.orig 2019-08-29 08:58:14.000000000 +0000 +--- tools/llvm-shlib/CMakeLists.txt.orig 2021-09-24 16:18:10.000000000 +0000 +++ tools/llvm-shlib/CMakeLists.txt -@@ -45,13 +45,11 @@ if(LLVM_BUILD_LLVM_DYLIB) +@@ -33,13 +33,11 @@ if(LLVM_BUILD_LLVM_DYLIB) add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${INSTALL_WITH_TOOLCHAIN} ${SOURCES}) list(REMOVE_DUPLICATES LIB_NAMES) @@ -23,9 +23,9 @@ Use the Linux style linking everywhere except Darwin and SunOS. configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/simple_version_script.map.in ${LLVM_LIBRARY_DIR}/tools/llvm-shlib/simple_version_script.map) -@@ -62,8 +60,6 @@ if(LLVM_BUILD_LLVM_DYLIB) - # Solaris ld does not accept global: *; so there is no way to version *all* global symbols - set(LIB_NAMES -Wl,--version-script,${LLVM_LIBRARY_DIR}/tools/llvm-shlib/simple_version_script.map ${LIB_NAMES}) +@@ -57,8 +55,6 @@ if(LLVM_BUILD_LLVM_DYLIB) + # inside and outside libLLVM.so. + target_link_options(LLVM PRIVATE LINKER:-Bsymbolic-functions) endif() - elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin") - set(LIB_NAMES -Wl,-all_load ${LIB_NAMES}) diff --git a/lang/llvm/version.mk b/lang/llvm/version.mk index ce6d872be79..cc83a3eac95 100644 --- a/lang/llvm/version.mk +++ b/lang/llvm/version.mk @@ -1,4 +1,4 @@ -# $NetBSD: version.mk,v 1.5 2021/07/12 18:41:02 adam Exp $ +# $NetBSD: version.mk,v 1.6 2021/11/23 20:55:44 wiz Exp $ # used by devel/lld # used by devel/lldb # used by devel/polly @@ -10,7 +10,7 @@ # used by lang/libunwind # used by parallel/openmp -LLVM_VERSION= 12.0.1 +LLVM_VERSION= 13.0.0 MASTER_SITES= ${MASTER_SITE_GITHUB:=llvm/} GITHUB_PROJECT= llvm-project GITHUB_RELEASE= llvmorg-${PKGVERSION_NOREV} diff --git a/lang/zig/Makefile b/lang/zig/Makefile index 83b934321e8..68bf3c3775c 100644 --- a/lang/zig/Makefile +++ b/lang/zig/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2021/07/12 18:58:25 adam Exp $ +# $NetBSD: Makefile,v 1.12 2021/11/23 20:55:44 wiz Exp $ DISTNAME= zig-0.8.0 CATEGORIES= lang @@ -10,6 +10,9 @@ HOMEPAGE= https://ziglang.org/ COMMENT= Programming language designed for robustness and clarity LICENSE= mit +BROKEN= "Needs a new upstream release that works with llvm-13" +# https://github.com/ziglang/zig/issues/10187 + USE_CMAKE= yes USE_TOOLS+= bash:run USE_LANGUAGES= c c++14 diff --git a/parallel/opencl-clang/Makefile b/parallel/opencl-clang/Makefile index 2d3c2315d63..858b647188a 100644 --- a/parallel/opencl-clang/Makefile +++ b/parallel/opencl-clang/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.3 2021/11/20 23:16:37 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2021/11/23 20:55:44 wiz Exp $ -DISTNAME= opencl-clang-12.0.0 +DISTNAME= opencl-clang-13.0.0 CATEGORIES= parallel MASTER_SITES= ${MASTER_SITE_GITHUB:=intel/} GITHUB_TAG= v${PKGVERSION_NOREV} @@ -11,25 +11,11 @@ COMMENT= OpenCL-oriented wrapper library around clang LICENSE= modified-bsd USE_CMAKE= yes -# there is a bug somewhere.. -# make[2]: Graph cycles through `cl_headers/module.modulemap' -USE_TOOLS+= gmake USE_LANGUAGES= c c++ # C++14 GCC_REQD+= 5 -.include "../../mk/bsd.prefs.mk" - -pre-configure: -.if empty(PKGSRC_COMPILER:M*clang*) -# XXX: When using GCC, pkgsrc provides 'clang' wrappers that are actually gcc. -# XXX: This is copied from Firefox, which also needs this hack... - ${LN} -sf ${PREFIX}/bin/clang ${WRKDIR}/.cwrapper/bin/clang - ${LN} -sf ${PREFIX}/bin/clang++ ${WRKDIR}/.cwrapper/bin/clang++ - ${LN} -sf ${PREFIX}/bin/clang-cpp ${WRKDIR}/.cwrapper/bin/clang-cpp -.endif - .include "../../parallel/spirv-llvm-translator/buildlink3.mk" .include "../../lang/clang/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/parallel/opencl-clang/PLIST b/parallel/opencl-clang/PLIST index 9964a41973c..34b7fdb275a 100644 --- a/parallel/opencl-clang/PLIST +++ b/parallel/opencl-clang/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2021/08/11 20:49:25 nia Exp $ +@comment $NetBSD: PLIST,v 1.3 2021/11/23 20:55:44 wiz Exp $ include/cclang/common_clang.h lib/libopencl-clang.so -lib/libopencl-clang.so.12 +lib/libopencl-clang.so.13 diff --git a/parallel/opencl-clang/distinfo b/parallel/opencl-clang/distinfo index accbea7b2d5..51b8cd4d230 100644 --- a/parallel/opencl-clang/distinfo +++ b/parallel/opencl-clang/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.5 2021/11/20 23:16:37 wiz Exp $ +$NetBSD: distinfo,v 1.6 2021/11/23 20:55:44 wiz Exp $ -BLAKE2s (opencl-clang-12.0.0.tar.gz) = cbcae260cb131d3e13bc342b5510d448954dfa71962280a3e974a83aa33bad7c -SHA512 (opencl-clang-12.0.0.tar.gz) = 7fa05480b10be97dd784b8fb7579a2471cf3a904facd9949a980602085515bb3d42a042c74db80381771ad18f78bed2efdcb09538a865ac4a600d6190b8f9c31 -Size (opencl-clang-12.0.0.tar.gz) = 25292 bytes +BLAKE2s (opencl-clang-13.0.0.tar.gz) = 1d025d228a84678a26a030f1ff3854698fb62b1eb8c7b191f05a0a279dff4ee3 +SHA512 (opencl-clang-13.0.0.tar.gz) = d346e51339060795d80bdf9d3e3b58e55b089d94ed3c0bc3c7e1e8f81a5f65238d90dacc95ec27e8db7d38a6a03b05df5c4120e9ba0ec72a7bbca28a59d697f7 +Size (opencl-clang-13.0.0.tar.gz) = 25299 bytes +SHA1 (patch-CMakeLists.txt) = 41c76ef942211aa4013df47339471ce38aae4d3b diff --git a/parallel/opencl-clang/patches/patch-CMakeLists.txt b/parallel/opencl-clang/patches/patch-CMakeLists.txt new file mode 100644 index 00000000000..7074d3fff70 --- /dev/null +++ b/parallel/opencl-clang/patches/patch-CMakeLists.txt @@ -0,0 +1,16 @@ +$NetBSD: patch-CMakeLists.txt,v 1.1 2021/11/23 20:55:44 wiz Exp $ + +Default to llvm 13. +https://github.com/intel/opencl-clang/issues/293 + +--- CMakeLists.txt.orig 2021-08-30 13:13:55.000000000 +0000 ++++ CMakeLists.txt +@@ -20,7 +20,7 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRE + add_definitions(-DUSE_PREBUILT_LLVM) + + if(NOT PREFERRED_LLVM_VERSION) +- set(PREFERRED_LLVM_VERSION "12.0.0") ++ set(PREFERRED_LLVM_VERSION "13.0.0") + endif(NOT PREFERRED_LLVM_VERSION) + message(STATUS "[OPENCL-CLANG] Looking for LLVM version ${PREFERRED_LLVM_VERSION}") + find_package(LLVM ${PREFERRED_LLVM_VERSION} REQUIRED) diff --git a/parallel/openmp/distinfo b/parallel/openmp/distinfo index 34e2892273d..eee62c5a111 100644 --- a/parallel/openmp/distinfo +++ b/parallel/openmp/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.10 2021/11/21 14:52:35 ryoon Exp $ +$NetBSD: distinfo,v 1.11 2021/11/23 20:55:44 wiz Exp $ -BLAKE2s (openmp-12.0.1.src.tar.xz) = 48c277b7353fe289c61941895a5f99ec2af8e65dae3ac9bf654281f4d61edd72 -SHA512 (openmp-12.0.1.src.tar.xz) = 554edf032995cf80cfb6c878b26510b6c4df09e6bd4813934ea523ff8e121900a91ec59c3d83ee0ba390fb83bcaf6d137f7f6019958b444bdfe6a2b35c1c8d08 -Size (openmp-12.0.1.src.tar.xz) = 1081308 bytes +BLAKE2s (openmp-13.0.0.src.tar.xz) = 7404dc2ede6521997243e116b1048023c260ada7531e439d9b74ccc99f094506 +SHA512 (openmp-13.0.0.src.tar.xz) = 087793f469a18b1271f433ff7e4f26b444d5cdefeb1d65d0be0492d3f4096d4f4b2caf6621b0af8a5699552e769c51634ed2b7dc223bd74ff0dc9ae749bdaae7 +Size (openmp-13.0.0.src.tar.xz) = 1139488 bytes SHA1 (patch-runtime_src_kmp__runtime.cpp) = e8de0521b604205cb11a5cf6fdfc1968d7f09126 diff --git a/parallel/spirv-llvm-translator/Makefile b/parallel/spirv-llvm-translator/Makefile index 2b91350e249..9d06a5129f8 100644 --- a/parallel/spirv-llvm-translator/Makefile +++ b/parallel/spirv-llvm-translator/Makefile @@ -1,25 +1,28 @@ -# $NetBSD: Makefile,v 1.3 2021/07/24 11:00:13 nia Exp $ +# $NetBSD: Makefile,v 1.4 2021/11/23 20:55:44 wiz Exp $ -DISTNAME= SPIRV-LLVM-Translator-v12.0.0 -PKGNAME= ${DISTNAME:tl:S/-v/-/1} +DISTNAME= SPIRV-LLVM-Translator-13.0.0 +PKGNAME= ${DISTNAME:tl} CATEGORIES= parallel MASTER_SITES= ${MASTER_SITE_GITHUB:=KhronosGroup/} -GITHUB_PROJECT= SPIRV-LLVM-Translator -GITHUB_TAG= ${DISTNAME:S/SPIRV-LLVM-Translator-//1} +GITHUB_TAG= v${PKGVERSION_NOREV} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://github.com/KhronosGroup/SPIRV-LLVM-Translator COMMENT= Tool and library for translation between SPIR-V and LLVM IR LICENSE= modified-bsd +WRKSRC= ${WRKDIR}/${DISTNAME} + USE_CMAKE= yes USE_LANGUAGES= c c++ GCC_REQD+= 5 # C++14 CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON +CMAKE_ARGS+= -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=${PREFIX}/include PKGCONFIG_OVERRIDE+= LLVMSPIRVLib.pc.in .include "../../lang/llvm/buildlink3.mk" +.include "../../parallel/spirv-headers/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/parallel/spirv-llvm-translator/PLIST b/parallel/spirv-llvm-translator/PLIST index f72b4fa0b88..ef06a1eb799 100644 --- a/parallel/spirv-llvm-translator/PLIST +++ b/parallel/spirv-llvm-translator/PLIST @@ -1,7 +1,7 @@ -@comment $NetBSD: PLIST,v 1.2 2021/07/24 11:00:13 nia Exp $ +@comment $NetBSD: PLIST,v 1.3 2021/11/23 20:55:44 wiz Exp $ include/LLVMSPIRVLib/LLVMSPIRVExtensions.inc include/LLVMSPIRVLib/LLVMSPIRVLib.h include/LLVMSPIRVLib/LLVMSPIRVOpts.h lib/libLLVMSPIRVLib.so -lib/libLLVMSPIRVLib.so.12 +lib/libLLVMSPIRVLib.so.13 lib/pkgconfig/LLVMSPIRVLib.pc diff --git a/parallel/spirv-llvm-translator/distinfo b/parallel/spirv-llvm-translator/distinfo index 3bc5ee03f5e..a15934b82e9 100644 --- a/parallel/spirv-llvm-translator/distinfo +++ b/parallel/spirv-llvm-translator/distinfo @@ -1,6 +1,23 @@ -$NetBSD: distinfo,v 1.4 2021/10/26 11:10:38 nia Exp $ +$NetBSD: distinfo,v 1.5 2021/11/23 20:55:44 wiz Exp $ -BLAKE2s (SPIRV-LLVM-Translator-v12.0.0.tar.gz) = 5f02cc5219da99335999ace845c3c963fac2ecc547bb362836a622595c43ee6d -SHA512 (SPIRV-LLVM-Translator-v12.0.0.tar.gz) = c23ef81802d2bf743564762815d7375a804bdf8029efd7430faea0b48b5e30a9778c1175f52309b522a07aadf8ff77461b912c1fb3b95af9b09273a483eac82a -Size (SPIRV-LLVM-Translator-v12.0.0.tar.gz) = 1378222 bytes -SHA1 (patch-CMakeLists.txt) = 0ddc0228c5fd49cce32838954795fb03d3a7115d +BLAKE2s (SPIRV-LLVM-Translator-13.0.0.tar.gz) = 1d544e845cb4adfc4c9a5056ab48c4347bf5cc0848bcf21f5ab098a583e6d272 +SHA512 (SPIRV-LLVM-Translator-13.0.0.tar.gz) = 1ce7a38c2c3447249e19d50063a7a2acf32699905572950e4f102d8ce1680785433035154b7b55782d5a56211a50e042aef775836f37c33fe847b347a02b5a04 +Size (SPIRV-LLVM-Translator-13.0.0.tar.gz) = 1436324 bytes +SHA1 (patch-CMakeLists.txt) = db9173e06fb702c3fa88844fc87380262024cbe1 +SHA1 (patch-lib_SPIRV_SPIRVReader.cpp) = 25dc02f63e6b32f69afa0388ceb945131c2fb48e +SHA1 (patch-lib_SPIRV_SPIRVWriter.cpp) = cd9030f5ab63b0c7ba9492e101578b7431fdc903 +SHA1 (patch-lib_SPIRV_SPIRVWriter.h) = db22ff84b6cd8494898ea5cd35f53bde8e6c35a0 +SHA1 (patch-lib_SPIRV_libSPIRV_SPIRVFunction.h) = 8290d8246db59c3beb27866a7c555a08468e8d05 +SHA1 (patch-lib_SPIRV_libSPIRV_SPIRVModule.cpp) = 683a2d76e4faaed82179f6f995e1c272e706fcf5 +SHA1 (patch-lib_SPIRV_libSPIRV_SPIRVModule.h) = 83ddc00be71ce79d1fe1b63564857053da9fd1f3 +SHA1 (patch-lib_SPIRV_libSPIRV_SPIRVOpCode.h) = bc0e6685c80e82190f7b327e5ebb5ccf19b3e810 +SHA1 (patch-lib_SPIRV_libSPIRV_SPIRVOpCodeEnum.h) = e2a7329fbdcdadbae07334b0c735056837a88121 +SHA1 (patch-spirv-headers-tag.conf) = ecfb5efbaceb94672f8cc8e9d6242315c44818bd +SHA1 (patch-test_constexpr__vector.ll) = b4527f06912fa18dc824fc43f5fed433cca84354 +SHA1 (patch-test_transcoding_SPV__INTEL__function__pointers_bitcast.ll) = 373852e3963a06e991e231f0c5ab2ae766404410 +SHA1 (patch-test_transcoding_SPV__INTEL__function__pointers_const-function-pointer.ll) = f6067833cdcb1620aba9394f9535bde76056c191 +SHA1 (patch-test_transcoding_SPV__INTEL__function__pointers_function-pointer.ll) = 4e0ac321159280936fb38b7f16b417cf060cafbd +SHA1 (patch-test_transcoding_SPV__INTEL__function__pointers_global__ctor__dtor.ll) = f11189c9f6df87402dc0cd44015206cbbf0591af +SHA1 (patch-test_transcoding_SPV__INTEL__function__pointers_non-uniform-function-pointer.ll) = 25a6766ee57116d3b8296bfea8c8b8983016a9cd +SHA1 (patch-test_transcoding_SPV__INTEL__function__pointers_select.ll) = 17fc3d504c94a9f88eda183e07e8ec8a2a9e8624 +SHA1 (patch-test_transcoding_SPV__INTEL__function__pointers_vector__elem.ll) = c019121148a8d95269ca7b41a0c1c162ae46eed9 diff --git a/parallel/spirv-llvm-translator/patches/patch-CMakeLists.txt b/parallel/spirv-llvm-translator/patches/patch-CMakeLists.txt index 8f6cd109f21..4da5dfb1ecc 100644 --- a/parallel/spirv-llvm-translator/patches/patch-CMakeLists.txt +++ b/parallel/spirv-llvm-translator/patches/patch-CMakeLists.txt @@ -1,15 +1,15 @@ -$NetBSD: patch-CMakeLists.txt,v 1.1 2021/06/09 14:55:10 nia Exp $ +$NetBSD: patch-CMakeLists.txt,v 1.2 2021/11/23 20:55:44 wiz Exp $ We don't want the package finding ccache because pkgsrc handles ccache on its own. ---- CMakeLists.txt.orig 2020-03-20 19:52:42.000000000 +0000 +--- CMakeLists.txt.orig 2021-10-15 21:15:19.000000000 +0000 +++ CMakeLists.txt -@@ -49,7 +49,6 @@ if(LLVM_SPIRV_BUILD_EXTERNAL) - +@@ -91,7 +91,6 @@ if(LLVM_SPIRV_BUILD_EXTERNAL) message(STATUS "Found LLVM: ${LLVM_VERSION}") + option(CCACHE_ALLOWED "allow use of ccache" TRUE) - find_program(CCACHE_EXE_FOUND ccache) - if(CCACHE_EXE_FOUND) + if(CCACHE_EXE_FOUND AND CCACHE_ALLOWED) message(STATUS "Found ccache: ${CCACHE_EXE_FOUND}") set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache) diff --git a/parallel/spirv-llvm-translator/patches/patch-lib_SPIRV_SPIRVReader.cpp b/parallel/spirv-llvm-translator/patches/patch-lib_SPIRV_SPIRVReader.cpp new file mode 100644 index 00000000000..2a38f3aacbf --- /dev/null +++ b/parallel/spirv-llvm-translator/patches/patch-lib_SPIRV_SPIRVReader.cpp @@ -0,0 +1,19 @@ +$NetBSD: patch-lib_SPIRV_SPIRVReader.cpp,v 1.1 2021/11/23 20:55:44 wiz Exp $ + +https://github.com/KhronosGroup/SPIRV-LLVM-Translator/pull/1265 + +--- lib/SPIRV/SPIRVReader.cpp.orig 2021-10-15 21:15:19.000000000 +0000 ++++ lib/SPIRV/SPIRVReader.cpp +@@ -1452,9 +1452,9 @@ Value *SPIRVToLLVM::transValueWithoutDec + return mapValue(BV, transValue(BI, nullptr, nullptr, false)); + } + +- case OpConstFunctionPointerINTEL: { +- SPIRVConstFunctionPointerINTEL *BC = +- static_cast<SPIRVConstFunctionPointerINTEL *>(BV); ++ case OpConstantFunctionPointerINTEL: { ++ SPIRVConstantFunctionPointerINTEL *BC = ++ static_cast<SPIRVConstantFunctionPointerINTEL *>(BV); + SPIRVFunction *F = BC->getFunction(); + BV->setName(F->getName()); + return mapValue(BV, transFunction(F)); diff --git a/parallel/spirv-llvm-translator/patches/patch-lib_SPIRV_SPIRVWriter.cpp b/parallel/spirv-llvm-translator/patches/patch-lib_SPIRV_SPIRVWriter.cpp new file mode 100644 index 00000000000..9ac35991292 --- /dev/null +++ b/parallel/spirv-llvm-translator/patches/patch-lib_SPIRV_SPIRVWriter.cpp @@ -0,0 +1,15 @@ +$NetBSD: patch-lib_SPIRV_SPIRVWriter.cpp,v 1.1 2021/11/23 20:55:44 wiz Exp $ + +https://github.com/KhronosGroup/SPIRV-LLVM-Translator/pull/1265 + +--- lib/SPIRV/SPIRVWriter.cpp.orig 2021-10-15 21:15:19.000000000 +0000 ++++ lib/SPIRV/SPIRVWriter.cpp +@@ -1418,7 +1418,7 @@ LLVMToSPIRVBase::transValueWithoutDecora + if (!BM->checkExtension(ExtensionID::SPV_INTEL_function_pointers, + SPIRVEC_FunctionPointers, toString(V))) + return nullptr; +- return BM->addConstFunctionPointerINTEL( ++ return BM->addConstantFunctionPointerINTEL( + transType(F->getType()), + static_cast<SPIRVFunction *>(transValue(F, nullptr))); + } diff --git a/parallel/spirv-llvm-translator/patches/patch-lib_SPIRV_SPIRVWriter.h b/parallel/spirv-llvm-translator/patches/patch-lib_SPIRV_SPIRVWriter.h new file mode 100644 index 00000000000..e5266356599 --- /dev/null +++ b/parallel/spirv-llvm-translator/patches/patch-lib_SPIRV_SPIRVWriter.h @@ -0,0 +1,16 @@ +$NetBSD: patch-lib_SPIRV_SPIRVWriter.h,v 1.1 2021/11/23 20:55:44 wiz Exp $ + +https://github.com/KhronosGroup/SPIRV-LLVM-Translator/pull/1265 + +--- lib/SPIRV/SPIRVWriter.h.orig 2021-10-15 21:15:19.000000000 +0000 ++++ lib/SPIRV/SPIRVWriter.h +@@ -75,7 +75,8 @@ public: + // a function, that is necessary for a convenient function pointers handling. + // By default transValue uses 'Decl' mode, which means every function + // we meet during the translation should result in its declaration generated. +- // In 'Pointer' mode we generate OpConstFunctionPointerINTEL constant instead. ++ // In 'Pointer' mode we generate OpConstantFunctionPointerINTEL constant ++ // instead. + enum class FuncTransMode { Decl, Pointer }; + + SPIRVType *transType(Type *T); diff --git a/parallel/spirv-llvm-translator/patches/patch-lib_SPIRV_libSPIRV_SPIRVFunction.h b/parallel/spirv-llvm-translator/patches/patch-lib_SPIRV_libSPIRV_SPIRVFunction.h new file mode 100644 index 00000000000..023f19d53f0 --- /dev/null +++ b/parallel/spirv-llvm-translator/patches/patch-lib_SPIRV_libSPIRV_SPIRVFunction.h @@ -0,0 +1,30 @@ +$NetBSD: patch-lib_SPIRV_libSPIRV_SPIRVFunction.h,v 1.1 2021/11/23 20:55:44 wiz Exp $ + +https://github.com/KhronosGroup/SPIRV-LLVM-Translator/pull/1265 + +--- lib/SPIRV/libSPIRV/SPIRVFunction.h.orig 2021-10-15 21:15:19.000000000 +0000 ++++ lib/SPIRV/libSPIRV/SPIRVFunction.h +@@ -171,18 +171,18 @@ private: + + typedef SPIRVEntryOpCodeOnly<OpFunctionEnd> SPIRVFunctionEnd; + +-class SPIRVConstFunctionPointerINTEL : public SPIRVValue { +- const static Op OC = OpConstFunctionPointerINTEL; ++class SPIRVConstantFunctionPointerINTEL : public SPIRVValue { ++ const static Op OC = OpConstantFunctionPointerINTEL; + const static SPIRVWord FixedWordCount = 4; + + public: +- SPIRVConstFunctionPointerINTEL(SPIRVId TheId, SPIRVType *TheType, +- SPIRVFunction *TheFunction, SPIRVModule *M) ++ SPIRVConstantFunctionPointerINTEL(SPIRVId TheId, SPIRVType *TheType, ++ SPIRVFunction *TheFunction, SPIRVModule *M) + : SPIRVValue(M, FixedWordCount, OC, TheType, TheId), + TheFunction(TheFunction->getId()) { + validate(); + } +- SPIRVConstFunctionPointerINTEL() ++ SPIRVConstantFunctionPointerINTEL() + : SPIRVValue(OC), TheFunction(SPIRVID_INVALID) {} + SPIRVFunction *getFunction() const { return get<SPIRVFunction>(TheFunction); } + _SPIRV_DEF_ENCDEC3(Type, Id, TheFunction) diff --git a/parallel/spirv-llvm-translator/patches/patch-lib_SPIRV_libSPIRV_SPIRVModule.cpp b/parallel/spirv-llvm-translator/patches/patch-lib_SPIRV_libSPIRV_SPIRVModule.cpp new file mode 100644 index 00000000000..d0e40414267 --- /dev/null +++ b/parallel/spirv-llvm-translator/patches/patch-lib_SPIRV_libSPIRV_SPIRVModule.cpp @@ -0,0 +1,31 @@ +$NetBSD: patch-lib_SPIRV_libSPIRV_SPIRVModule.cpp,v 1.1 2021/11/23 20:55:44 wiz Exp $ + +https://github.com/KhronosGroup/SPIRV-LLVM-Translator/pull/1265 + +--- lib/SPIRV/libSPIRV/SPIRVModule.cpp.orig 2021-10-15 21:15:19.000000000 +0000 ++++ lib/SPIRV/libSPIRV/SPIRVModule.cpp +@@ -269,8 +269,8 @@ public: + const std::vector<SPIRVValue *> &Elements) override; + SPIRVEntry *addSpecConstantCompositeContinuedINTEL( + const std::vector<SPIRVValue *> &) override; +- SPIRVValue *addConstFunctionPointerINTEL(SPIRVType *Ty, +- SPIRVFunction *F) override; ++ SPIRVValue *addConstantFunctionPointerINTEL(SPIRVType *Ty, ++ SPIRVFunction *F) override; + SPIRVValue *addConstant(SPIRVValue *) override; + SPIRVValue *addConstant(SPIRVType *, uint64_t) override; + SPIRVValue *addConstant(SPIRVType *, llvm::APInt) override; +@@ -1142,9 +1142,10 @@ SPIRVEntry *SPIRVModuleImpl::addSpecCons + return add(new SPIRVSpecConstantCompositeContinuedINTEL(this, Elements)); + } + +-SPIRVValue *SPIRVModuleImpl::addConstFunctionPointerINTEL(SPIRVType *Ty, +- SPIRVFunction *F) { +- return addConstant(new SPIRVConstFunctionPointerINTEL(getId(), Ty, F, this)); ++SPIRVValue *SPIRVModuleImpl::addConstantFunctionPointerINTEL(SPIRVType *Ty, ++ SPIRVFunction *F) { ++ return addConstant( ++ new SPIRVConstantFunctionPointerINTEL(getId(), Ty, F, this)); + } + + SPIRVValue *SPIRVModuleImpl::addUndef(SPIRVType *TheType) { diff --git a/parallel/spirv-llvm-translator/patches/patch-lib_SPIRV_libSPIRV_SPIRVModule.h b/parallel/spirv-llvm-translator/patches/patch-lib_SPIRV_libSPIRV_SPIRVModule.h new file mode 100644 index 00000000000..e30a1974c0d --- /dev/null +++ b/parallel/spirv-llvm-translator/patches/patch-lib_SPIRV_libSPIRV_SPIRVModule.h @@ -0,0 +1,17 @@ +$NetBSD: patch-lib_SPIRV_libSPIRV_SPIRVModule.h,v 1.1 2021/11/23 20:55:44 wiz Exp $ + +https://github.com/KhronosGroup/SPIRV-LLVM-Translator/pull/1265 + +--- lib/SPIRV/libSPIRV/SPIRVModule.h.orig 2021-10-15 21:15:19.000000000 +0000 ++++ lib/SPIRV/libSPIRV/SPIRVModule.h +@@ -263,8 +263,8 @@ public: + const std::vector<SPIRVValue *> &Elements) = 0; + virtual SPIRVEntry * + addSpecConstantCompositeContinuedINTEL(const std::vector<SPIRVValue *> &) = 0; +- virtual SPIRVValue *addConstFunctionPointerINTEL(SPIRVType *Ty, +- SPIRVFunction *F) = 0; ++ virtual SPIRVValue *addConstantFunctionPointerINTEL(SPIRVType *Ty, ++ SPIRVFunction *F) = 0; + virtual SPIRVValue *addConstant(SPIRVValue *) = 0; + virtual SPIRVValue *addConstant(SPIRVType *, uint64_t) = 0; + virtual SPIRVValue *addConstant(SPIRVType *, llvm::APInt) = 0; diff --git a/parallel/spirv-llvm-translator/patches/patch-lib_SPIRV_libSPIRV_SPIRVOpCode.h b/parallel/spirv-llvm-translator/patches/patch-lib_SPIRV_libSPIRV_SPIRVOpCode.h new file mode 100644 index 00000000000..e77ffe822a9 --- /dev/null +++ b/parallel/spirv-llvm-translator/patches/patch-lib_SPIRV_libSPIRV_SPIRVOpCode.h @@ -0,0 +1,15 @@ +$NetBSD: patch-lib_SPIRV_libSPIRV_SPIRVOpCode.h,v 1.1 2021/11/23 20:55:44 wiz Exp $ + +https://github.com/KhronosGroup/SPIRV-LLVM-Translator/pull/1265 + +--- lib/SPIRV/libSPIRV/SPIRVOpCode.h.orig 2021-10-15 21:15:19.000000000 +0000 ++++ lib/SPIRV/libSPIRV/SPIRVOpCode.h +@@ -226,7 +226,7 @@ inline bool isSpecConstantOpCode(Op OpCo + inline bool isConstantOpCode(Op OpCode) { + unsigned OC = OpCode; + return (OpConstantTrue <= OC && OC <= OpSpecConstantOp) || OC == OpUndef || +- OC == OpConstantPipeStorage || OC == OpConstFunctionPointerINTEL; ++ OC == OpConstantPipeStorage || OC == OpConstantFunctionPointerINTEL; + } + + inline bool isModuleScopeAllowedOpCode(Op OpCode) { diff --git a/parallel/spirv-llvm-translator/patches/patch-lib_SPIRV_libSPIRV_SPIRVOpCodeEnum.h b/parallel/spirv-llvm-translator/patches/patch-lib_SPIRV_libSPIRV_SPIRVOpCodeEnum.h new file mode 100644 index 00000000000..b8e7381f085 --- /dev/null +++ b/parallel/spirv-llvm-translator/patches/patch-lib_SPIRV_libSPIRV_SPIRVOpCodeEnum.h @@ -0,0 +1,15 @@ +$NetBSD: patch-lib_SPIRV_libSPIRV_SPIRVOpCodeEnum.h,v 1.1 2021/11/23 20:55:44 wiz Exp $ + +https://github.com/KhronosGroup/SPIRV-LLVM-Translator/pull/1265 + +--- lib/SPIRV/libSPIRV/SPIRVOpCodeEnum.h.orig 2021-10-15 21:15:19.000000000 +0000 ++++ lib/SPIRV/libSPIRV/SPIRVOpCodeEnum.h +@@ -344,7 +344,7 @@ _SPIRV_OP(SubgroupImageBlockReadINTEL, 5 + _SPIRV_OP(SubgroupImageBlockWriteINTEL, 5578) + _SPIRV_OP(SubgroupImageMediaBlockReadINTEL, 5580) + _SPIRV_OP(SubgroupImageMediaBlockWriteINTEL, 5581) +-_SPIRV_OP(ConstFunctionPointerINTEL, 5600) ++_SPIRV_OP(ConstantFunctionPointerINTEL, 5600) + _SPIRV_OP(FunctionPointerCallINTEL, 5601) + _SPIRV_OP(AsmTargetINTEL, 5609) + _SPIRV_OP(AsmINTEL, 5610) diff --git a/parallel/spirv-llvm-translator/patches/patch-spirv-headers-tag.conf b/parallel/spirv-llvm-translator/patches/patch-spirv-headers-tag.conf new file mode 100644 index 00000000000..b3cd0bcbbd1 --- /dev/null +++ b/parallel/spirv-llvm-translator/patches/patch-spirv-headers-tag.conf @@ -0,0 +1,9 @@ +$NetBSD: patch-spirv-headers-tag.conf,v 1.1 2021/11/23 20:55:44 wiz Exp $ + +https://github.com/KhronosGroup/SPIRV-LLVM-Translator/pull/1265 + +--- spirv-headers-tag.conf.orig 2021-10-15 21:15:19.000000000 +0000 ++++ spirv-headers-tag.conf +@@ -1 +1 @@ +-ddf3230c14c71e81fc0eae9b781cc4bcc2d1f0f5 ++814e728b30ddd0f4509233099a3ad96fd4318c07 diff --git a/parallel/spirv-llvm-translator/patches/patch-test_constexpr__vector.ll b/parallel/spirv-llvm-translator/patches/patch-test_constexpr__vector.ll new file mode 100644 index 00000000000..c215fc97918 --- /dev/null +++ b/parallel/spirv-llvm-translator/patches/patch-test_constexpr__vector.ll @@ -0,0 +1,21 @@ +$NetBSD: patch-test_constexpr__vector.ll,v 1.1 2021/11/23 20:55:44 wiz Exp $ + +https://github.com/KhronosGroup/SPIRV-LLVM-Translator/pull/1265 + +--- test/constexpr_vector.ll.orig 2021-10-15 21:15:19.000000000 +0000 ++++ test/constexpr_vector.ll +@@ -62,10 +62,10 @@ + ; CHECK-SPIRV-DAG: 4 TypePointer [[StorePtr:[0-9]+]] 7 [[TypeVec16]] + ; CHECK-SPIRV-DAG: 3 Undef [[TypeVec16]] [[TypeUndefV16:[0-9]+]] + ; CHECK-SPIRV-DAG: 3 Undef [[TypeVec64]] [[TypeUndefV64:[0-9]+]] +-; CHECK-SPIRV-DAG: 4 ConstFunctionPointerINTEL [[FuncPtrTy:[0-9]+]] [[F1Ptr:[0-9]+]] [[F1]] +-; CHECK-SPIRV-DAG: 4 ConstFunctionPointerINTEL [[FuncPtrTy]] [[F2Ptr:[0-9]+]] [[F2]] +-; CHECK-SPIRV-DAG: 4 ConstFunctionPointerINTEL [[FuncPtrTy]] [[F11Ptr:[0-9]+]] [[F1]] +-; CHECK-SPIRV-DAG: 4 ConstFunctionPointerINTEL [[FuncPtrTy]] [[F21Ptr:[0-9]+]] [[F2]] ++; CHECK-SPIRV-DAG: 4 ConstantFunctionPointerINTEL [[FuncPtrTy:[0-9]+]] [[F1Ptr:[0-9]+]] [[F1]] ++; CHECK-SPIRV-DAG: 4 ConstantFunctionPointerINTEL [[FuncPtrTy]] [[F2Ptr:[0-9]+]] [[F2]] ++; CHECK-SPIRV-DAG: 4 ConstantFunctionPointerINTEL [[FuncPtrTy]] [[F11Ptr:[0-9]+]] [[F1]] ++; CHECK-SPIRV-DAG: 4 ConstantFunctionPointerINTEL [[FuncPtrTy]] [[F21Ptr:[0-9]+]] [[F2]] + + ; CHECK-SPIRV: 4 ConvertPtrToU [[TypeInt64]] [[Ptr1:[0-9]+]] [[F1Ptr]] + ; CHECK-SPIRV: 4 Bitcast [[TypeVec8]] [[Vec1:[0-9]+]] [[Ptr1]] diff --git a/parallel/spirv-llvm-translator/patches/patch-test_transcoding_SPV__INTEL__function__pointers_bitcast.ll b/parallel/spirv-llvm-translator/patches/patch-test_transcoding_SPV__INTEL__function__pointers_bitcast.ll new file mode 100644 index 00000000000..efe585346b9 --- /dev/null +++ b/parallel/spirv-llvm-translator/patches/patch-test_transcoding_SPV__INTEL__function__pointers_bitcast.ll @@ -0,0 +1,15 @@ +$NetBSD: patch-test_transcoding_SPV__INTEL__function__pointers_bitcast.ll,v 1.1 2021/11/23 20:55:44 wiz Exp $ + +https://github.com/KhronosGroup/SPIRV-LLVM-Translator/pull/1265 + +--- test/transcoding/SPV_INTEL_function_pointers/bitcast.ll.orig 2021-10-15 21:15:19.000000000 +0000 ++++ test/transcoding/SPV_INTEL_function_pointers/bitcast.ll +@@ -18,7 +18,7 @@ + ; CHECK-SPIRV: TypeFunction [[#DEST_TY:]] [[#]] [[#]] + ; CHECK-SPIRV: TypePointer [[#DEST_TY_PTR:]] [[#]] [[#DEST_TY]] + ; CHECK-SPIRV: TypePointer [[#FOO_TY_PTR:]] [[#]] [[#FOO_TY]] +-; CHECK-SPIRV: ConstFunctionPointerINTEL [[#FOO_TY_PTR]] [[#FOO_PTR:]] [[#FOO:]] ++; CHECK-SPIRV: ConstantFunctionPointerINTEL [[#FOO_TY_PTR]] [[#FOO_PTR:]] [[#FOO:]] + ; CHECK-SPIRV: Function [[#]] [[#FOO]] [[#]] [[#FOO_TY]] + + ; CHECK-SPIRV: Bitcast [[#DEST_TY_PTR]] [[#]] [[#FOO_PTR]] diff --git a/parallel/spirv-llvm-translator/patches/patch-test_transcoding_SPV__INTEL__function__pointers_const-function-pointer.ll b/parallel/spirv-llvm-translator/patches/patch-test_transcoding_SPV__INTEL__function__pointers_const-function-pointer.ll new file mode 100644 index 00000000000..b936c964b39 --- /dev/null +++ b/parallel/spirv-llvm-translator/patches/patch-test_transcoding_SPV__INTEL__function__pointers_const-function-pointer.ll @@ -0,0 +1,17 @@ +$NetBSD: patch-test_transcoding_SPV__INTEL__function__pointers_const-function-pointer.ll,v 1.1 2021/11/23 20:55:44 wiz Exp $ + +https://github.com/KhronosGroup/SPIRV-LLVM-Translator/pull/1265 + +--- test/transcoding/SPV_INTEL_function_pointers/const-function-pointer.ll.orig 2021-10-15 21:15:19.000000000 +0000 ++++ test/transcoding/SPV_INTEL_function_pointers/const-function-pointer.ll +@@ -14,8 +14,8 @@ + ; CHECK-SPIRV-DAG: Constant [[Int32]] [[XArg:[0-9]+]] 32 + ; CHECK-SPIRV-DAG: Constant [[Int32]] [[YArg:[0-9]+]] 2 + +-; CHECK-SPIRV: ConstFunctionPointerINTEL {{[0-9]+}} [[F1:[0-9]+]] [[F1Name]] +-; CHECK-SPIRV: ConstFunctionPointerINTEL {{[0-9]+}} [[F2:[0-9]+]] [[F2Name]] ++; CHECK-SPIRV: ConstantFunctionPointerINTEL {{[0-9]+}} [[F1:[0-9]+]] [[F1Name]] ++; CHECK-SPIRV: ConstantFunctionPointerINTEL {{[0-9]+}} [[F2:[0-9]+]] [[F2Name]] + ; CHECK-SPIRV: ConstantComposite {{[0-9]+}} [[ConstComp:[0-9]+]] [[F1]] [[F2]] + ; CHECK-SPIRV: Variable {{[0-9]+}} [[Var:[0-9]+]] {{[0-9]+}} [[ConstComp]] + diff --git a/parallel/spirv-llvm-translator/patches/patch-test_transcoding_SPV__INTEL__function__pointers_function-pointer.ll b/parallel/spirv-llvm-translator/patches/patch-test_transcoding_SPV__INTEL__function__pointers_function-pointer.ll new file mode 100644 index 00000000000..391bea48b84 --- /dev/null +++ b/parallel/spirv-llvm-translator/patches/patch-test_transcoding_SPV__INTEL__function__pointers_function-pointer.ll @@ -0,0 +1,15 @@ +$NetBSD: patch-test_transcoding_SPV__INTEL__function__pointers_function-pointer.ll,v 1.1 2021/11/23 20:55:44 wiz Exp $ + +https://github.com/KhronosGroup/SPIRV-LLVM-Translator/pull/1265 + +--- test/transcoding/SPV_INTEL_function_pointers/function-pointer.ll.orig 2021-10-15 21:15:19.000000000 +0000 ++++ test/transcoding/SPV_INTEL_function_pointers/function-pointer.ll +@@ -24,7 +24,7 @@ + ; CHECK-SPIRV: TypeFunction [[FOO_TYPE_ID:[0-9]+]] [[TYPE_INT_ID]] [[TYPE_INT_ID]] + ; CHECK-SPIRV: TypePointer [[FOO_PTR_ID:[0-9]+]] {{[0-9]+}} [[FOO_TYPE_ID]] + ; CHECK-SPIRV: TypePointer [[FOO_PTR_ALLOCA_ID:[0-9]+]] 7 [[FOO_PTR_ID]] +-; CHECK-SPIRV: ConstFunctionPointerINTEL [[FOO_PTR_ID]] [[FOO_PTR:[0-9]+]] [[FOO_ID:[0-9]+]] ++; CHECK-SPIRV: ConstantFunctionPointerINTEL [[FOO_PTR_ID]] [[FOO_PTR:[0-9]+]] [[FOO_ID:[0-9]+]] + ; + ; CHECK-SPIRV: Function {{[0-9]+}} [[FOO_ID]] {{[0-9]+}} [[FOO_TYPE_ID]] + ; CHECK-SPIRV: Function {{[0-9]+}} [[KERNEL_ID]] diff --git a/parallel/spirv-llvm-translator/patches/patch-test_transcoding_SPV__INTEL__function__pointers_global__ctor__dtor.ll b/parallel/spirv-llvm-translator/patches/patch-test_transcoding_SPV__INTEL__function__pointers_global__ctor__dtor.ll new file mode 100644 index 00000000000..bb5cce0abae --- /dev/null +++ b/parallel/spirv-llvm-translator/patches/patch-test_transcoding_SPV__INTEL__function__pointers_global__ctor__dtor.ll @@ -0,0 +1,18 @@ +$NetBSD: patch-test_transcoding_SPV__INTEL__function__pointers_global__ctor__dtor.ll,v 1.1 2021/11/23 20:55:44 wiz Exp $ + +https://github.com/KhronosGroup/SPIRV-LLVM-Translator/pull/1265 + +--- test/transcoding/SPV_INTEL_function_pointers/global_ctor_dtor.ll.orig 2021-10-15 21:15:19.000000000 +0000 ++++ test/transcoding/SPV_INTEL_function_pointers/global_ctor_dtor.ll +@@ -22,9 +22,9 @@ target triple = "spir64-unknown-unknown" + ; CHECK: TypeFunction {{[0-9]+}} [[TF:[0-9]+]] + + ; CHECK: TypePointer [[TP:[0-9]+]] +-; CHECK: ConstFunctionPointerINTEL [[TP]] [[FPCtor:[0-9]+]] [[NameCtor]] ++; CHECK: ConstantFunctionPointerINTEL [[TP]] [[FPCtor:[0-9]+]] [[NameCtor]] + ; CHECK: ConstantComposite {{[0-9]+}} {{[0-9]+}} {{[0-9]+}} [[FPCtor]] +-; CHECK: ConstFunctionPointerINTEL [[TP]] [[FPDtor:[0-9]+]] [[NameDtor]] ++; CHECK: ConstantFunctionPointerINTEL [[TP]] [[FPDtor:[0-9]+]] [[NameDtor]] + ; CHECK: ConstantComposite {{[0-9]+}} {{[0-9]+}} {{[0-9]+}} [[FPDtor]] + + ; CHECK: 5 Function [[TF]] [[NameCtor]] 0 diff --git a/parallel/spirv-llvm-translator/patches/patch-test_transcoding_SPV__INTEL__function__pointers_non-uniform-function-pointer.ll b/parallel/spirv-llvm-translator/patches/patch-test_transcoding_SPV__INTEL__function__pointers_non-uniform-function-pointer.ll new file mode 100644 index 00000000000..1fe1b9d7a30 --- /dev/null +++ b/parallel/spirv-llvm-translator/patches/patch-test_transcoding_SPV__INTEL__function__pointers_non-uniform-function-pointer.ll @@ -0,0 +1,17 @@ +$NetBSD: patch-test_transcoding_SPV__INTEL__function__pointers_non-uniform-function-pointer.ll,v 1.1 2021/11/23 20:55:44 wiz Exp $ + +https://github.com/KhronosGroup/SPIRV-LLVM-Translator/pull/1265 + +--- test/transcoding/SPV_INTEL_function_pointers/non-uniform-function-pointer.ll.orig 2021-10-15 21:15:19.000000000 +0000 ++++ test/transcoding/SPV_INTEL_function_pointers/non-uniform-function-pointer.ll +@@ -34,8 +34,8 @@ + ; CHECK-SPIRV: TypeFunction [[FOO_TYPE_ID:[0-9]+]] [[TYPE_INT32_ID]] [[TYPE_INT32_ID]] + ; CHECK-SPIRV: TypePointer [[FOO_PTR_TYPE_ID:[0-9]+]] {{[0-9]+}} [[FOO_TYPE_ID]] + ; CHECK-SPIRV: TypePointer [[FOO_PTR_ALLOCA_TYPE_ID:[0-9]+]] 7 [[FOO_PTR_TYPE_ID]] +-; CHECK-SPIRV: ConstFunctionPointerINTEL [[FOO_PTR_TYPE_ID]] [[FOO_PTR_ID:[0-9]+]] [[FOO_ID:[0-9]+]] +-; CHECK-SPIRV: ConstFunctionPointerINTEL [[FOO_PTR_TYPE_ID]] [[BAR_PTR_ID:[0-9]+]] [[BAR_ID:[0-9]+]] ++; CHECK-SPIRV: ConstantFunctionPointerINTEL [[FOO_PTR_TYPE_ID]] [[FOO_PTR_ID:[0-9]+]] [[FOO_ID:[0-9]+]] ++; CHECK-SPIRV: ConstantFunctionPointerINTEL [[FOO_PTR_TYPE_ID]] [[BAR_PTR_ID:[0-9]+]] [[BAR_ID:[0-9]+]] + ; + ; CHECK-SPIRV: Function {{[0-9]+}} [[FOO_ID]] {{[0-9]+}} [[FOO_TYPE_ID]] + ; CHECK-SPIRV: Function {{[0-9]+}} [[BAR_ID]] {{[0-9]+}} [[FOO_TYPE_ID]] diff --git a/parallel/spirv-llvm-translator/patches/patch-test_transcoding_SPV__INTEL__function__pointers_select.ll b/parallel/spirv-llvm-translator/patches/patch-test_transcoding_SPV__INTEL__function__pointers_select.ll new file mode 100644 index 00000000000..e5e2fcbfe2e --- /dev/null +++ b/parallel/spirv-llvm-translator/patches/patch-test_transcoding_SPV__INTEL__function__pointers_select.ll @@ -0,0 +1,17 @@ +$NetBSD: patch-test_transcoding_SPV__INTEL__function__pointers_select.ll,v 1.1 2021/11/23 20:55:44 wiz Exp $ + +https://github.com/KhronosGroup/SPIRV-LLVM-Translator/pull/1265 + +--- test/transcoding/SPV_INTEL_function_pointers/select.ll.orig 2021-10-15 21:15:19.000000000 +0000 ++++ test/transcoding/SPV_INTEL_function_pointers/select.ll +@@ -13,8 +13,8 @@ + ; CHECK-SPIRV: TypeFunction [[#FUNC_TYPE:]] [[#INT32]] [[#INT32]] + ; CHECK-SPIRV: TypePointer [[#FUNC_PTR_TYPE:]] [[#]] [[#FUNC_TYPE]] + ; CHECK-SPIRV: TypePointer [[#FUNC_PTR_ALLOCA_TYPE:]] [[#]] [[#FUNC_PTR_TYPE]] +-; CHECK-SPIRV-DAG: ConstFunctionPointerINTEL [[#FUNC_PTR_TYPE]] [[#BARPTR:]] [[#BAR]] +-; CHECK-SPIRV-DAG: ConstFunctionPointerINTEL [[#FUNC_PTR_TYPE]] [[#BAZPTR:]] [[#BAZ]] ++; CHECK-SPIRV-DAG: ConstantFunctionPointerINTEL [[#FUNC_PTR_TYPE]] [[#BARPTR:]] [[#BAR]] ++; CHECK-SPIRV-DAG: ConstantFunctionPointerINTEL [[#FUNC_PTR_TYPE]] [[#BAZPTR:]] [[#BAZ]] + ; CHECK-SPIRV: Function [[#]] [[#KERNEL_ID]] + ; CHECK-SPIRV: Variable [[#FUNC_PTR_ALLOCA_TYPE]] [[#FPTR:]] + ; CHECK-SPIRV: Select [[#FUNC_PTR_TYPE]] [[#SELECT:]] [[#]] [[#BARPTR]] [[#BAZPTR]] diff --git a/parallel/spirv-llvm-translator/patches/patch-test_transcoding_SPV__INTEL__function__pointers_vector__elem.ll b/parallel/spirv-llvm-translator/patches/patch-test_transcoding_SPV__INTEL__function__pointers_vector__elem.ll new file mode 100644 index 00000000000..20bc10eb044 --- /dev/null +++ b/parallel/spirv-llvm-translator/patches/patch-test_transcoding_SPV__INTEL__function__pointers_vector__elem.ll @@ -0,0 +1,17 @@ +$NetBSD: patch-test_transcoding_SPV__INTEL__function__pointers_vector__elem.ll,v 1.1 2021/11/23 20:55:44 wiz Exp $ + +https://github.com/KhronosGroup/SPIRV-LLVM-Translator/pull/1265 + +--- test/transcoding/SPV_INTEL_function_pointers/vector_elem.ll.orig 2021-10-15 21:15:19.000000000 +0000 ++++ test/transcoding/SPV_INTEL_function_pointers/vector_elem.ll +@@ -9,8 +9,8 @@ + ; CHECK-SPIRV: 4 TypePointer [[TypePtr:[0-9]+]] {{[0-9]+}} [[TypeFunc]] + ; CHECK-SPIRV: 4 TypeVector [[TypeVec:[0-9]+]] [[TypePtr]] [[TypeInt32]] + ; CHECK-SPIRV-DAG: 3 Undef [[TypeVec]] [[TypeUndef:[0-9]+]] +-; CHECK-SPIRV-DAG: 4 ConstFunctionPointerINTEL [[TypePtr]] [[F1Ptr:[0-9]+]] [[F1]] +-; CHECK-SPIRV-DAG: 4 ConstFunctionPointerINTEL [[TypePtr]] [[F2Ptr:[0-9]+]] [[F2]] ++; CHECK-SPIRV-DAG: 4 ConstantFunctionPointerINTEL [[TypePtr]] [[F1Ptr:[0-9]+]] [[F1]] ++; CHECK-SPIRV-DAG: 4 ConstantFunctionPointerINTEL [[TypePtr]] [[F2Ptr:[0-9]+]] [[F2]] + + ; CHECK-SPIRV: 6 CompositeInsert [[TypeVec]] [[NewVec0:[0-9]+]] [[F1Ptr]] [[TypeUndef]] 0 + ; CHECK-SPIRV: 6 CompositeInsert [[TypeVec]] [[NewVec1:[0-9]+]] [[F2Ptr]] [[NewVec0]] 1 |