diff --git a/devel/llvm10/Makefile b/devel/llvm10/Makefile index 0f34b943..2ddeb28b 100644 --- a/devel/llvm10/Makefile +++ b/devel/llvm10/Makefile @@ -1,29 +1,34 @@ # $FreeBSD: head/devel/llvm80/Makefile 499184 2019-04-17 16:20:06Z brooks $ PORTNAME= llvm -PORTVERSION= ${LLVM_MAJOR}.0.${SNAPDATE} +DISTVERSION= 10.0.0 CATEGORIES= devel lang +MASTER_SITES= http://${PRE_}releases.llvm.org/${LLVM_RELEASE}/${RCDIR} +DISTNAME= ${PORTNAME}-${DISTVERSION}.src +DISTFILES= ${PORTNAME}-${DISTVERSION}.src${EXTRACT_SUFX} MAINTAINER= brooks@FreeBSD.org COMMENT= LLVM and Clang -USE_GITHUB= yes -GH_PROJECT= llvm-project -GH_ACCOUNT= llvm -GH_TAGNAME= ${LLVM_PROJECT_COMMIT} -LLVM_MAJOR= 10 -LLVM_RELEASE= ${LLVM_MAJOR}.0.0 -SNAPDATE= 20200103 -LLVM_PROJECT_COMMIT= add743b4348095c0d2e407c7a2b8a87a5f8194b0 +LLVM_RELEASE= ${DISTVERSION:C/rc.*//} +RCDIR= ${DISTVERSION:S/${LLVM_RELEASE}//:C|(rc.*)|\1/|} +PRE_= ${DISTVERSION:C/.*rc.*/pre/:N*[0-9]*} -USES= cmake gmake compiler:c++11-lib perl5 tar:xz shebangfix python:3.6,build +DOCSDIR= ${PREFIX}/share/doc/${PORTNAME} +DATADIR= ${PREFIX}/share/${PORTNAME} + +USES= cmake compiler:c++11-lib perl5 tar:xz shebangfix python:3.6,build + +SHEBANG_FILES= utils/lit/lit.py utils/llvm-lit/llvm-lit.in \ + tools/opt-viewer/optrecord.py \ + tools/opt-viewer/opt-diff.py \ + tools/opt-viewer/opt-stats.py \ + tools/opt-viewer/opt-viewer.py + +SHEBANG_FILES+= tools/clang/tools/extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py \ + tools/clang/tools/extra/clang-tidy/tool/clang-tidy-diff.py \ + tools/clang/tools/extra/clang-tidy/tool/run-clang-tidy.py -SHEBANG_FILES= llvm/utils/lit/lit.py \ - llvm/utils/llvm-lit/llvm-lit.in \ - llvm/tools/opt-viewer/optrecord.py \ - llvm/tools/opt-viewer/opt-diff.py \ - llvm/tools/opt-viewer/opt-stats.py \ - llvm/tools/opt-viewer/opt-viewer.py CMAKE_ARGS= -DLLVM_BUILD_LLVM_DYLIB=ON @@ -33,7 +38,7 @@ CMAKE_ARGS+= -DLLVM_DEFAULT_TARGET_TRIPLE=${CONFIGURE_TARGET} CMAKE_ARGS+= -DLLVM_HOST_TRIPLE=${CONFIGURE_TARGET} CMAKE_ARGS+= -DCMAKE_INSTALL_MANDIR:PATH="man" CMAKE_ARGS+= -DLLVM_PARALLEL_LINK_JOBS=1 - +CMAKE_ARGS+= -DLLVM_ENABLE_Z3_SOLVER=OFF CFLAGS+= -DNDEBUG CXXFLAGS+= -DNDEBUG @@ -41,13 +46,20 @@ CXXFLAGS+= -DNDEBUG CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/:C/arm64/aarch64/}-pc-${OPSYS:tl}${OSREL}${TARGET_ABI} -LLVM_ENABLE_PROJECTS+= clang -LLVM_ENABLE_PROJECTS+= compiler-rt -LLVM_ENABLE_PROJECTS+= lld +DISTFILES+= clang-${DISTVERSION}.src${EXTRACT_SUFX} +DISTFILES+= clang-tools-extra-${DISTVERSION}.src${EXTRACT_SUFX} +DISTFILES+= lld-${DISTVERSION}.src${EXTRACT_SUFX} -CMAKE_ARGS+= -DLLVM_ENABLE_PROJECTS="${LLVM_ENABLE_PROJECTS:ts;}" +WRKSRC_CLANG= ${WRKDIR}/clang-${PORTVERSION}.src +WRKSRC_EXTRA= ${WRKDIR}/clang-tools-extra-${PORTVERSION}.src +WRKSRC_LLD= ${WRKDIR}/lld-${PORTVERSION}.src -WRKSRC= ${WRKDIR}/llvm-project-${LLVM_PROJECT_COMMIT} -CMAKE_SOURCE_PATH= ${WRKSRC}/llvm +#NATIVE_BACKENDS=X86 +#CMAKE_ARGS+= -DLLVM_TARGETS_TO_BUILD="${NATIVE_BACKENDS}" + +post-extract: + ${MV} ${WRKSRC_CLANG} ${PATCH_WRKSRC}/tools/clang + ${MV} ${WRKSRC_EXTRA} ${PATCH_WRKSRC}/tools/clang/tools/extra + ${MV} ${WRKSRC_LLD} ${PATCH_WRKSRC}/tools/lld .include diff --git a/devel/llvm10/distinfo b/devel/llvm10/distinfo index 985af571..195b5d3f 100644 --- a/devel/llvm10/distinfo +++ b/devel/llvm10/distinfo @@ -1,3 +1,9 @@ -TIMESTAMP = 1579429274 -SHA256 (llvm-llvm-project-10.0.20200103-add743b4348095c0d2e407c7a2b8a87a5f8194b0_GH0.tar.gz) = b6d44cbd083afa1dc9af8306ff8aae944b490322c81de614d619e5532e060b4a -SIZE (llvm-llvm-project-10.0.20200103-add743b4348095c0d2e407c7a2b8a87a5f8194b0_GH0.tar.gz) = 120147591 +TIMESTAMP = 1587195260 +SHA256 (llvm-10.0.0.src.tar.xz) = df83a44b3a9a71029049ec101fb0077ecbbdf5fe41e395215025779099a98fdf +SIZE (llvm-10.0.0.src.tar.xz) = 35733192 +SHA256 (clang-10.0.0.src.tar.xz) = 885b062b00e903df72631c5f98b9579ed1ed2790f74e5646b4234fa084eacb21 +SIZE (clang-10.0.0.src.tar.xz) = 14190012 +SHA256 (clang-tools-extra-10.0.0.src.tar.xz) = acdf8cf6574b40e6b1dabc93e76debb84a9feb6f22970126b04d4ba18b92911c +SIZE (clang-tools-extra-10.0.0.src.tar.xz) = 2604944 +SHA256 (lld-10.0.0.src.tar.xz) = b9a0d7c576eeef05bc06d6e954938a01c5396cee1d1e985891e0b1cf16e3d708 +SIZE (lld-10.0.0.src.tar.xz) = 1143340 diff --git a/devel/llvm10/files/patch-cmake_modules_AddSphinxTarget.cmake b/devel/llvm10/files/patch-cmake_modules_AddSphinxTarget.cmake index d704925d..f4fc8f25 100644 --- a/devel/llvm10/files/patch-cmake_modules_AddSphinxTarget.cmake +++ b/devel/llvm10/files/patch-cmake_modules_AddSphinxTarget.cmake @@ -1,5 +1,5 @@ ---- llvm/cmake/modules/AddSphinxTarget.cmake.orig -+++ llvm/cmake/modules/AddSphinxTarget.cmake +--- cmake/modules/AddSphinxTarget.cmake.orig ++++ cmake/modules/AddSphinxTarget.cmake @@ -29,6 +29,8 @@ endif() diff --git a/devel/llvm10/files/patch-fformat_extensions.diff b/devel/llvm10/files/patch-fformat_extensions.diff index 3f0d5b0d..1a143133 100644 --- a/devel/llvm10/files/patch-fformat_extensions.diff +++ b/devel/llvm10/files/patch-fformat_extensions.diff @@ -1,11 +1,44 @@ ---- clang/include/clang/Driver/Options.td.orig 2019-10-21 21:45:02.000000000 +0100 -+++ clang/include/clang/Driver/Options.td 2019-10-22 00:00:39.833390000 +0100 -@@ -1186,6 +1186,8 @@ - Flags<[CC1Option]>; - def fno_use_line_directives : Flag<["-"], "fno-use-line-directives">, Group; +diff -ruN tools/clang/include/clang/Basic/LangOptions.def tools/clang/include/clang/Basic/LangOptions.def +--- tools/clang/include/clang/Basic/LangOptions.def 2015-07-30 22:47:41 UTC ++++ tools/clang/include/clang/Basic/LangOptions.def +@@ -114,6 +114,7 @@ + LANGOPT(RTTIData , 1, 1, "emit run-time type information data") + LANGOPT(MSBitfields , 1, 0, "Microsoft-compatible structure layout") + LANGOPT(Freestanding, 1, 0, "freestanding implementation") ++LANGOPT(FormatExtensions , 1, 0, "FreeBSD format extensions") + LANGOPT(NoBuiltin , 1, 0, "disable builtin functions") + LANGOPT(NoMathBuiltin , 1, 0, "disable math builtin functions") + LANGOPT(GNUAsm , 1, 1, "GNU-style inline assembly") +diff -ruN tools/clang/include/clang/Driver/Options.td tools/clang/include/clang/Driver/Options.td +--- tools/clang/include/clang/Driver/Options.td.orig 2020-01-30 15:29:37.000000000 +0000 ++++ tools/clang/include/clang/Driver/Options.td 2020-01-31 23:26:44.132423000 +0000 +@@ -1211,6 +1211,8 @@ -+def fformat_extensions: Flag<["-"], "fformat-extensions">, Group, Flags<[CC1Option]>, -+ HelpText<"Enable FreeBSD kernel specific format string extensions">; def ffreestanding : Flag<["-"], "ffreestanding">, Group, Flags<[CC1Option]>, HelpText<"Assert that the compilation takes place in a freestanding environment">; ++def fformat_extensions: Flag<["-"], "fformat-extensions">, Group, Flags<[CC1Option]>, ++ HelpText<"Enable FreeBSD kernel specific format string extensions">; def fgnuc_version_EQ : Joined<["-"], "fgnuc-version=">, Group, + HelpText<"Sets various macros to claim compatibility with the given GCC version (default is 4.2.1)">, + Flags<[CC1Option, CoreOption]>; +--- tools/clang/lib/Driver/ToolChains/Clang.cpp.orig 2017-09-14 19:36:28.212240000 +0100 ++++ tools/clang/lib/Driver/ToolChains/Clang.cpp 2017-09-14 19:35:59.296165000 +0100 +@@ -3202,6 +3202,7 @@ + + // Forward -f (flag) options which we can pass directly. + Args.AddLastArg(CmdArgs, options::OPT_femit_all_decls); ++ Args.AddLastArg(CmdArgs, options::OPT_fformat_extensions); + Args.AddLastArg(CmdArgs, options::OPT_fheinous_gnu_extensions); + Args.AddLastArg(CmdArgs, options::OPT_fno_operator_names); + // Emulated TLS is enabled by default on Android and OpenBSD, and can be enabled +diff -ruN tools/clang/lib/Frontend/CompilerInvocation.cpp tools/clang/lib/Frontend/CompilerInvocation.cpp +--- tools/clang/lib/Frontend/CompilerInvocation.cpp 2015-07-30 22:47:41 UTC ++++ tools/clang/lib/Frontend/CompilerInvocation.cpp +@@ -1543,6 +1543,7 @@ + Opts.ShortWChar = Args.hasFlag(OPT_fshort_wchar, OPT_fno_short_wchar, false); + Opts.ShortEnums = Args.hasArg(OPT_fshort_enums); + Opts.Freestanding = Args.hasArg(OPT_ffreestanding); ++ Opts.FormatExtensions = Args.hasArg(OPT_fformat_extensions); + Opts.NoBuiltin = Args.hasArg(OPT_fno_builtin) || Opts.Freestanding; + Opts.NoMathBuiltin = Args.hasArg(OPT_fno_math_builtin); + Opts.AssumeSaneOperatorNew = !Args.hasArg(OPT_fno_assume_sane_operator_new); diff --git a/devel/llvm10/files/patch-freebsd-r352030 b/devel/llvm10/files/patch-freebsd-r352030 new file mode 100644 index 00000000..9015c0be --- /dev/null +++ b/devel/llvm10/files/patch-freebsd-r352030 @@ -0,0 +1,36 @@ +commit 5f6a983e7fba98335e2863fe31305e895545ebb2 +Author: dim +Date: Sun Sep 8 10:31:34 2019 +0000 + + Target i586 by default on the i386 architecture, since after upstream's + change https://reviews.llvm.org/rL356631 ("[X86] Add CMPXCHG8B feature + flag. Set it for all CPUs except i386/i486 including 'generic'. Disable + use of CMPXCHG8B when this flag isn't set"), clang now correctly emits + calls to __atomic_load_8, __atomic_store_8, etc. when targeting i486, + and this means we can no longer link most modern programs, because we do + not have a libatomic, nor support for atomic functions in libc. See + also PR 230888, 220822, 233725, 234976, and more probably duplicates. + + Note that in practice, clang has been incorrectly generating cmpxchg8b + instructions for years now, when targeting i486. So de facto nothing + really changes by doing this. + +Notes: + svn path=/projects/clang900-import/; revision=352030 + +diff --git tools/clang/lib/Driver/ToolChains/Arch/X86.cpp tools/clang/lib/Driver/ToolChains/Arch/X86.cpp +index 34be226b69e9..9a5c0aa28c7f 100644 +--- tools/clang/lib/Driver/ToolChains/Arch/X86.cpp ++++ tools/clang/lib/Driver/ToolChains/Arch/X86.cpp +@@ -93,10 +93,10 @@ const char *x86::getX86TargetCPU(const ArgList &Args, + return "x86-64"; + + switch (Triple.getOS()) { +- case llvm::Triple::FreeBSD: + case llvm::Triple::NetBSD: + case llvm::Triple::OpenBSD: + return "i486"; ++ case llvm::Triple::FreeBSD: + case llvm::Triple::Haiku: + return "i586"; + default: diff --git a/devel/llvm10/files/patch-freebsd-r352318 b/devel/llvm10/files/patch-freebsd-r352318 new file mode 100644 index 00000000..314379fc --- /dev/null +++ b/devel/llvm10/files/patch-freebsd-r352318 @@ -0,0 +1,93 @@ +commit 24b1a5b926832f68fa0a008b2484d4b44f58ee8e +Author: dim +Date: Sat Sep 14 10:55:33 2019 +0000 + + Revert commit from upstream llvm trunk (by Hans Wennborg): + + Re-commit r357452 (take 3): "SimplifyCFG + SinkCommonCodeFromPredecessors: Also sink function calls without used + results (PR41259)" + + Third time's the charm. + + This was reverted in r363220 due to being suspected of an internal + benchmark regression and a test failure, none of which turned out to + be caused by this. + + As reported in https://bugs.llvm.org/show_bug.cgi?id=43269, this causes + UNREACHABLE errors when compiling if_malo_pci.c for arm and aarch64. + +Notes: + svn path=/projects/clang900-import/; revision=352318 + +diff --git lib/Transforms/Utils/SimplifyCFG.cpp lib/Transforms/Utils/SimplifyCFG.cpp +index 11651d040dc0..6e2ef67408d9 100644 +--- lib/Transforms/Utils/SimplifyCFG.cpp ++++ lib/Transforms/Utils/SimplifyCFG.cpp +@@ -1428,10 +1428,9 @@ static bool HoistThenElseCodeToIf(BranchInst *BI, + static bool canSinkInstructions( + ArrayRef Insts, + DenseMap> &PHIOperands) { +- // Prune out obviously bad instructions to move. Each instruction must have +- // exactly zero or one use, and we check later that use is by a single, common +- // PHI instruction in the successor. +- bool HasUse = !Insts.front()->user_empty(); ++ // Prune out obviously bad instructions to move. Any non-store instruction ++ // must have exactly one use, and we check later that use is by a single, ++ // common PHI instruction in the successor. + for (auto *I : Insts) { + // These instructions may change or break semantics if moved. + if (isa(I) || I->isEHPad() || isa(I) || +@@ -1445,10 +1444,9 @@ static bool canSinkInstructions( + if (C->isInlineAsm()) + return false; + +- // Each instruction must have zero or one use. +- if (HasUse && !I->hasOneUse()) +- return false; +- if (!HasUse && !I->user_empty()) ++ // Everything must have only one use too, apart from stores which ++ // have no uses. ++ if (!isa(I) && !I->hasOneUse()) + return false; + } + +@@ -1457,11 +1455,11 @@ static bool canSinkInstructions( + if (!I->isSameOperationAs(I0)) + return false; + +- // All instructions in Insts are known to be the same opcode. If they have a +- // use, check that the only user is a PHI or in the same block as the +- // instruction, because if a user is in the same block as an instruction we're +- // contemplating sinking, it must already be determined to be sinkable. +- if (HasUse) { ++ // All instructions in Insts are known to be the same opcode. If they aren't ++ // stores, check the only user of each is a PHI or in the same block as the ++ // instruction, because if a user is in the same block as an instruction ++ // we're contemplating sinking, it must already be determined to be sinkable. ++ if (!isa(I0)) { + auto *PNUse = dyn_cast(*I0->user_begin()); + auto *Succ = I0->getParent()->getTerminator()->getSuccessor(0); + if (!all_of(Insts, [&PNUse,&Succ](const Instruction *I) -> bool { +@@ -1539,7 +1537,7 @@ static bool sinkLastInstruction(ArrayRef Blocks) { + // it is slightly over-aggressive - it gets confused by commutative instructions + // so double-check it here. + Instruction *I0 = Insts.front(); +- if (!I0->user_empty()) { ++ if (!isa(I0)) { + auto *PNUse = dyn_cast(*I0->user_begin()); + if (!all_of(Insts, [&PNUse](const Instruction *I) -> bool { + auto *U = cast(*I->user_begin()); +@@ -1597,10 +1595,11 @@ static bool sinkLastInstruction(ArrayRef Blocks) { + I0->andIRFlags(I); + } + +- if (!I0->user_empty()) { ++ if (!isa(I0)) { + // canSinkLastInstruction checked that all instructions were used by + // one and only one PHI node. Find that now, RAUW it to our common + // instruction and nuke it. ++ assert(I0->hasOneUse()); + auto *PN = cast(*I0->user_begin()); + PN->replaceAllUsesWith(I0); + PN->eraseFromParent(); diff --git a/devel/llvm10/files/patch-llvm-build_llvmbuild_main.py b/devel/llvm10/files/patch-llvm-build_llvmbuild_main.py deleted file mode 100644 index a6dd4abb..00000000 --- a/devel/llvm10/files/patch-llvm-build_llvmbuild_main.py +++ /dev/null @@ -1,21 +0,0 @@ ---- llvm/utils/llvm-build/llvmbuild/main.py.orig 2015-10-02 16:42:59 UTC -+++ llvm/utils/llvm-build/llvmbuild/main.py -@@ -747,7 +747,17 @@ def add_magic_target_components(parser, - - # We handle a few special cases of target names here for historical - # reasons, as these are the names configure currently comes up with. -- native_target_name = { 'x86' : 'X86', -+ native_target_name = { 'amd64' : 'X86', -+ 'arm' : 'ARM', -+ 'armeb' : 'ARM', -+ 'armv6' : 'ARM', -+ 'armv6hf' : 'ARM', -+ 'i386' : 'X86', -+ 'mips' : 'Mips', -+ 'powerpc' : 'PowerPC', -+ 'powerpc64' : 'PowerPC', -+ 'sparc64' : 'Sparc', -+ 'x86' : 'X86', - 'x86_64' : 'X86', - 'Unknown' : None }.get(opts.native_target, - opts.native_target) diff --git a/devel/llvm10/files/patch-llvm-revert-18bfb3a b/devel/llvm10/files/patch-llvm-revert-18bfb3a new file mode 100644 index 00000000..4f69eaf5 --- /dev/null +++ b/devel/llvm10/files/patch-llvm-revert-18bfb3a @@ -0,0 +1,16 @@ +--- lib/CodeGen/Analysis.cpp.orig 2020-03-26 15:48:08 UTC ++++ lib/CodeGen/Analysis.cpp +@@ -538,11 +538,10 @@ bool llvm::isInTailCallPosition(ImmutableCallSite CS, + // Debug info intrinsics do not get in the way of tail call optimization. + if (isa(BBI)) + continue; +- // A lifetime end or assume intrinsic should not stop tail call ++ // An assume intrinsic should not stop tail call + // optimization. + if (const IntrinsicInst *II = dyn_cast(BBI)) +- if (II->getIntrinsicID() == Intrinsic::lifetime_end || +- II->getIntrinsicID() == Intrinsic::assume) ++ if (II->getIntrinsicID() == Intrinsic::assume) + continue; + if (BBI->mayHaveSideEffects() || BBI->mayReadFromMemory() || + !isSafeToSpeculativelyExecute(&*BBI)) diff --git a/devel/llvm10/files/patch-openmp_libomptarget_src_omptarget.cpp b/devel/llvm10/files/patch-openmp_libomptarget_src_omptarget.cpp deleted file mode 100644 index 6ebaa3f9..00000000 --- a/devel/llvm10/files/patch-openmp_libomptarget_src_omptarget.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- openmp/libomptarget/src/omptarget.cpp.orig -+++ openmp/libomptarget/src/omptarget.cpp -@@ -12,6 +12,7 @@ - // - //===----------------------------------------------------------------------===// - -+#include - #include - - #include "device.h" diff --git a/devel/llvm10/files/patch-clang_lib_Headers_CMakeLists.txt b/devel/llvm10/files/patch-tools_clang_lib_Headers_CMakeLists.txt similarity index 83% rename from devel/llvm10/files/patch-clang_lib_Headers_CMakeLists.txt rename to devel/llvm10/files/patch-tools_clang_lib_Headers_CMakeLists.txt index dbc563df..17043c60 100644 --- a/devel/llvm10/files/patch-clang_lib_Headers_CMakeLists.txt +++ b/devel/llvm10/files/patch-tools_clang_lib_Headers_CMakeLists.txt @@ -1,5 +1,5 @@ ---- clang/lib/Headers/CMakeLists.txt.orig -+++ clang/lib/Headers/CMakeLists.txt +--- tools/clang/lib/Headers/CMakeLists.txt.orig ++++ tools/clang/lib/Headers/CMakeLists.txt @@ -56,7 +56,6 @@ intrin.h inttypes.h diff --git a/devel/llvm10/files/patch-tools_clang_tools_extra_clang-doc_tool_CMakeLists.txt b/devel/llvm10/files/patch-tools_clang_tools_extra_clang-doc_tool_CMakeLists.txt new file mode 100644 index 00000000..763f573f --- /dev/null +++ b/devel/llvm10/files/patch-tools_clang_tools_extra_clang-doc_tool_CMakeLists.txt @@ -0,0 +1,10 @@ +--- tools/clang/tools/extra/clang-doc/tool/CMakeLists.txt.orig 2020-01-30 15:29:37 UTC ++++ tools/clang/tools/extra/clang-doc/tool/CMakeLists.txt +@@ -18,6 +18,7 @@ target_link_libraries(clang-doc + clangDoc + ) + ++install(TARGETS clang-doc RUNTIME DESTINATION bin) + install(FILES ../assets/clang-doc-default-stylesheet.css + DESTINATION share/clang + COMPONENT clang-doc) diff --git a/devel/llvm10/files/patch-tools_clang_tools_scan-build_libexec_ccc-analyzer b/devel/llvm10/files/patch-tools_clang_tools_scan-build_libexec_ccc-analyzer new file mode 100644 index 00000000..e1c65480 --- /dev/null +++ b/devel/llvm10/files/patch-tools_clang_tools_scan-build_libexec_ccc-analyzer @@ -0,0 +1,12 @@ +--- tools/clang/tools/scan-build/libexec/ccc-analyzer.orig ++++ tools/clang/tools/scan-build/libexec/ccc-analyzer +@@ -81,6 +81,9 @@ + if (-x "/usr/bin/xcrun") { + $UseXCRUN = 1; + } ++} elsif (`uname -s` eq "FreeBSD\n") { ++ $DefaultCCompiler = 'cc'; ++ $DefaultCXXCompiler = 'c++'; + } else { + $DefaultCCompiler = 'gcc'; + $DefaultCXXCompiler = 'g++'; diff --git a/devel/llvm10/files/patch-tools_lldb_docs_conf.py b/devel/llvm10/files/patch-tools_lldb_docs_conf.py deleted file mode 100644 index 80007ecd..00000000 --- a/devel/llvm10/files/patch-tools_lldb_docs_conf.py +++ /dev/null @@ -1,15 +0,0 @@ ---- lldb/docs/conf.py.orig -+++ lldb/docs/conf.py -@@ -97,9 +97,9 @@ - # Theme options are theme-specific and customize the look and feel of a theme - # further. For a list of options available for each theme, see the - # documentation. --html_theme_options = { -- 'font_size': '11pt' --} -+#html_theme_options = { -+# 'font_size': '11pt' -+#} - - # Add any paths that contain custom themes here, relative to this directory. - #html_theme_path = [] diff --git a/devel/llvm10/pkg-plist b/devel/llvm10/pkg-plist index bd31f3b8..9c96b5b8 100644 --- a/devel/llvm10/pkg-plist +++ b/devel/llvm10/pkg-plist @@ -2,20 +2,30 @@ bin/bugpoint bin/c-index-test bin/clang bin/clang-10 +bin/clang-apply-replacements +bin/clang-change-namespace bin/clang-check bin/clang-cl bin/clang-cpp +bin/clang-doc bin/clang-extdef-mapping bin/clang-format bin/clang-import-test +bin/clang-include-fixer +bin/clang-move bin/clang-offload-bundler bin/clang-offload-wrapper +bin/clang-query bin/clang-refactor bin/clang-rename +bin/clang-reorder-fields bin/clang-scan-deps +bin/clang-tidy bin/clang++ +bin/clangd bin/diagtool bin/dsymutil +bin/find-all-symbols bin/git-clang-format bin/hmaptool bin/ld.lld @@ -78,8 +88,10 @@ bin/llvm-symbolizer bin/llvm-tblgen bin/llvm-undname bin/llvm-xray +bin/modularize bin/obj2yaml bin/opt +bin/pp-trace bin/sancov bin/sanstats bin/scan-build @@ -209,6 +221,7 @@ include/clang/AST/DeclVisitor.h include/clang/AST/DependentDiagnostic.h include/clang/AST/EvaluatedExprVisitor.h include/clang/AST/Expr.h +include/clang/AST/ExprConcepts.h include/clang/AST/ExprCXX.h include/clang/AST/ExprObjC.h include/clang/AST/ExprOpenMP.h @@ -548,6 +561,7 @@ include/clang/Sema/ParsedTemplate.h include/clang/Sema/Scope.h include/clang/Sema/ScopeInfo.h include/clang/Sema/Sema.h +include/clang/Sema/SemaConcept.h include/clang/Sema/SemaConsumer.h include/clang/Sema/SemaDiagnostic.h include/clang/Sema/SemaFixItUtils.h @@ -1106,6 +1120,7 @@ include/llvm/CodeGen/MachineSSAUpdater.h include/llvm/CodeGen/MachineTraceMetrics.h include/llvm/CodeGen/MachORelocation.h include/llvm/CodeGen/MacroFusion.h +include/llvm/CodeGen/MIRFormatter.h include/llvm/CodeGen/MIRParser/MIParser.h include/llvm/CodeGen/MIRParser/MIRParser.h include/llvm/CodeGen/MIRPrinter.h @@ -1410,6 +1425,9 @@ include/llvm/Demangle/MicrosoftDemangle.h include/llvm/Demangle/MicrosoftDemangleNodes.h include/llvm/Demangle/StringView.h include/llvm/Demangle/Utility.h +include/llvm/DWARFLinker/DWARFLinker.h +include/llvm/DWARFLinker/DWARFLinkerCompileUnit.h +include/llvm/DWARFLinker/DWARFLinkerDeclContext.h include/llvm/ExecutionEngine/ExecutionEngine.h include/llvm/ExecutionEngine/GenericValue.h include/llvm/ExecutionEngine/Interpreter.h @@ -1953,6 +1971,7 @@ include/llvm/Support/VersionTuple.h include/llvm/Support/VirtualFileSystem.h include/llvm/Support/Watchdog.h include/llvm/Support/Win64EH.h +include/llvm/Support/Windows/WindowsSupport.h include/llvm/Support/WindowsError.h include/llvm/Support/WithColor.h include/llvm/Support/X86DisassemblerDecoderCommon.h @@ -2042,6 +2061,7 @@ include/llvm/Transforms/IPO/InferFunctionAttrs.h include/llvm/Transforms/IPO/Inliner.h include/llvm/Transforms/IPO/Internalize.h include/llvm/Transforms/IPO/LowerTypeTests.h +include/llvm/Transforms/IPO/MergeFunctions.h include/llvm/Transforms/IPO/PartialInlining.h include/llvm/Transforms/IPO/PassManagerBuilder.h include/llvm/Transforms/IPO/SampleProfile.h @@ -2257,7 +2277,6 @@ lib/clang/10.0.0/include/f16cintrin.h lib/clang/10.0.0/include/float.h lib/clang/10.0.0/include/fma4intrin.h lib/clang/10.0.0/include/fmaintrin.h -lib/clang/10.0.0/include/fuzzer/FuzzedDataProvider.h lib/clang/10.0.0/include/fxsrintrin.h lib/clang/10.0.0/include/gfniintrin.h lib/clang/10.0.0/include/htmintrin.h @@ -2296,25 +2315,10 @@ lib/clang/10.0.0/include/ppc_wrappers/smmintrin.h lib/clang/10.0.0/include/ppc_wrappers/tmmintrin.h lib/clang/10.0.0/include/ppc_wrappers/xmmintrin.h lib/clang/10.0.0/include/prfchwintrin.h -lib/clang/10.0.0/include/profile/InstrProfData.inc lib/clang/10.0.0/include/ptwriteintrin.h lib/clang/10.0.0/include/rdseedintrin.h lib/clang/10.0.0/include/rtmintrin.h lib/clang/10.0.0/include/s390intrin.h -lib/clang/10.0.0/include/sanitizer/allocator_interface.h -lib/clang/10.0.0/include/sanitizer/asan_interface.h -lib/clang/10.0.0/include/sanitizer/common_interface_defs.h -lib/clang/10.0.0/include/sanitizer/coverage_interface.h -lib/clang/10.0.0/include/sanitizer/dfsan_interface.h -lib/clang/10.0.0/include/sanitizer/hwasan_interface.h -lib/clang/10.0.0/include/sanitizer/linux_syscall_hooks.h -lib/clang/10.0.0/include/sanitizer/lsan_interface.h -lib/clang/10.0.0/include/sanitizer/msan_interface.h -lib/clang/10.0.0/include/sanitizer/netbsd_syscall_hooks.h -lib/clang/10.0.0/include/sanitizer/scudo_interface.h -lib/clang/10.0.0/include/sanitizer/tsan_interface_atomic.h -lib/clang/10.0.0/include/sanitizer/tsan_interface.h -lib/clang/10.0.0/include/sanitizer/ubsan_interface.h lib/clang/10.0.0/include/sgxintrin.h lib/clang/10.0.0/include/shaintrin.h lib/clang/10.0.0/include/smmintrin.h @@ -2332,54 +2336,11 @@ lib/clang/10.0.0/include/wmmintrin.h lib/clang/10.0.0/include/x86intrin.h lib/clang/10.0.0/include/xmmintrin.h lib/clang/10.0.0/include/xopintrin.h -lib/clang/10.0.0/include/xray/xray_interface.h -lib/clang/10.0.0/include/xray/xray_log_interface.h -lib/clang/10.0.0/include/xray/xray_records.h lib/clang/10.0.0/include/xsavecintrin.h lib/clang/10.0.0/include/xsaveintrin.h lib/clang/10.0.0/include/xsaveoptintrin.h lib/clang/10.0.0/include/xsavesintrin.h lib/clang/10.0.0/include/xtestintrin.h -lib/clang/10.0.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a -lib/clang/10.0.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a.syms -lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-preinit-x86_64.a -lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-x86_64.a -lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-x86_64.a.syms -lib/clang/10.0.0/lib/freebsd/libclang_rt.asan-x86_64.so -lib/clang/10.0.0/lib/freebsd/libclang_rt.builtins-x86_64.a -lib/clang/10.0.0/lib/freebsd/libclang_rt.cfi_diag-x86_64.a -lib/clang/10.0.0/lib/freebsd/libclang_rt.cfi-x86_64.a -lib/clang/10.0.0/lib/freebsd/libclang_rt.dd-x86_64.a -lib/clang/10.0.0/lib/freebsd/libclang_rt.dyndd-x86_64.so -lib/clang/10.0.0/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a -lib/clang/10.0.0/lib/freebsd/libclang_rt.fuzzer-x86_64.a -lib/clang/10.0.0/lib/freebsd/libclang_rt.msan_cxx-x86_64.a -lib/clang/10.0.0/lib/freebsd/libclang_rt.msan_cxx-x86_64.a.syms -lib/clang/10.0.0/lib/freebsd/libclang_rt.msan-x86_64.a -lib/clang/10.0.0/lib/freebsd/libclang_rt.msan-x86_64.a.syms -lib/clang/10.0.0/lib/freebsd/libclang_rt.profile-x86_64.a -lib/clang/10.0.0/lib/freebsd/libclang_rt.safestack-x86_64.a -lib/clang/10.0.0/lib/freebsd/libclang_rt.stats_client-x86_64.a -lib/clang/10.0.0/lib/freebsd/libclang_rt.stats-x86_64.a -lib/clang/10.0.0/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a -lib/clang/10.0.0/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a.syms -lib/clang/10.0.0/lib/freebsd/libclang_rt.tsan-x86_64.a -lib/clang/10.0.0/lib/freebsd/libclang_rt.tsan-x86_64.a.syms -lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a -lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a.syms -lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.so -lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a -lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a.syms -lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a -lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a.syms -lib/clang/10.0.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.so -lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-basic-x86_64.a -lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-fdr-x86_64.a -lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-profiling-x86_64.a -lib/clang/10.0.0/lib/freebsd/libclang_rt.xray-x86_64.a -lib/clang/10.0.0/share/asan_blacklist.txt -lib/clang/10.0.0/share/cfi_blacklist.txt -lib/clang/10.0.0/share/msan_blacklist.txt lib/cmake/clang/ClangConfig.cmake lib/cmake/clang/ClangTargets-release.cmake lib/cmake/clang/ClangTargets.cmake @@ -2412,21 +2373,24 @@ lib/cmake/llvm/LLVMProcessSources.cmake lib/cmake/llvm/TableGen.cmake lib/cmake/llvm/UseLibtool.cmake lib/cmake/llvm/VersionFromVCS.cmake -lib/libBye.a lib/libclang-cpp.so -lib/libclang-cpp.so.10git +lib/libclang-cpp.so.10 lib/libclang.so lib/libclang.so.10 -lib/libclang.so.10git lib/libclangAnalysis.a +lib/libclangApplyReplacements.a lib/libclangARCMigrate.a lib/libclangAST.a lib/libclangASTMatchers.a lib/libclangBasic.a +lib/libclangChangeNamespace.a lib/libclangCodeGen.a lib/libclangCrossTU.a +lib/libclangDaemon.a +lib/libclangDaemonTweaks.a lib/libclangDependencyScanning.a lib/libclangDirectoryWatcher.a +lib/libclangDoc.a lib/libclangDriver.a lib/libclangDynamicASTMatchers.a lib/libclangEdit.a @@ -2435,9 +2399,14 @@ lib/libclangFrontend.a lib/libclangFrontendTool.a lib/libclangHandleCXX.a lib/libclangHandleLLVM.a +lib/libclangIncludeFixer.a +lib/libclangIncludeFixerPlugin.a lib/libclangIndex.a lib/libclangLex.a +lib/libclangMove.a lib/libclangParse.a +lib/libclangQuery.a +lib/libclangReorderFields.a lib/libclangRewrite.a lib/libclangRewriteFrontend.a lib/libclangSema.a @@ -2445,6 +2414,30 @@ lib/libclangSerialization.a lib/libclangStaticAnalyzerCheckers.a lib/libclangStaticAnalyzerCore.a lib/libclangStaticAnalyzerFrontend.a +lib/libclangTidy.a +lib/libclangTidyAbseilModule.a +lib/libclangTidyAndroidModule.a +lib/libclangTidyBoostModule.a +lib/libclangTidyBugproneModule.a +lib/libclangTidyCERTModule.a +lib/libclangTidyCppCoreGuidelinesModule.a +lib/libclangTidyDarwinModule.a +lib/libclangTidyFuchsiaModule.a +lib/libclangTidyGoogleModule.a +lib/libclangTidyHICPPModule.a +lib/libclangTidyLinuxKernelModule.a +lib/libclangTidyLLVMModule.a +lib/libclangTidyMiscModule.a +lib/libclangTidyModernizeModule.a +lib/libclangTidyMPIModule.a +lib/libclangTidyObjCModule.a +lib/libclangTidyOpenMPModule.a +lib/libclangTidyPerformanceModule.a +lib/libclangTidyPlugin.a +lib/libclangTidyPortabilityModule.a +lib/libclangTidyReadabilityModule.a +lib/libclangTidyUtils.a +lib/libclangTidyZirconModule.a lib/libclangTooling.a lib/libclangToolingASTDiff.a lib/libclangToolingCore.a @@ -2452,6 +2445,7 @@ lib/libclangToolingInclusions.a lib/libclangToolingRefactoring.a lib/libclangToolingSyntax.a lib/libclangTransformer.a +lib/libfindAllSymbols.a lib/liblldCOFF.a lib/liblldCommon.a lib/liblldCore.a @@ -2462,8 +2456,8 @@ lib/liblldMinGW.a lib/liblldReaderWriter.a lib/liblldWasm.a lib/liblldYAML.a -lib/libLLVM-10.0.0git.so -lib/libLLVM-10git.so +lib/libLLVM-10.0.0.so +lib/libLLVM-10.so lib/libLLVM.so lib/libLLVMAArch64AsmParser.a lib/libLLVMAArch64CodeGen.a @@ -2508,6 +2502,7 @@ lib/libLLVMDebugInfoMSF.a lib/libLLVMDebugInfoPDB.a lib/libLLVMDemangle.a lib/libLLVMDlltoolDriver.a +lib/libLLVMDWARFLinker.a lib/libLLVMExecutionEngine.a lib/libLLVMFrontendOpenMP.a lib/libLLVMFuzzMutate.a @@ -2609,19 +2604,27 @@ lib/libLLVMXCoreDisassembler.a lib/libLLVMXCoreInfo.a lib/libLLVMXRay.a lib/libLTO.so -lib/libLTO.so.10git +lib/libLTO.so.10 lib/libRemarks.so -lib/libRemarks.so.10git +lib/libRemarks.so.10 libexec/c++-analyzer libexec/ccc-analyzer +man/man1/scan-build.1.gz share/clang/bash-autocomplete.sh +share/clang/clang-doc-default-stylesheet.css share/clang/clang-format-bbedit.applescript share/clang/clang-format-diff.py share/clang/clang-format-sublime.py share/clang/clang-format.el share/clang/clang-format.py +share/clang/clang-include-fixer.el +share/clang/clang-include-fixer.py share/clang/clang-rename.el share/clang/clang-rename.py +share/clang/clang-tidy-diff.py +share/clang/index.js +share/clang/run-clang-tidy.py +share/clang/run-find-all-symbols.py share/opt-viewer/opt-diff.py share/opt-viewer/opt-stats.py share/opt-viewer/opt-viewer.py @@ -2708,6 +2711,7 @@ share/scan-view/startfile.py @dir include/llvm/DebugInfo/Symbolize @dir include/llvm/DebugInfo @dir include/llvm/Demangle +@dir include/llvm/DWARFLinker @dir include/llvm/ExecutionEngine/JITLink @dir include/llvm/ExecutionEngine/Orc/RPC @dir include/llvm/ExecutionEngine/Orc @@ -2736,6 +2740,7 @@ share/scan-view/startfile.py @dir include/llvm/Remarks @dir include/llvm/Support/Solaris/sys @dir include/llvm/Support/Solaris +@dir include/llvm/Support/Windows @dir include/llvm/Support @dir include/llvm/TableGen @dir include/llvm/Target/GlobalISel @@ -2763,16 +2768,9 @@ share/scan-view/startfile.py @dir include/llvm-c/Transforms @dir include/llvm-c @dir lib/clang/10.0.0/include/cuda_wrappers -@dir lib/clang/10.0.0/include/fuzzer @dir lib/clang/10.0.0/include/openmp_wrappers @dir lib/clang/10.0.0/include/ppc_wrappers -@dir lib/clang/10.0.0/include/profile -@dir lib/clang/10.0.0/include/sanitizer -@dir lib/clang/10.0.0/include/xray @dir lib/clang/10.0.0/include -@dir lib/clang/10.0.0/lib/freebsd -@dir lib/clang/10.0.0/lib -@dir lib/clang/10.0.0/share @dir lib/clang/10.0.0 @dir lib/clang @dir lib/cmake/clang @@ -2782,3 +2780,4 @@ share/scan-view/startfile.py @dir share/opt-viewer @dir share/scan-build @dir share/scan-view +@dir share diff --git a/devel/llvm90/Makefile b/devel/llvm90/Makefile index 4a78b437..5cec7901 100644 --- a/devel/llvm90/Makefile +++ b/devel/llvm90/Makefile @@ -42,11 +42,11 @@ CXXFLAGS+= -DNDEBUG CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/:C/arm64/aarch64/}-pc-${OPSYS:tl}${OSREL}${TARGET_ABI} DISTFILES+= cfe-${DISTVERSION}.src${EXTRACT_SUFX} -#DISTFILES+= clang-tools-extra-${DISTVERSION}.src${EXTRACT_SUFX} +DISTFILES+= clang-tools-extra-${DISTVERSION}.src${EXTRACT_SUFX} DISTFILES+= lld-${DISTVERSION}.src${EXTRACT_SUFX} WRKSRC_CLANG= ${WRKDIR}/cfe-${PORTVERSION}.src -#WRKSRC_EXTRA= ${WRKDIR}/clang-tools-extra-${PORTVERSION}.src +WRKSRC_EXTRA= ${WRKDIR}/clang-tools-extra-${PORTVERSION}.src WRKSRC_LLD= ${WRKDIR}/lld-${PORTVERSION}.src #NATIVE_BACKENDS=X86 @@ -54,7 +54,7 @@ WRKSRC_LLD= ${WRKDIR}/lld-${PORTVERSION}.src post-extract: ${MV} ${WRKSRC_CLANG} ${PATCH_WRKSRC}/tools/clang -# ${MV} ${WRKSRC_EXTRA} ${PATCH_WRKSRC}/tools/clang/tools/extra + ${MV} ${WRKSRC_EXTRA} ${PATCH_WRKSRC}/tools/clang/tools/extra ${MV} ${WRKSRC_LLD} ${PATCH_WRKSRC}/tools/lld .include