Date: Fri, 5 Mar 2021 01:47:32 +0000 (UTC) From: Brooks Davis <brooks@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r567355 - in head/devel: . llvm12 llvm12/files llvm12/files/clang llvm12/files/compiler-rt llvm12/files/extras llvm12/files/lldb Message-ID: <202103050147.1251lWmV023735@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Fri Mar 5 01:47:32 2021 New Revision: 567355 URL: https://svnweb.freebsd.org/changeset/ports/567355 Log: Welcome LLVM 12 (12.0.0rc2) to the tree Notable *port* changes (vs devel/llvm11): - Switch to single llvm-project distfile. This simplifies the port and support for the old style build process is rotting upstream after the mono-repo conversion. - Disable libedit dependency in libLLVM (still used by LLDB). This is one small step toward a dependency-less clang. - LLDB docs are disabled due to issues finding python includes when autogenerating API docs. Sponsored by: DARPA Added: head/devel/llvm12/ - copied from r567267, head/devel/llvm11/ head/devel/llvm12/files/patch-D77776 - copied, changed from r567267, head/devel/llvm11/files/clang/patch-D77776 head/devel/llvm12/files/patch-clang_lib_Headers_CMakeLists.txt - copied, changed from r567267, head/devel/llvm11/files/clang/patch-tools_clang_lib_Headers_CMakeLists.txt head/devel/llvm12/files/patch-clang_tools_clang-format_clang-format-sublime.py - copied, changed from r567267, head/devel/llvm11/files/clang/patch-tools_clang_tools_clang-format_clang-format-sublime.py head/devel/llvm12/files/patch-clang_tools_clang-format_clang-format.py - copied, changed from r567267, head/devel/llvm11/files/clang/patch-tools_clang_tools_clang-format_clang-format.py head/devel/llvm12/files/patch-clang_tools_clang-format_git-clang-format - copied, changed from r567267, head/devel/llvm11/files/clang/patch-tools_clang_tools_clang-format_git-clang-format head/devel/llvm12/files/patch-clang_tools_extra_clang-doc_tool_CMakeLists.txt - copied, changed from r567267, head/devel/llvm11/files/extras/patch-tools_clang_tools_extra_clang-doc_tool_CMakeLists.txt head/devel/llvm12/files/patch-clang_tools_scan-build_libexec_ccc-analyzer - copied, changed from r567267, head/devel/llvm11/files/clang/patch-tools_clang_tools_scan-build_libexec_ccc-analyzer head/devel/llvm12/files/patch-fformat_extensions.diff - copied, changed from r567267, head/devel/llvm11/files/clang/patch-fformat_extensions.diff head/devel/llvm12/files/patch-fopenmp.diff - copied, changed from r567267, head/devel/llvm11/files/clang/patch-fopenmp.diff head/devel/llvm12/files/patch-head-r332965.diff - copied, changed from r567267, head/devel/llvm11/files/lldb/patch-head-r332965.diff head/devel/llvm12/files/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h - copied, changed from r567267, head/devel/llvm11/files/compiler-rt/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h head/devel/llvm12/files/patch-lldb_CMakeLists.txt (contents, props changed) head/devel/llvm12/files/patch-lldb_docs_conf.py - copied, changed from r567267, head/devel/llvm11/files/lldb/patch-tools_lldb_docs_conf.py Deleted: head/devel/llvm12/files/clang/ head/devel/llvm12/files/compiler-rt/ head/devel/llvm12/files/extras/ head/devel/llvm12/files/lldb/ Modified: head/devel/Makefile head/devel/llvm12/Makefile head/devel/llvm12/Makefile.COMMANDS head/devel/llvm12/distinfo head/devel/llvm12/files/patch-cmake_modules_AddSphinxTarget.cmake head/devel/llvm12/files/patch-freebsd-r352318 head/devel/llvm12/files/patch-lib_Target_PowerPC_PPCTargetMachine.cpp head/devel/llvm12/pkg-plist Modified: head/devel/Makefile ============================================================================== --- head/devel/Makefile Fri Mar 5 01:36:09 2021 (r567354) +++ head/devel/Makefile Fri Mar 5 01:47:32 2021 (r567355) @@ -1421,6 +1421,7 @@ SUBDIR += llvm-devel SUBDIR += llvm10 SUBDIR += llvm11 + SUBDIR += llvm12 SUBDIR += llvm60 SUBDIR += llvm70 SUBDIR += llvm80 Modified: head/devel/llvm12/Makefile ============================================================================== --- head/devel/llvm11/Makefile Wed Mar 3 22:42:20 2021 (r567267) +++ head/devel/llvm12/Makefile Fri Mar 5 01:47:32 2021 (r567355) @@ -1,21 +1,22 @@ # $FreeBSD$ PORTNAME= llvm -DISTVERSION= 11.0.1 +DISTVERSION= 12.0.0rc2 PORTREVISION= 0 CATEGORIES= devel lang MASTER_SITES= https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \ https://${PRE_}releases.llvm.org/${LLVM_RELEASE}/${RCDIR} PKGNAMESUFFIX= ${LLVM_SUFFIX} -DISTNAME= ${PORTNAME}-${DISTVERSION}.src -DISTFILES= ${PORTNAME}-${DISTVERSION}.src${EXTRACT_SUFX} +DISTNAME= llvm-project-${DISTVERSION}.src +DISTFILES= llvm-project-${DISTVERSION}.src${EXTRACT_SUFX} MAINTAINER= brooks@FreeBSD.org COMMENT= LLVM and Clang +LICENSE_DIR= ${WRKSRC}/llvm .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE" LICENSE+= LLVM2 -LICENSE_FILE_LLVM2= ${WRKSRC}/LICENSE.TXT +LICENSE_FILE_LLVM2= ${LICENSE_DIR}/LICENSE.TXT LICENSE_NAME_LLVM2= Apache License 2.0 with LLVM Exceptions LICENSE_PERMS_LLVM2= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE:= ${LICENSE:NARM} @@ -30,21 +31,29 @@ LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} -USES= cmake compiler:c++11-lib libedit perl5 tar:xz \ +USES= cmake compiler:c++11-lib perl5 tar:xz \ shebangfix _USES_PYTHON?= python:3.6+,build USES+= ${_USES_PYTHON} USE_LDCONFIG= ${LLVM_PREFIX}/lib -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= 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 \ + clang/tools/scan-view/bin/scan-view \ + clang/tools/clang-format/clang-format-diff.py \ + clang/tools/clang-format/git-clang-format \ + clang/utils/hmaptool/hmaptool \ + clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py \ + clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py \ + clang-tools-extra/clang-tidy/tool/run-clang-tidy.py SUB_FILES= llvm-wrapper.sh SUB_LIST= LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}" CMAKE_INSTALL_PREFIX= ${LLVM_PREFIX} +CMAKE_SOURCE_PATH= ${WRKSRC}/llvm CMAKE_ARGS= -DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_LINK_LLVM_DYLIB=ON CMAKE_ARGS+= -DLLVM_ENABLE_RTTI=ON CMAKE_ARGS+= -DLLVM_DEFAULT_TARGET_TRIPLE=${CONFIGURE_TARGET} @@ -55,6 +64,7 @@ CMAKE_ARGS+= -DLLVM_HOST_TRIPLE=${CONFIGURE_TARGET} CMAKE_ARGS+= -DCMAKE_INSTALL_MANDIR:PATH="share/man" CMAKE_ARGS+= -DLLVM_PARALLEL_LINK_JOBS=1 CMAKE_ARGS+= -DLLVM_ENABLE_Z3_SOLVER=OFF +CMAKE_ARGS+= -DLLVM_ENABLE_LIBEDIT=OFF CMAKE_ARGS+= -DPython3_EXECUTABLE=${PYTHON_CMD} # LLVM likes to pick up ${LOCALBASE}/lib/libtinfo.so.* CMAKE_ARGS+= -DLLVM_ENABLE_TERMINFO=OFF @@ -92,8 +102,6 @@ BE_STANDARD_DESC= All non-experimental backends BE_${BE}_PLIST_FILES= ${_BE_LIBS_${BE}:O:S/$/.a/:S|^|${LLVM_PREFIX:S|${PREFIX}/||}/lib/libLLVM|} .endfor CLANG_DESC= Build clang -CLANG_EXTRA_PATCHES= ${PATCHDIR}/clang -CLANG_DISTFILES= clang-${DISTVERSION}.src${EXTRACT_SUFX} CLANG_CMAKE_ON= -DCLANG_DEFAULT_OPENMP_RUNTIME=libomp CLANG_PORTDOCS= clang CLANG_PLIST_FILES= share/toolchains/llvm${LLVM_SUFFIX}.mk @@ -105,8 +113,9 @@ CLANG_SUB_LIST= XCC=clang${LLVM_SUFFIX} \ X_COMPILER_TYPE=clang CLANG_USE= GNOME=libxml2 COMPILER_RT_DESC= Sanitizer libraries -COMPILER_RT_DISTFILES= compiler-rt-${DISTVERSION}.src${EXTRACT_SUFX} -COMPILER_RT_EXTRA_PATCHES= ${PATCHDIR}/compiler-rt +# An unwind.h is require to build. I think an in-tree one should be used +# but this seems to work as a workaround... +COMPILER_RT_BUILD_DEPENDS= libunwind>0:devel/libunwind COMPILER_RT_CMAKE_ON= -DCOMPILER_RT_INSTALL_PATH=${LLVM_PREFIX}/lib/clang/${LLVM_RELEASE} COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \ ${_COMPILER_RT_BLACKLISTS:S|^|${_CRTBLDIR}/|} @@ -120,16 +129,13 @@ DOCS_CMAKE_ON= -DLLVM_ENABLE_SPHINX=ON \ -DLLVM_BUILD_DOCS=ON DOCS_PLIST_FILES= ${MAN1SRCS:S|^|man/man1/|:S|.1$|${LLVM_SUFFIX}.1.gz|} EXTRAS_DESC= Extra clang tools -EXTRAS_EXTRA_PATCHES= ${PATCHDIR}/extras EXTRAS_IMPLIES= CLANG -EXTRAS_DISTFILES= clang-tools-extra-${DISTVERSION}.src${EXTRACT_SUFX} GOLD_DESC= Build the LLVM Gold plugin for LTO GOLD_CMAKE_ON= -DLLVM_BINUTILS_INCDIR=${LOCALBASE}/include GOLD_BUILD_DEPENDS= ${LOCALBASE}/bin/ld.gold:devel/binutils LIT_DESC= Install lit and FileCheck test tools LIT_VARS= _USES_PYTHON=python:3.6+ LLD_DESC= Install lld, the LLVM linker -LLD_DISTFILES= lld-${DISTVERSION}.src${EXTRACT_SUFX} LLD_LINK_DESC= Link ld.lld as ld to clang uses it LLD_LINK_IMPLIES= LLD LLDB_BUILD_DEPENDS= swig:devel/swig @@ -141,13 +147,11 @@ LLDB_CMAKE_ON= -DLUA_INCLUDE_DIR=${LOCALBASE}/include -DCURSES_NCURSES_LIBRARY=/usr/lib/libncurses.so \ -DPANEL_LIBRARIES=/usr/lib/libpanel.so LLDB_DESC= Install lldb, the LLVM debugger -LLDB_DISTFILES= lldb-${DISTVERSION}.src${EXTRACT_SUFX} -LLDB_EXTRA_PATCHES= ${PATCHDIR}/lldb LLDB_IMPLIES= CLANG -LLDB_PORTDOCS= lldb +LLDB_USES= lua:53 libedit LLDB_VARS= _USES_PYTHON=python:3.6+ OPENMP_DESC= Install libomp, the LLVM OpenMP runtime library -OPENMP_DISTFILES= openmp-${DISTVERSION}.src${EXTRACT_SUFX} +OPENMP_PORTDOCS= openmp PYCLANG_DESC= Install python bindings to libclang PYCLANG_IMPLIES= CLANG PYCLANG_VARS= _USES_PYTHON=python:3.6+ @@ -158,11 +162,6 @@ CMAKE_BUILD_TYPE= RelWithDebInfo STRIP= .endif -# Emulate USE_GITHUB's ${WRKSRC_tag} to reduce diffs to ../llvm-devel -.for option in CLANG COMPILER_RT EXTRAS LLD LLDB OPENMP -WRKSRC_${option:tl}= ${WRKDIR}/${${option}_DISTFILES:S/${EXTRACT_SUFX}//} -.endfor - PLIST_SUB+= LLVM_RELEASE=${LLVM_RELEASE} \ LLVM_SUFFIX=${LLVM_SUFFIX} \ LLVM_MAJOR=${LLVM_MAJOR} @@ -178,7 +177,6 @@ MAN1SRCS+= bugpoint.1 \ llvm-ar.1 \ llvm-as.1 \ llvm-bcanalyzer.1 \ - llvm-build.1 \ llvm-config.1 \ llvm-cov.1 \ llvm-cxxfilt.1 \ @@ -188,7 +186,9 @@ MAN1SRCS+= bugpoint.1 \ llvm-dwarfdump.1 \ llvm-exegesis.1 \ llvm-extract.1 \ + llvm-install-name-tool.1 \ llvm-lib.1 \ + llvm-libtool-darwin.1 \ llvm-lipo.1 \ llvm-link.1 \ llvm-locstats.1 \ @@ -198,6 +198,7 @@ MAN1SRCS+= bugpoint.1 \ llvm-objdump.1 \ llvm-pdbutil.1 \ llvm-profdata.1 \ + llvm-profgen.1 \ llvm-ranlib.1 \ llvm-readelf.1 \ llvm-readobj.1 \ @@ -207,7 +208,7 @@ MAN1SRCS+= bugpoint.1 \ llvm-strip.1 \ llvm-symbolizer.1 \ opt.1 \ - tblgen.1 + xxx-tblgen.1 STRIP_LIBS= BugpointPasses.so \ LLVMHello.so \ @@ -253,30 +254,26 @@ CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/:C/arm64/aarch # ----------- end of sync block -------------------- .if ${PORT_OPTIONS:MCLANG} +LLVM_ENABLE_PROJECTS+= clang COMMANDS+= ${CLANG_COMMANDS} MAN1SRCS+= clang.1 \ diagtool.1 \ scan-build.1 CLANG_PATTERN= (c-index-test|clang|diagtool|hmaptool|scan-|Reporter.py|ScanView.py|scanview.css|sorttable.js|startfile.py|-analyzer|AnalyzerPlugin.so) -SHEBANG_FILES+= tools/clang/tools/scan-view/bin/scan-view \ - tools/clang/tools/clang-format/clang-format-diff.py \ - tools/clang/tools/clang-format/git-clang-format \ - tools/clang/utils/hmaptool/hmaptool USES+= gnome .endif .if ${PORT_OPTIONS:MCOMPILER_RT} +LLVM_ENABLE_PROJECTS+= compiler-rt COMPILER_RT_PATTERN= (sanitizer|include.xray|include\/fuzzer|profile\/InstrProfData.inc) .endif .if ${PORT_OPTIONS:MEXTRAS} +LLVM_ENABLE_PROJECTS+= clang-tools-extra COMMANDS+= ${EXTRAS_COMMANDS} MAN1SRCS+= extraclangtools.1 PORTDOCS+= clang-tools PLIST_DIRS+= ${LLVM_PREFIX:S|${PREFIX}/||}/include/clang-tidy/plugin -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 .endif .if ${PORT_OPTIONS:MLIT} @@ -284,22 +281,30 @@ MAN1SRCS+= lit.1 FileCheck.1 .endif .if ${PORT_OPTIONS:MLLD} +LLVM_ENABLE_PROJECTS+= lld COMMANDS+= ${LLD_COMMANDS} PORTDOCS+= lld .endif .if ${PORT_OPTIONS:MLLDB} +LLVM_ENABLE_PROJECTS+= lldb COMMANDS+= ${LLDB_COMMANDS} -MAN1SRCS+= lldb.1 -USES+= lua .endif +.if ${PORT_OPTIONS:MOPENMP} +LLVM_ENABLE_PROJECTS+= openmp +MAN1SRCS+= llvmopenmp.1 +.endif OPENMP_PATTERN= libarcher|lib[ig]*omp|omp.h|ompt.h|ompt-multiplex.h|omp-tools.h .if ${PORT_OPTIONS:MPYCLANG} PYCLANG_PATTERN= (clang\/(__init__|cindex|enumerations).py)$$ .endif +.if defined(LLVM_ENABLE_PROJECTS) +CMAKE_ARGS+= -DLLVM_ENABLE_PROJECTS="${LLVM_ENABLE_PROJECTS:ts;}" +.endif + .include <bsd.port.pre.mk> .include "${.CURDIR}/Makefile.COMMANDS" @@ -338,7 +343,7 @@ _BE_LIBS_Lanai= AsmParser Disassembler _BE_LIBS_MSP430= AsmParser Disassembler _BE_LIBS_Mips= AsmParser Disassembler _BE_LIBS_PowerPC= AsmParser Disassembler -_BE_LIBS_RISCV= AsmParser Disassembler Utils +_BE_LIBS_RISCV= AsmParser Disassembler _BE_LIBS_Sparc= AsmParser Disassembler _BE_LIBS_SystemZ= AsmParser Disassembler _BE_LIBS_WebAssembly= AsmParser Disassembler @@ -355,10 +360,28 @@ BE_PATTERN=${_BE_LIBS_STANDARD:O:S/$/.a/:ts|} _CRTLIBDIR= ${LLVM_PREFIX:S|${PREFIX}/||}/lib/clang/${LLVM_RELEASE}/lib/freebsd _CRTBLDIR= ${LLVM_PREFIX:S|${PREFIX}/||}/lib/clang/${LLVM_RELEASE}/share _COMPILER_RT_BLACKLISTS= cfi_blacklist.txt +_COMPILER_RT_LIBS_i386= \ + libclang_rt.asan-i386.a \ + libclang_rt.asan-i386.so \ + libclang_rt.asan-preinit-i386.a \ + libclang_rt.asan_cxx-i386.a \ + libclang_rt.builtins-i386.a \ + libclang_rt.cfi-i386.a \ + libclang_rt.cfi_diag-i386.a \ + libclang_rt.profile-i386.a \ + libclang_rt.safestack-i386.a \ + libclang_rt.stats-i386.a \ + libclang_rt.stats_client-i386.a \ + libclang_rt.ubsan_minimal-i386.a \ + libclang_rt.ubsan_minimal-i386.so \ + libclang_rt.ubsan_standalone-i386.a \ + libclang_rt.ubsan_standalone-i386.so \ + libclang_rt.ubsan_standalone_cxx-i386.a .if ${ARCH} == "amd64" _COMPILER_RT_BLACKLISTS+= asan_blacklist.txt _COMPILER_RT_BLACKLISTS+= msan_blacklist.txt _COMPILER_RT_LIBS= \ + ${_COMPILER_RT_LIBS_i386} \ libclang_rt.asan-preinit-x86_64.a \ libclang_rt.asan-x86_64.a \ libclang_rt.asan-x86_64.a.syms \ @@ -370,8 +393,9 @@ _COMPILER_RT_LIBS= \ libclang_rt.cfi_diag-x86_64.a \ libclang_rt.dd-x86_64.a \ libclang_rt.dyndd-x86_64.so \ - libclang_rt.fuzzer-x86_64.a \ + libclang_rt.fuzzer_interceptors-x86_64.a \ libclang_rt.fuzzer_no_main-x86_64.a \ + libclang_rt.fuzzer-x86_64.a \ libclang_rt.msan-x86_64.a \ libclang_rt.msan-x86_64.a.syms \ libclang_rt.msan_cxx-x86_64.a \ @@ -399,23 +423,7 @@ _COMPILER_RT_LIBS= \ .endif .if ${ARCH} == "i386" _COMPILER_RT_BLACKLISTS+= asan_blacklist.txt -_COMPILER_RT_LIBS+= \ - libclang_rt.asan-i386.a \ - libclang_rt.asan-i386.so \ - libclang_rt.asan-preinit-i386.a \ - libclang_rt.asan_cxx-i386.a \ - libclang_rt.builtins-i386.a \ - libclang_rt.cfi-i386.a \ - libclang_rt.cfi_diag-i386.a \ - libclang_rt.profile-i386.a \ - libclang_rt.safestack-i386.a \ - libclang_rt.stats-i386.a \ - libclang_rt.stats_client-i386.a \ - libclang_rt.ubsan_minimal-i386.a \ - libclang_rt.ubsan_minimal-i386.so \ - libclang_rt.ubsan_standalone-i386.a \ - libclang_rt.ubsan_standalone-i386.so \ - libclang_rt.ubsan_standalone_cxx-i386.a +_COMPILER_RT_LIBS+= ${_COMPILER_RT_LIBS_i386} .endif # Use lld for armv6 on clang 7 and up to avoid binutils ld issues @@ -448,57 +456,28 @@ PLIST_SUB+= OPENMP="@comment " .else .endif -post-extract-CLANG-on: - ${MV} ${WRKSRC_clang} ${PATCH_WRKSRC}/tools/clang - -post-extract-EXTRAS-on: - ${MV} ${WRKSRC_extras} ${PATCH_WRKSRC}/tools/clang/tools/extra - -post-extract-LLD-on: - ${MV} ${WRKSRC_lld} ${PATCH_WRKSRC}/tools/lld - -post-extract-LLDB-on: - ${MV} ${WRKSRC_lldb} ${PATCH_WRKSRC}/tools/lldb - -post-extract-OPENMP-on: - # FreeBSD/aarch64 needs same va_list handling as Linux/aarch64 - # see https://reviews.freebsd.org/D21167 - ${REINPLACE_CMD} -e 's/KMP_ARCH_AARCH64) && KMP_OS_LINUX/KMP_ARCH_AARCH64)/' \ - ${WRKSRC_openmp}/runtime/src/kmp.h \ - ${WRKSRC_openmp}/runtime/src/kmp_csupport.cpp \ - ${WRKSRC_openmp}/runtime/src/kmp_runtime.cpp \ - ${WRKSRC_openmp}/runtime/src/kmp_gsupport.cpp - ${MV} ${WRKSRC_openmp} ${PATCH_WRKSRC}/projects/openmp - post-patch: ${REINPLACE_CMD} -e 's|import lit|import lit${LLVM_SUFFIX}|' \ -e 's|from lit|from lit${LLVM_SUFFIX}|' \ -e 's|lit\.|lit${LLVM_SUFFIX}.|' \ - ${WRKSRC}/utils/lit/lit.py ${WRKSRC}/utils/lit/lit/*.py \ - ${WRKSRC}/utils/lit/lit/formats/*.py + ${WRKSRC}/llvm/utils/lit/lit.py \ + ${WRKSRC}/llvm/utils/lit/lit/*.py \ + ${WRKSRC}/llvm/utils/lit/lit/formats/*.py ${REINPLACE_CMD} -e 's,/usr/local/,${LOCALBASE}/,' \ - ${WRKSRC}/CMakeLists.txt + ${WRKSRC}/llvm/CMakeLists.txt post-patch-CLANG-on: ${REINPLACE_CMD} -e 's|%%LLVM_PREFIX%%|${LLVM_PREFIX}|' \ - ${PATCH_WRKSRC}/tools/clang/lib/Driver/ToolChains/CommonArgs.cpp + ${WRKSRC}/clang/lib/Driver/ToolChains/CommonArgs.cpp ${REINPLACE_CMD} -e 's|%%LLVM_SUFFIX%%|${LLVM_SUFFIX}|' \ - ${PATCH_WRKSRC}/tools/clang/tools/clang-format/clang-format.py \ - ${PATCH_WRKSRC}/tools/clang/tools/clang-format/clang-format-sublime.py \ - ${PATCH_WRKSRC}/tools/clang/tools/clang-format/git-clang-format + ${WRKSRC}/clang/tools/clang-format/clang-format.py \ + ${WRKSRC}/clang/tools/clang-format/clang-format-sublime.py \ + ${WRKSRC}/clang/tools/clang-format/git-clang-format post-patch-LLD-on: - ${REINPLACE_CMD} -e "s|'indexsidebar.html'|['indexsidebar.html']|" \ - ${PATCH_WRKSRC}/tools/lld/docs/conf.py + ${REINPLACE_CMD} -e "s|'indexsidebar.html'|['indexsidebar.html']|" \ + ${WRKSRC}/lld/docs/conf.py -post-build-COMPILER_RT-on: - ${MKDIR} ${WRKDIR}/compiler-rt-build - cd ${WRKDIR}/compiler-rt-build && \ - ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \ - -DLLVM_CONFIG_PATH=${CONFIGURE_WRKSRC}/bin/llvm-config \ - ${WRKSRC_compiler_rt} && \ - ${MAKE_ENV} ${MAKE_CMD} - post-install: ${RM} -r ${STAGEDIR}${LLVM_PREFIX}/include/llvm/MC/MCAnalysis ${INSTALL_SCRIPT} ${WRKDIR}/llvm-wrapper.sh \ @@ -509,7 +488,10 @@ post-install: .endfor post-install-DOCS-on: - ${MV} ${STAGEDIR}${LLVM_PREFIX}/share/doc ${STAGEDIR}${DOCSDIR} + ${RM} -r ${STAGEDIR}${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${MV} ${STAGEDIR}${LLVM_PREFIX}/share/doc/* ${STAGEDIR}${DOCSDIR} + ${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/doc .for _man in ${MAN1SRCS} ${MV} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/${_man} \ ${STAGEDIR}${MANPREFIX}/man/man1/${_man:R}${LLVM_SUFFIX}.1 @@ -537,16 +519,8 @@ post-install-CLANG-on: ${INSTALL_DATA} ${WRKDIR}/xtoolchain.mk \ ${STAGEDIR}${PREFIX}/share/toolchains/llvm${LLVM_SUFFIX}.mk -post-install-COMPILER_RT-on: - cd ${WRKDIR}/compiler-rt-build && \ - ${MAKE_ENV} ${MAKE_CMD} ${INSTALL_TARGET} -.if ${ARCH} == "amd64" - ${RM} ${STAGEDIR}${PREFIX}/${_CRTLIBDIR}/libclang_rt*i386* -.endif - ${MKDIR} ${STAGEDIR}${PREFIX}/${_CRTLIBDIR} - post-install-LIT-on: - ${INSTALL_SCRIPT} ${PATCH_WRKSRC}/utils/lit/lit.py \ + ${INSTALL_SCRIPT} ${PATCH_WRKSRC}/llvm/utils/lit/lit.py \ ${STAGEDIR}${LLVM_PREFIX}/bin/lit ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \ ${STAGEDIR}${LLVM_PREFIX}/bin/llvm-lit @@ -557,11 +531,11 @@ post-install-LIT-on: ${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX} ${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/builtin_commands ${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/formats - ${INSTALL_DATA} ${WRKSRC}/utils/lit/lit/*.py \ + ${INSTALL_DATA} ${WRKSRC}/llvm/utils/lit/lit/*.py \ ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX} - ${INSTALL_DATA} ${WRKSRC}/utils/lit/lit/builtin_commands/*.py \ + ${INSTALL_DATA} ${WRKSRC}/llvm/utils/lit/lit/builtin_commands/*.py \ ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/builtin_commands - ${INSTALL_DATA} ${WRKSRC}/utils/lit/lit/formats/*.py \ + ${INSTALL_DATA} ${WRKSRC}/llvm/utils/lit/lit/formats/*.py \ ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/formats ${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/FileCheck \ ${STAGEDIR}${LLVM_PREFIX}/bin/ Modified: head/devel/llvm12/Makefile.COMMANDS ============================================================================== --- head/devel/llvm11/Makefile.COMMANDS Wed Mar 3 22:42:20 2021 (r567267) +++ head/devel/llvm12/Makefile.COMMANDS Fri Mar 5 01:47:32 2021 (r567355) @@ -9,6 +9,7 @@ LLVM_COMMANDS= \ llvm-ar \ llvm-as \ llvm-bcanalyzer \ + llvm-bitcode-strip \ llvm-cat \ llvm-cfi-verify \ llvm-config \ @@ -27,6 +28,7 @@ LLVM_COMMANDS= \ llvm-ifs \ llvm-install-name-tool \ llvm-jitlink \ + llvm-libtool-darwin \ llvm-link \ llvm-lipo \ llvm-mc \ @@ -40,6 +42,7 @@ LLVM_COMMANDS= \ llvm-opt-report \ llvm-pdbutil \ llvm-profdata \ + llvm-profgen \ llvm-ranlib \ llvm-rc \ llvm-readelf \ @@ -56,7 +59,8 @@ LLVM_COMMANDS= \ llvm-undname \ llvm-xray \ opt \ - sancov + sancov \ + split-file CLANG_COMMANDS= \ c-index-test \ @@ -97,6 +101,7 @@ LIT_COMMANDS= \ LLD_COMMANDS= \ ld.lld \ ld64.lld \ + ld64.lld.darwinnew \ lld \ lld-link \ wasm-ld Modified: head/devel/llvm12/distinfo ============================================================================== --- head/devel/llvm11/distinfo Wed Mar 3 22:42:20 2021 (r567267) +++ head/devel/llvm12/distinfo Fri Mar 5 01:47:32 2021 (r567355) @@ -1,15 +1,3 @@ -TIMESTAMP = 1610040988 -SHA256 (llvm-11.0.1.src.tar.xz) = ccd87c254b6aebc5077e4e6977d08d4be888e7eb672c6630a26a15d58b59b528 -SIZE (llvm-11.0.1.src.tar.xz) = 38914796 -SHA256 (clang-11.0.1.src.tar.xz) = 73f572c2eefc5a155e01bcd84815751d722a4d3925f53c144acfb93eeb274b4d -SIZE (clang-11.0.1.src.tar.xz) = 14849680 -SHA256 (compiler-rt-11.0.1.src.tar.xz) = 087be3f1116e861cd969c9b0b0903c27028b52eaf45157276f50a9c2500687fc -SIZE (compiler-rt-11.0.1.src.tar.xz) = 2136216 -SHA256 (clang-tools-extra-11.0.1.src.tar.xz) = 2ca211dd8cc396a919709a9bc35af11b7d425df0c608d85ba6629242893516c9 -SIZE (clang-tools-extra-11.0.1.src.tar.xz) = 1498852 -SHA256 (lld-11.0.1.src.tar.xz) = 60ba0da01a391078dcc437fee629f3bf7e30e06467a3a060b4a2a3aa661308b7 -SIZE (lld-11.0.1.src.tar.xz) = 1237040 -SHA256 (lldb-11.0.1.src.tar.xz) = e8d38917d079356fc1200676dfb370e16f3ee9cbdd092dd31e59d080ac5ef2fb -SIZE (lldb-11.0.1.src.tar.xz) = 9706328 -SHA256 (openmp-11.0.1.src.tar.xz) = 4d15a21b90e7de2f01296503f6e4b16c50197fbe9c82e7e81f9c07e28bd82ca7 -SIZE (openmp-11.0.1.src.tar.xz) = 971332 +TIMESTAMP = 1614877783 +SHA256 (llvm-project-12.0.0rc2.src.tar.xz) = 5cda94b2cf58ac516519c248625bee5fa145ab1dc527fcac7d6ab3316ffb0c3b +SIZE (llvm-project-12.0.0rc2.src.tar.xz) = 90882304 Copied and modified: head/devel/llvm12/files/patch-D77776 (from r567267, head/devel/llvm11/files/clang/patch-D77776) ============================================================================== --- head/devel/llvm11/files/clang/patch-D77776 Wed Mar 3 22:42:20 2021 (r567267, copy source) +++ head/devel/llvm12/files/patch-D77776 Fri Mar 5 01:47:32 2021 (r567355) @@ -6,8 +6,8 @@ default to a version that's no longer supported by OS https://reviews.llvm.org/D77776 ---- tools/clang/lib/Driver/ToolChains/FreeBSD.cpp.orig 2019-12-11 19:15:30 UTC -+++ tools/clang/lib/Driver/ToolChains/FreeBSD.cpp +--- clang/lib/Driver/ToolChains/FreeBSD.cpp.orig 2019-12-11 19:15:30 UTC ++++ clang/lib/Driver/ToolChains/FreeBSD.cpp @@ -351,7 +351,8 @@ FreeBSD::FreeBSD(const Driver &D, const llvm::Triple & } Copied and modified: head/devel/llvm12/files/patch-clang_lib_Headers_CMakeLists.txt (from r567267, head/devel/llvm11/files/clang/patch-tools_clang_lib_Headers_CMakeLists.txt) ============================================================================== --- head/devel/llvm11/files/clang/patch-tools_clang_lib_Headers_CMakeLists.txt Wed Mar 3 22:42:20 2021 (r567267, copy source) +++ head/devel/llvm12/files/patch-clang_lib_Headers_CMakeLists.txt Fri Mar 5 01:47:32 2021 (r567355) @@ -1,14 +1,14 @@ ---- tools/clang/lib/Headers/CMakeLists.txt.orig -+++ tools/clang/lib/Headers/CMakeLists.txt -@@ -72,7 +72,6 @@ - inttypes.h +--- clang/lib/Headers/CMakeLists.txt.orig ++++ clang/lib/Headers/CMakeLists.txt +@@ -76,7 +76,6 @@ invpcidintrin.h iso646.h + keylockerintrin.h - limits.h lwpintrin.h lzcntintrin.h mm3dnow.h -@@ -98,13 +97,7 @@ +@@ -102,13 +101,7 @@ s390intrin.h shaintrin.h smmintrin.h @@ -22,7 +22,7 @@ stdnoreturn.h tbmintrin.h tgmath.h -@@ -113,7 +106,6 @@ +@@ -118,7 +111,6 @@ unwind.h vadefs.h vaesintrin.h Copied and modified: head/devel/llvm12/files/patch-clang_tools_clang-format_clang-format-sublime.py (from r567267, head/devel/llvm11/files/clang/patch-tools_clang_tools_clang-format_clang-format-sublime.py) ============================================================================== --- head/devel/llvm11/files/clang/patch-tools_clang_tools_clang-format_clang-format-sublime.py Wed Mar 3 22:42:20 2021 (r567267, copy source) +++ head/devel/llvm12/files/patch-clang_tools_clang-format_clang-format-sublime.py Fri Mar 5 01:47:32 2021 (r567355) @@ -1,8 +1,8 @@ $FreeBSD$ ---- tools/clang/tools/clang-format/clang-format-sublime.py.orig -+++ tools/clang/tools/clang-format/clang-format-sublime.py +--- clang/tools/clang-format/clang-format-sublime.py.orig ++++ clang/tools/clang-format/clang-format-sublime.py @@ -18,7 +18,7 @@ import subprocess Copied and modified: head/devel/llvm12/files/patch-clang_tools_clang-format_clang-format.py (from r567267, head/devel/llvm11/files/clang/patch-tools_clang_tools_clang-format_clang-format.py) ============================================================================== --- head/devel/llvm11/files/clang/patch-tools_clang_tools_clang-format_clang-format.py Wed Mar 3 22:42:20 2021 (r567267, copy source) +++ head/devel/llvm12/files/patch-clang_tools_clang-format_clang-format.py Fri Mar 5 01:47:32 2021 (r567355) @@ -1,5 +1,5 @@ ---- tools/clang/tools/clang-format/clang-format.py.orig 2015-09-08 20:44:00 UTC -+++ tools/clang/tools/clang-format/clang-format.py +--- clang/tools/clang-format/clang-format.py.orig 2015-09-08 20:44:00 UTC ++++ clang/tools/clang-format/clang-format.py @@ -34,7 +34,7 @@ import vim # set g:clang_format_path to the path to clang-format if it is not on the path Copied and modified: head/devel/llvm12/files/patch-clang_tools_clang-format_git-clang-format (from r567267, head/devel/llvm11/files/clang/patch-tools_clang_tools_clang-format_git-clang-format) ============================================================================== --- head/devel/llvm11/files/clang/patch-tools_clang_tools_clang-format_git-clang-format Wed Mar 3 22:42:20 2021 (r567267, copy source) +++ head/devel/llvm12/files/patch-clang_tools_clang-format_git-clang-format Fri Mar 5 01:47:32 2021 (r567355) @@ -1,8 +1,8 @@ $FreeBSD$ ---- tools/clang/tools/clang-format/git-clang-format.orig -+++ tools/clang/tools/clang-format/git-clang-format +--- clang/tools/clang-format/git-clang-format.orig ++++ clang/tools/clang-format/git-clang-format @@ -90,7 +90,7 @@ usage=usage, formatter_class=argparse.RawDescriptionHelpFormatter, description=desc) Copied and modified: head/devel/llvm12/files/patch-clang_tools_extra_clang-doc_tool_CMakeLists.txt (from r567267, head/devel/llvm11/files/extras/patch-tools_clang_tools_extra_clang-doc_tool_CMakeLists.txt) ============================================================================== --- head/devel/llvm11/files/extras/patch-tools_clang_tools_extra_clang-doc_tool_CMakeLists.txt Wed Mar 3 22:42:20 2021 (r567267, copy source) +++ head/devel/llvm12/files/patch-clang_tools_extra_clang-doc_tool_CMakeLists.txt Fri Mar 5 01:47:32 2021 (r567355) @@ -1,5 +1,5 @@ ---- 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 +--- clang-tools-extra/clang-doc/tool/CMakeLists.txt.orig 2020-01-30 15:29:37 UTC ++++ clang-tools-extra/clang-doc/tool/CMakeLists.txt @@ -18,6 +18,7 @@ target_link_libraries(clang-doc clangDoc ) Copied and modified: head/devel/llvm12/files/patch-clang_tools_scan-build_libexec_ccc-analyzer (from r567267, head/devel/llvm11/files/clang/patch-tools_clang_tools_scan-build_libexec_ccc-analyzer) ============================================================================== --- head/devel/llvm11/files/clang/patch-tools_clang_tools_scan-build_libexec_ccc-analyzer Wed Mar 3 22:42:20 2021 (r567267, copy source) +++ head/devel/llvm12/files/patch-clang_tools_scan-build_libexec_ccc-analyzer Fri Mar 5 01:47:32 2021 (r567355) @@ -1,5 +1,5 @@ ---- tools/clang/tools/scan-build/libexec/ccc-analyzer.orig -+++ tools/clang/tools/scan-build/libexec/ccc-analyzer +--- clang/tools/scan-build/libexec/ccc-analyzer.orig ++++ clang/tools/scan-build/libexec/ccc-analyzer @@ -81,6 +81,9 @@ if (-x "/usr/bin/xcrun") { $UseXCRUN = 1; Modified: head/devel/llvm12/files/patch-cmake_modules_AddSphinxTarget.cmake ============================================================================== --- head/devel/llvm11/files/patch-cmake_modules_AddSphinxTarget.cmake Wed Mar 3 22:42:20 2021 (r567267) +++ head/devel/llvm12/files/patch-cmake_modules_AddSphinxTarget.cmake Fri Mar 5 01:47:32 2021 (r567355) @@ -1,11 +1,11 @@ ---- cmake/modules/AddSphinxTarget.cmake.orig -+++ cmake/modules/AddSphinxTarget.cmake -@@ -29,6 +29,8 @@ +--- llvm/cmake/modules/AddSphinxTarget.cmake.orig ++++ llvm/cmake/modules/AddSphinxTarget.cmake +@@ -39,6 +39,8 @@ endif() add_custom_target(${SPHINX_TARGET_NAME} -+ COMMAND ${CMAKE_COMMAND} ++ COMMAND ${CMAKE_COMMAND} + -E make_directory ${SPHINX_BUILD_DIR} - COMMAND ${SPHINX_EXECUTABLE} + COMMAND ${CMAKE_COMMAND} -E env ${ARG_ENV_VARS} + ${SPHINX_EXECUTABLE} -b ${builder} - -d "${SPHINX_DOC_TREE_DIR}" Copied and modified: head/devel/llvm12/files/patch-fformat_extensions.diff (from r567267, head/devel/llvm11/files/clang/patch-fformat_extensions.diff) ============================================================================== --- head/devel/llvm11/files/clang/patch-fformat_extensions.diff Wed Mar 3 22:42:20 2021 (r567267, copy source) +++ head/devel/llvm12/files/patch-fformat_extensions.diff Fri Mar 5 01:47:32 2021 (r567355) @@ -1,44 +1,11 @@ -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 @@ +--- 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<f_Group>; - def ffreestanding : Flag<["-"], "ffreestanding">, Group<f_Group>, Flags<[CC1Option]>, - HelpText<"Assert that the compilation takes place in a freestanding environment">; +def fformat_extensions: Flag<["-"], "fformat-extensions">, Group<f_Group>, Flags<[CC1Option]>, + HelpText<"Enable FreeBSD kernel specific format string extensions">; + def ffreestanding : Flag<["-"], "ffreestanding">, Group<f_Group>, Flags<[CC1Option]>, + HelpText<"Assert that the compilation takes place in a freestanding environment">; def fgnuc_version_EQ : Joined<["-"], "fgnuc-version=">, Group<f_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); Copied and modified: head/devel/llvm12/files/patch-fopenmp.diff (from r567267, head/devel/llvm11/files/clang/patch-fopenmp.diff) ============================================================================== --- head/devel/llvm11/files/clang/patch-fopenmp.diff Wed Mar 3 22:42:20 2021 (r567267, copy source) +++ head/devel/llvm12/files/patch-fopenmp.diff Fri Mar 5 01:47:32 2021 (r567355) @@ -1,5 +1,5 @@ ---- tools/clang/lib/Driver/ToolChains/CommonArgs.cpp.orig 2017-05-10 17:18:56.000000000 +0000 -+++ tools/clang/lib/Driver/ToolChains/CommonArgs.cpp 2017-05-10 23:01:17.087686000 +0000 +--- clang/lib/Driver/ToolChains/CommonArgs.cpp.orig 2017-05-10 17:18:56.000000000 +0000 ++++ clang/lib/Driver/ToolChains/CommonArgs.cpp 2017-05-10 23:01:17.087686000 +0000 @@ -441,7 +441,10 @@ switch (TC.getDriver().getOpenMPRuntime(Args)) { Modified: head/devel/llvm12/files/patch-freebsd-r352318 ============================================================================== --- head/devel/llvm11/files/patch-freebsd-r352318 Wed Mar 3 22:42:20 2021 (r567267) +++ head/devel/llvm12/files/patch-freebsd-r352318 Fri Mar 5 01:47:32 2021 (r567355) @@ -22,8 +22,8 @@ Notes: 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 +--- llvm/lib/Transforms/Utils/SimplifyCFG.cpp ++++ llvm/lib/Transforms/Utils/SimplifyCFG.cpp @@ -1428,10 +1428,9 @@ static bool HoistThenElseCodeToIf(BranchInst *BI, static bool canSinkInstructions( ArrayRef<Instruction *> Insts, Copied and modified: head/devel/llvm12/files/patch-head-r332965.diff (from r567267, head/devel/llvm11/files/lldb/patch-head-r332965.diff) ============================================================================== --- head/devel/llvm11/files/lldb/patch-head-r332965.diff Wed Mar 3 22:42:20 2021 (r567267, copy source) +++ head/devel/llvm12/files/patch-head-r332965.diff Fri Mar 5 01:47:32 2021 (r567355) @@ -10,8 +10,8 @@ Sponsored by: Turing Robotic Industries Inc. Index: tools/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.cpp =================================================================== ---- tools/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.cpp (revision 332964) -+++ tools/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.cpp (revision 332965) +--- lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.cpp (revision 332964) ++++ lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.cpp (revision 332965) @@ -169,7 +169,6 @@ lldb::RegisterContextSP FreeBSDThread::GetRegister RegisterInfoInterface *reg_interface = nullptr; const ArchSpec &target_arch = GetProcess()->GetTarget().GetArchitecture(); Modified: head/devel/llvm12/files/patch-lib_Target_PowerPC_PPCTargetMachine.cpp ============================================================================== --- head/devel/llvm11/files/patch-lib_Target_PowerPC_PPCTargetMachine.cpp Wed Mar 3 22:42:20 2021 (r567267) +++ head/devel/llvm12/files/patch-lib_Target_PowerPC_PPCTargetMachine.cpp Fri Mar 5 01:47:32 2021 (r567355) @@ -1,5 +1,5 @@ ---- lib/Target/PowerPC/PPCTargetMachine.cpp.orig 2019-07-04 07:43:51 UTC -+++ lib/Target/PowerPC/PPCTargetMachine.cpp +--- llvm/lib/Target/PowerPC/PPCTargetMachine.cpp.orig 2019-07-04 07:43:51 UTC ++++ llvm/lib/Target/PowerPC/PPCTargetMachine.cpp @@ -209,6 +209,20 @@ static PPCTargetMachine::PPCABI computeTargetABI(const if (TT.isMacOSX()) return PPCTargetMachine::PPC_ABI_UNKNOWN; Copied and modified: head/devel/llvm12/files/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h (from r567267, head/devel/llvm11/files/compiler-rt/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h) ============================================================================== --- head/devel/llvm11/files/compiler-rt/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h Wed Mar 3 22:42:20 2021 (r567267, copy source) +++ head/devel/llvm12/files/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h Fri Mar 5 01:47:32 2021 (r567355) @@ -1,11 +1,11 @@ ---- ../compiler-rt-11.0.1.src/lib/sanitizer_common/sanitizer_platform_interceptors.h.orig -+++ ../compiler-rt-11.0.1.src/lib/sanitizer_common/sanitizer_platform_interceptors.h -@@ -597,7 +597,7 @@ +--- compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h.orig ++++ compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h +@@ -576,7 +576,7 @@ #define SANITIZER_INTERCEPT_PTHREAD_ATFORK SI_NETBSD #define SANITIZER_INTERCEPT_GETENTROPY SI_FREEBSD #define SANITIZER_INTERCEPT_QSORT \ - (SI_POSIX && !SI_IOSSIM && !SI_WATCHOS && !SI_TVOS && !SI_ANDROID) + (SI_POSIX && !SI_IOSSIM && !SI_WATCHOS && !SI_TVOS && !SI_ANDROID && !SI_FREEBSD) - #define SANITIZER_INTERCEPT_QSORT_R (SI_LINUX && !SI_ANDROID) + #define SANITIZER_INTERCEPT_QSORT_R SI_GLIBC // sigaltstack on i386 macOS cannot be intercepted due to setjmp() // calling it and assuming that it does not clobber registers. Added: head/devel/llvm12/files/patch-lldb_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/llvm12/files/patch-lldb_CMakeLists.txt Fri Mar 5 01:47:32 2021 (r567355) @@ -0,0 +1,12 @@ +Disable docs due to issues with auto-generated API docs + +--- lldb/CMakeLists.txt.orig ++++ lldb/CMakeLists.txt +@@ -73,7 +73,6 @@ + + add_subdirectory(source) + add_subdirectory(tools) +-add_subdirectory(docs) + + if (LLDB_ENABLE_PYTHON) + if(LLDB_BUILD_FRAMEWORK) Copied and modified: head/devel/llvm12/files/patch-lldb_docs_conf.py (from r567267, head/devel/llvm11/files/lldb/patch-tools_lldb_docs_conf.py) ============================================================================== --- head/devel/llvm11/files/lldb/patch-tools_lldb_docs_conf.py Wed Mar 3 22:42:20 2021 (r567267, copy source) +++ head/devel/llvm12/files/patch-lldb_docs_conf.py Fri Mar 5 01:47:32 2021 (r567355) @@ -1,5 +1,5 @@ ---- tools/lldb/docs/conf.py.orig -+++ tools/lldb/docs/conf.py +--- 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 Modified: head/devel/llvm12/pkg-plist ============================================================================== --- head/devel/llvm11/pkg-plist Wed Mar 3 22:42:20 2021 (r567267) +++ head/devel/llvm12/pkg-plist Fri Mar 5 01:47:32 2021 (r567355) @@ -8,6 +8,7 @@ bin/llvm-addr2line%%LLVM_SUFFIX%% bin/llvm-ar%%LLVM_SUFFIX%% bin/llvm-as%%LLVM_SUFFIX%% bin/llvm-bcanalyzer%%LLVM_SUFFIX%% +bin/llvm-bitcode-strip%%LLVM_SUFFIX%% bin/llvm-cat%%LLVM_SUFFIX%% bin/llvm-cfi-verify%%LLVM_SUFFIX%% bin/llvm-config%%LLVM_SUFFIX%% @@ -26,6 +27,7 @@ bin/llvm-gsymutil%%LLVM_SUFFIX%% bin/llvm-ifs%%LLVM_SUFFIX%% bin/llvm-install-name-tool%%LLVM_SUFFIX%% bin/llvm-jitlink%%LLVM_SUFFIX%% +bin/llvm-libtool-darwin%%LLVM_SUFFIX%% bin/llvm-link%%LLVM_SUFFIX%% bin/llvm-lipo%%LLVM_SUFFIX%% bin/llvm-mc%%LLVM_SUFFIX%% @@ -39,6 +41,7 @@ bin/llvm-objdump%%LLVM_SUFFIX%% bin/llvm-opt-report%%LLVM_SUFFIX%% bin/llvm-pdbutil%%LLVM_SUFFIX%% bin/llvm-profdata%%LLVM_SUFFIX%% +bin/llvm-profgen%%LLVM_SUFFIX%% bin/llvm-ranlib%%LLVM_SUFFIX%% bin/llvm-rc%%LLVM_SUFFIX%% bin/llvm-readelf%%LLVM_SUFFIX%% @@ -56,6 +59,7 @@ bin/llvm-undname%%LLVM_SUFFIX%% bin/llvm-xray%%LLVM_SUFFIX%% bin/opt%%LLVM_SUFFIX%% bin/sancov%%LLVM_SUFFIX%% +bin/split-file%%LLVM_SUFFIX%% %%CLANG%%bin/c-index-test%%LLVM_SUFFIX%% %%CLANG%%bin/clang%%LLVM_SUFFIX%% %%CLANG%%bin/clang++%%LLVM_SUFFIX%% @@ -85,6 +89,7 @@ bin/sancov%%LLVM_SUFFIX%% %%EXTRAS%%bin/pp-trace%%LLVM_SUFFIX%% %%LLD%%bin/ld.lld%%LLVM_SUFFIX%% %%LLD%%bin/ld64.lld%%LLVM_SUFFIX%% +%%LLD%%bin/ld64.lld.darwinnew%%LLVM_SUFFIX%% %%LLD%%bin/lld%%LLVM_SUFFIX%% %%LLD%%bin/lld-link%%LLVM_SUFFIX%% %%LLD%%bin/wasm-ld%%LLVM_SUFFIX%% @@ -152,6 +157,7 @@ llvm%%LLVM_SUFFIX%%/bin/dsymutil %%LLD%%llvm%%LLVM_SUFFIX%%/bin/ld %%LLD%%llvm%%LLVM_SUFFIX%%/bin/ld.lld %%LLD%%llvm%%LLVM_SUFFIX%%/bin/ld64.lld +%%LLD%%llvm%%LLVM_SUFFIX%%/bin/ld64.lld.darwinnew llvm%%LLVM_SUFFIX%%/bin/llc %%LLD%%llvm%%LLVM_SUFFIX%%/bin/lld %%LLD%%llvm%%LLVM_SUFFIX%%/bin/lld-link @@ -165,6 +171,7 @@ llvm%%LLVM_SUFFIX%%/bin/llvm-addr2line llvm%%LLVM_SUFFIX%%/bin/llvm-ar llvm%%LLVM_SUFFIX%%/bin/llvm-as llvm%%LLVM_SUFFIX%%/bin/llvm-bcanalyzer +llvm%%LLVM_SUFFIX%%/bin/llvm-bitcode-strip llvm%%LLVM_SUFFIX%%/bin/llvm-c-test llvm%%LLVM_SUFFIX%%/bin/llvm-cat llvm%%LLVM_SUFFIX%%/bin/llvm-cfi-verify @@ -187,6 +194,7 @@ llvm%%LLVM_SUFFIX%%/bin/llvm-ifs llvm%%LLVM_SUFFIX%%/bin/llvm-install-name-tool llvm%%LLVM_SUFFIX%%/bin/llvm-jitlink llvm%%LLVM_SUFFIX%%/bin/llvm-lib +llvm%%LLVM_SUFFIX%%/bin/llvm-libtool-darwin llvm%%LLVM_SUFFIX%%/bin/llvm-link llvm%%LLVM_SUFFIX%%/bin/llvm-lipo llvm%%LLVM_SUFFIX%%/bin/llvm-lto @@ -202,6 +210,7 @@ llvm%%LLVM_SUFFIX%%/bin/llvm-objdump llvm%%LLVM_SUFFIX%%/bin/llvm-opt-report llvm%%LLVM_SUFFIX%%/bin/llvm-pdbutil llvm%%LLVM_SUFFIX%%/bin/llvm-profdata +llvm%%LLVM_SUFFIX%%/bin/llvm-profgen llvm%%LLVM_SUFFIX%%/bin/llvm-ranlib llvm%%LLVM_SUFFIX%%/bin/llvm-rc llvm%%LLVM_SUFFIX%%/bin/llvm-readelf @@ -218,16 +227,15 @@ llvm%%LLVM_SUFFIX%%/bin/llvm-tblgen llvm%%LLVM_SUFFIX%%/bin/llvm-undname llvm%%LLVM_SUFFIX%%/bin/llvm-xray %%EXTRAS%%llvm%%LLVM_SUFFIX%%/bin/modularize -llvm%%LLVM_SUFFIX%%/bin/obj2yaml llvm%%LLVM_SUFFIX%%/bin/opt %%EXTRAS%%llvm%%LLVM_SUFFIX%%/bin/pp-trace llvm%%LLVM_SUFFIX%%/bin/sancov llvm%%LLVM_SUFFIX%%/bin/sanstats %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/scan-build %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/scan-view +llvm%%LLVM_SUFFIX%%/bin/split-file llvm%%LLVM_SUFFIX%%/bin/verify-uselistorder %%LLD%%llvm%%LLVM_SUFFIX%%/bin/wasm-ld -llvm%%LLVM_SUFFIX%%/bin/yaml2obj %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang-c/BuildSystem.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang-c/CXCompilationDatabase.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang-c/CXErrorCode.h @@ -237,6 +245,7 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang-c/FatalErrorHandler.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang-c/Index.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang-c/Platform.h +%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang-c/Rewrite.h %%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/ClangTidy.h %%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/ClangTidyCheck.h %%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/ClangTidyDiagnosticConsumer.h @@ -267,6 +276,9 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj %%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/abseil/TimeComparisonCheck.h %%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/abseil/TimeSubtractionCheck.h %%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/abseil/UpgradeDurationConversionsCheck.h +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/altera/KernelNameRestrictionCheck.h +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/altera/SingleWorkItemBarrierCheck.h +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/altera/StructPackAlignCheck.h %%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/android/CloexecAccept4Check.h %%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/android/CloexecAcceptCheck.h %%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/android/CloexecCheck.h @@ -312,7 +324,9 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj %%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/bugprone/NotNullTerminatedResultCheck.h %%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/bugprone/ParentVirtualCallCheck.h %%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/bugprone/PosixReturnCheck.h +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/bugprone/RedundantBranchConditionCheck.h %%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/bugprone/ReservedIdentifierCheck.h +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/bugprone/SignalHandlerCheck.h %%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/bugprone/SignedCharMisuseCheck.h %%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/bugprone/SizeofContainerCheck.h %%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/bugprone/SizeofExpressionCheck.h @@ -351,6 +365,7 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj %%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/cert/StrToNumCheck.h %%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/cert/ThrownExceptionTypeCheck.h %%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/cert/VariadicFunctionDefCheck.h +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/concurrency/MtUnsafeCheck.h %%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/cppcoreguidelines/AvoidGotoCheck.h %%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/cppcoreguidelines/AvoidNonConstGlobalVariablesCheck.h %%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/cppcoreguidelines/InitVariablesCheck.h @@ -391,7 +406,6 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj %%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/google/GlobalNamesInHeadersCheck.h %%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/google/GlobalVariableDeclarationCheck.h %%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/google/IntegerTypesCheck.h -%%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/google/NonConstReferences.h %%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/google/OverloadedUnaryAndCheck.h %%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/google/TodoCommentCheck.h %%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/google/UnnamedNamespaceInHeaderCheck.h @@ -477,6 +491,7 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj %%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/performance/MoveConstArgCheck.h %%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/performance/MoveConstructorInitCheck.h %%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/performance/NoAutomaticMoveCheck.h +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/performance/NoIntToPtrCheck.h %%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/performance/NoexceptMoveConstructorCheck.h %%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/performance/TriviallyDestructibleCheck.h %%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/performance/TypePromotionInMathFnCheck.h @@ -492,6 +507,7 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj %%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/readability/DeleteNullPointerCheck.h %%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/readability/DeletedDefaultCheck.h %%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/readability/ElseAfterReturnCheck.h +%%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/readability/FunctionCognitiveComplexityCheck.h %%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/readability/FunctionSizeCheck.h %%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/readability/IdentifierNamingCheck.h %%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/readability/ImplicitBoolConversionCheck.h @@ -542,6 +558,8 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj %%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/utils/TypeTraits.h %%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/utils/UsingInserter.h %%EXTRAS%%llvm%%LLVM_SUFFIX%%/include/clang-tidy/zircon/TemporaryObjectsCheck.h +%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/APINotes/APINotesYAMLCompiler.h +%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/APINotes/Types.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/ARCMigrate/ARCMT.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/ARCMigrate/ARCMTActions.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/ARCMigrate/FileRemapper.h @@ -633,6 +651,7 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/ExternalASTSource.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/FormatString.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/GlobalDecl.h +%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/IgnoreExpr.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/JSONNodeDumper.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/LambdaCapture.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/AST/LexicallyOrderedRecursiveASTVisitor.h @@ -691,6 +710,7 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/ASTMatchers/Dynamic/VariantValue.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/ASTMatchers/GtestMatchers.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/Analyses/CFGReachabilityAnalysis.h +%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/Analyses/CalledOnceCheck.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/Analyses/Consumed.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/Analyses/Dominators.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/Analyses/ExprMutationAnalyzer.h @@ -719,6 +739,7 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/DomainSpecific/ObjCNoReturn.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/FlowSensitive/DataflowValues.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/FlowSensitive/DataflowWorklist.h +%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/IssueHash.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/PathDiagnostic.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/ProgramPoint.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Analysis/RetainSummaryManager.h @@ -795,14 +816,15 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/DiagnosticSemaKinds.inc %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/DiagnosticSerialization.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/DiagnosticSerializationKinds.inc +%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/DirectoryEntry.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/ExceptionSpecificationType.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/ExpressionTraits.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/FPOptions.def %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/Features.def +%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/FileEntry.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/FileManager.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/FileSystemOptions.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/FileSystemStatCache.h -%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/FixedPoint.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/IdentifierTable.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/JsonSupport.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/LLVM.h @@ -825,10 +847,12 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/OperatorKinds.def %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/OperatorKinds.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/OperatorPrecedence.h +%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/PPCTypes.def %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/PartialDiagnostic.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/PlistSupport.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/PragmaKinds.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/PrettyStackTrace.h +%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/ProfileList.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/SanitizerBlacklist.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/SanitizerSpecialCaseList.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/Sanitizers.def @@ -841,6 +865,7 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/SyncScope.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/TargetBuiltins.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/TargetCXXABI.h +%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/TargetID.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/TargetInfo.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/TargetOptions.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Basic/TemplateKinds.h @@ -941,6 +966,7 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Index/IndexingAction.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Index/IndexingOptions.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Index/USRGeneration.h +%%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/IndexSerialization/SerializablePathCollection.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Lex/CodeCompletionHandler.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Lex/DependencyDirectivesSourceMinimizer.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/Lex/DirectoryLookup.h @@ -1056,7 +1082,6 @@ llvm%%LLVM_SUFFIX%%/bin/yaml2obj %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/Checker.h %%CLANG%%llvm%%LLVM_SUFFIX%%/include/clang/StaticAnalyzer/Core/CheckerManager.h *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103050147.1251lWmV023735>