git: 52290b5abd7b - main - devel/llvm13: copy from devel/llvm12

Brooks Davis brooks at FreeBSD.org
Tue Aug 24 17:45:27 UTC 2021


The branch main has been updated by brooks:

URL: https://cgit.FreeBSD.org/ports/commit/?id=52290b5abd7bb30d023dda1ad743df30214a7c52

commit 52290b5abd7bb30d023dda1ad743df30214a7c52
Author:     Brooks Davis <brooks at FreeBSD.org>
AuthorDate: 2021-08-24 17:44:55 +0000
Commit:     Brooks Davis <brooks at FreeBSD.org>
CommitDate: 2021-08-24 17:44:55 +0000

    devel/llvm13: copy from devel/llvm12
    
    Create copy llvm12 to llvm13 but do not connect to the build.
---
 devel/llvm13/Makefile                              |  607 ++++
 devel/llvm13/Makefile.COMMANDS                     |  112 +
 devel/llvm13/distinfo                              |    3 +
 ...tra-patch-clang_lib_Driver_ToolChains_Clang.cpp |   12 +
 devel/llvm13/files/llvm-wrapper.sh.in              |   11 +
 devel/llvm13/files/patch-D77776                    |   20 +
 .../patch-clang_lib_Driver_ToolChains_FreeBSD.cpp  |   33 +
 .../files/patch-clang_lib_Headers_CMakeLists.txt   |   32 +
 .../files/patch-clang_test_Driver_fsanitize.c      |   16 +
 ...lang_tools_clang-format_clang-format-sublime.py |   11 +
 .../patch-clang_tools_clang-format_clang-format.py |   11 +
 ...patch-clang_tools_clang-format_git-clang-format |   29 +
 ...clang_tools_extra_clang-doc_tool_CMakeLists.txt |   10 +
 ...tch-clang_tools_scan-build_libexec_ccc-analyzer |   12 +
 .../patch-cmake_modules_AddSphinxTarget.cmake      |   11 +
 devel/llvm13/files/patch-fformat_extensions.diff   |   11 +
 devel/llvm13/files/patch-fopenmp.diff              |   14 +
 devel/llvm13/files/patch-freebsd-r352318           |   93 +
 devel/llvm13/files/patch-head-r332965.diff         |   22 +
 .../patch-lib_Target_PowerPC_PPCTargetMachine.cpp  |   23 +
 ...zer__common_sanitizer__platform__interceptors.h |   11 +
 devel/llvm13/files/patch-lld-be-compressed-debug   |  154 +
 devel/llvm13/files/patch-lldb_CMakeLists.txt       |   12 +
 devel/llvm13/files/patch-lldb_docs_conf.py         |   15 +
 ...Transforms_Instrumentation_AddressSanitizer.cpp |   26 +
 devel/llvm13/files/xtoolchain.mk.in                |    6 +
 devel/llvm13/pkg-descr                             |    8 +
 devel/llvm13/pkg-plist                             | 3798 ++++++++++++++++++++
 28 files changed, 5123 insertions(+)

diff --git a/devel/llvm13/Makefile b/devel/llvm13/Makefile
new file mode 100644
index 000000000000..501f9edff5e5
--- /dev/null
+++ b/devel/llvm13/Makefile
@@ -0,0 +1,607 @@
+PORTNAME=	llvm
+DISTVERSION=	12.0.1
+PORTREVISION=	3
+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=	llvm-project-${DISTVERSION}.src
+DISTFILES=	llvm-project-${DISTVERSION}.src${EXTRACT_SUFX}
+
+MAINTAINER=	brooks at FreeBSD.org
+COMMENT=	LLVM and Clang
+
+LICENSE_DIR=	${WRKSRC}/llvm
+.include "${.CURDIR}/../llvm-devel/Makefile.LICENSE"
+LICENSE+=	LLVM2
+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}
+
+LLVM_RELEASE=	${DISTVERSION:C/rc.*//}
+LLVM_MAJOR=	${LLVM_RELEASE:C/\.[0-9]\.[0-9]$//}
+LLVM_SUFFIX=	${LLVM_MAJOR}
+PRE_=		${DISTVERSION:C/.*rc.*/pre/:N*[0-9]*}
+RCDIR=		${DISTVERSION:S/${LLVM_RELEASE}//:C|(rc.*)|\1/|}
+
+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 perl5 tar:xz \
+		shebangfix
+_USES_PYTHON?=	python:3.6+,build
+USES+=		${_USES_PYTHON}
+USE_LDCONFIG=	${LLVM_PREFIX}/lib
+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}
+CMAKE_ARGS+=	-DLLVM_HOST_TRIPLE=${CONFIGURE_TARGET}
+# Following commit https://github.com/kitware/cmake/commit/956054
+# we need to either change the whole man-shuffle below, or simply
+# redefine CMAKE_INSTALL_MANDIR
+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
+
+# Disable assertions.  They should be disabled by cmake, but USES=cmake
+# overrides -DCMAKE_*_FLAGS_RELEASE.
+CFLAGS+=	-DNDEBUG
+CXXFLAGS+=	-DNDEBUG
+
+OPTIONS_DEFINE=	BE_AMDGPU CLANG DOCS EXTRAS LIT LLD PYCLANG
+OPTIONS_DEFINE_aarch64=	OPENMP
+OPTIONS_DEFINE_amd64=	COMPILER_RT GOLD LLDB OPENMP
+OPTIONS_DEFINE_i386=	COMPILER_RT LLDB OPENMP
+OPTIONS_DEFINE_powerpc=	GOLD
+OPTIONS_DEFINE_powerpc64=	GOLD OPENMP
+OPTIONS_DEFINE_powerpc64le=	GOLD OPENMP
+OPTIONS_DEFINE_riscv64=	OPENMP
+OPTIONS_DEFAULT=	BE_AMDGPU BE_STANDARD CLANG EXTRAS LIT LLD PYCLANG
+OPTIONS_DEFAULT_aarch64=	OPENMP
+OPTIONS_DEFAULT_amd64=	COMPILER_RT GOLD LLDB OPENMP
+OPTIONS_DEFAULT_i386=	COMPILER_RT LLDB OPENMP
+OPTIONS_DEFAULT_powerpc=	GOLD
+OPTIONS_DEFAULT_powerpc64=	${OPTIONS_DEFAULT_powerpc64_${OSREL:R}} OPENMP
+OPTIONS_DEFAULT_powerpc64_13=	GOLD
+OPTIONS_DEFAULT_powerpc64_14=	GOLD
+OPTIONS_DEFAULT_powerpc64le=	GOLD OPENMP
+OPTIONS_DEFAULT_riscv64=	OPENMP
+OPTIONS_SINGLE=		BACKENDS
+OPTIONS_SINGLE_BACKENDS=BE_FREEBSD BE_NATIVE BE_STANDARD
+OPTIONS_SUB=	yes
+# All non-backend options
+_ALL_OPTIONS=	CLANG COMPILER_RT DOCS EXTRAS GOLD LIT LLD LLDB PYCLANG OPENMP
+
+BE_AMDGPU_DESC=		AMD GPU backend (required by mesa)
+BE_FREEBSD_DESC=	Backends for FreeBSD architectures
+BE_FREEBSD_CMAKE_ON=	-DLLVM_TARGETS_TO_BUILD="${FREEBSD_BACKENDS:ts;}"
+BE_NATIVE_DESC=		Backend(s) for this architecture (${_NATIVE_BACKENDS})
+BE_NATIVE_CMAKE_ON=	-DLLVM_TARGETS_TO_BUILD="${NATIVE_BACKENDS:ts;}"
+BE_STANDARD_DESC=	All non-experimental backends
+.for BE in FREEBSD NATIVE STANDARD
+BE_${BE}_PLIST_FILES=	${_BE_LIBS_${BE}:O:S/$/.a/:S|^|${LLVM_PREFIX:S|${PREFIX}/||}/lib/libLLVM|}
+.endfor
+CLANG_DESC=	Build clang
+CLANG_CMAKE_ON=		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
+CLANG_PORTDOCS=		clang
+CLANG_PLIST_FILES=	share/toolchains/llvm${LLVM_SUFFIX}.mk
+CLANG_SUB_FILES=	xtoolchain.mk
+CLANG_SUB_LIST=		XCC=clang${LLVM_SUFFIX} \
+			XCXX=clang++${LLVM_SUFFIX} \
+			XCPP=clang-cpp${LLVM_SUFFIX} \
+			XLD=ld.lld${LLVM_SUFFIX} \
+			X_COMPILER_TYPE=clang
+CLANG_USE=		GNOME=libxml2
+COMPILER_RT_DESC=	Sanitizer libraries
+# 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}
+# Allow unwind.h to be found reliably
+COMPILER_RT_USES=	localbase
+COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \
+			${_COMPILER_RT_BLACKLISTS:S|^|${_CRTBLDIR}/|}
+DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR}
+DOCS_CONFLICTS_BUILD=	commonmark-cmark-*
+DOCS_PORTDOCS=		llvm
+DOCS_CMAKE_ON=		-DLLVM_ENABLE_SPHINX=ON \
+			-DSPHINX_EXECUTABLE=${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} \
+			-DSPHINX_WARNINGS_AS_ERRORS=OFF \
+			-DLLVM_BUILD_DOCS=ON
+DOCS_PLIST_FILES=	${MAN1SRCS:S|^|man/man1/|:S|.1$|${LLVM_SUFFIX}.1.gz|}
+EXTRAS_DESC=		Extra clang tools
+EXTRAS_IMPLIES=		CLANG
+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
+LLDB_BUILD_DEPENDS=	swig:devel/swig
+LLDB_CMAKE_ON=		-DLUA_INCLUDE_DIR=${LOCALBASE}/include/lua${LUA_VER_STR} \
+			-DLUA_LIBRARY=${LOCALBASE}/lib/liblua-${LUA_VER}.so \
+			-DCURSES_INCLUDE_PATH=/usr/include \
+			-DCURSES_CURSES_LIBRARY=/usr/lib/libcurses.so \
+			-DCURSES_FORM_LIBRARY=/usr/lib/libform.so \
+			-DCURSES_NCURSES_LIBRARY=/usr/lib/libncurses.so \
+			-DPANEL_LIBRARIES=/usr/lib/libpanel.so
+LLDB_DESC=		Install lldb, the LLVM debugger
+LLDB_IMPLIES=		CLANG
+LLDB_USES=		lua:53 libedit
+LLDB_VARS=		_USES_PYTHON=python:3.6+
+OPENMP_DESC=		Install libomp, the LLVM OpenMP runtime library
+OPENMP_PORTDOCS=	openmp
+PYCLANG_DESC=	Install python bindings to libclang
+PYCLANG_IMPLIES=	CLANG
+PYCLANG_VARS=	_USES_PYTHON=python:3.6+
+PYCLANG_CMAKE_ON= -DCLANG_PYTHON_BINDINGS_VERSIONS=${PYTHON_VER}
+
+.if defined(WITH_DEBUG)
+CMAKE_BUILD_TYPE=	RelWithDebInfo
+STRIP=
+.endif
+
+PLIST_SUB+=	LLVM_RELEASE=${LLVM_RELEASE} \
+		LLVM_SUFFIX=${LLVM_SUFFIX} \
+		LLVM_MAJOR=${LLVM_MAJOR}
+
+COMMANDS=	${LLVM_COMMANDS}
+FIRST_COMMAND=	${COMMANDS:C/^/XXXX/1:MXXXX*:C/^XXXX//}
+
+MAN1SRCS+=	bugpoint.1 \
+		dsymutil.1 \
+		llc.1 \
+		lli.1 \
+		llvm-addr2line.1 \
+		llvm-ar.1 \
+		llvm-as.1 \
+		llvm-bcanalyzer.1 \
+		llvm-config.1 \
+		llvm-cov.1 \
+		llvm-cxxfilt.1 \
+		llvm-cxxmap.1 \
+		llvm-diff.1 \
+		llvm-dis.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 \
+		llvm-mca.1 \
+		llvm-nm.1 \
+		llvm-objcopy.1 \
+		llvm-objdump.1 \
+		llvm-pdbutil.1 \
+		llvm-profdata.1 \
+		llvm-profgen.1 \
+		llvm-ranlib.1 \
+		llvm-readelf.1 \
+		llvm-readobj.1 \
+		llvm-size.1 \
+		llvm-stress.1 \
+		llvm-strings.1 \
+		llvm-strip.1 \
+		llvm-symbolizer.1 \
+		opt.1 \
+		xxx-tblgen.1
+
+STRIP_LIBS=	BugpointPasses.so \
+		LLVMHello.so \
+		${LIBNAME}.0 \
+		libLTO.so
+
+EXTRAS_LIBS=	libclangApplyReplacements \
+		libclangChangeNamespace \
+		libclangDaemon \
+		libclangDoc \
+		libclangIncludeFixer \
+		libclangMove \
+		libclangQuery \
+		libclangRename \
+		libclangReorderFields \
+		libclangTidy \
+		libclangTidyGoogleModule \
+		libclangTidyLLVMModule \
+		libclangTidyMiscModule \
+		libclangTidyReadabilityModule \
+		libclangTidyUtils \
+		libfindAllSymbols \
+		libmodernizeCore
+EXTRAS_FILES=	index.js
+EXTRAS_PATTERN=	${EXTRAS_COMMANDS:tW:C/  */|/g}|${EXTRAS_LIBS:tW:C/  */|/g}|${EXTRAS_FILES:tW:C/  */|/g}
+
+.include <bsd.port.options.mk>
+
+.if defined(PPC_ABI) && ${PPC_ABI} == ELFv2
+EXTRA_PATCHES=	${FILESDIR}/extra-patch-clang_lib_Driver_ToolChains_Clang.cpp
+.endif
+
+# keep in sync with /usr/src/lib/clang/clang.build.mk
+# ----------- start of sync block ------------------
+# Armv6 and armv7 uses hard float abi, unless the CPUTYPE has soft in it.
+# arm (for armv4 and armv5 CPUs) always uses the soft float ABI.
+# For all other targets, we stick with 'unknown'.
+.if ${ARCH:Marmv[67]*} && (!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "")
+TARGET_ABI=	-gnueabihf
+.elif ${ARCH:Marm*}
+TARGET_ABI=	-gnueabi
+.else
+TARGET_ABI=
+.endif
+
+CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/:C/arm64/aarch64/}-portbld-${OPSYS:tl}${OSREL}${TARGET_ABI}
+# ----------- 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)
+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
+.endif
+
+.if ${PORT_OPTIONS:MLIT}
+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}
+.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"
+
+_FREEBSD_BACKENDS=	AArch64 ARM Mips PowerPC RISCV Sparc X86
+FREEBSD_BACKENDS=	${_FREEBSD_BACKENDS}
+.if ${ARCH} == amd64
+_NATIVE_BACKENDS=	X86
+.elif ${ARCH} == aarch64
+_NATIVE_BACKENDS=	AArch64
+.elif ${ARCH:Marmv*}
+_NATIVE_BACKENDS=	ARM
+.elif ${ARCH} == i386
+_NATIVE_BACKENDS=	X86
+.elif ${ARCH:Mmips*}
+_NATIVE_BACKENDS=	Mips
+.elif ${ARCH:Mpowerpc*}
+_NATIVE_BACKENDS=	PowerPC
+.elif ${ARCH:Mriscv*}
+_NATIVE_BACKENDS=	RISCV
+.endif
+NATIVE_BACKENDS=	${_NATIVE_BACKENDS}
+.if ${PORT_OPTIONS:MBE_AMDGPU}
+FREEBSD_BACKENDS+=	AMDGPU
+NATIVE_BACKENDS+=	AMDGPU
+.endif
+STANDARD_BACKENDS=	${_FREEBSD_BACKENDS} AMDGPU AVR BPF Hexagon Lanai \
+			MSP430 NVPTX SystemZ WebAssembly XCore
+_BE_LIBS_COMMON=	CodeGen Desc Info
+_BE_LIBS_AArch64=	AsmParser Disassembler Utils
+_BE_LIBS_AMDGPU=	AsmParser Disassembler Utils
+_BE_LIBS_ARM=		AsmParser Disassembler Utils
+_BE_LIBS_AVR=		AsmParser Disassembler
+_BE_LIBS_BPF=		AsmParser Disassembler 
+_BE_LIBS_Hexagon=	AsmParser Disassembler
+_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
+_BE_LIBS_Sparc=		AsmParser Disassembler
+_BE_LIBS_SystemZ=	AsmParser Disassembler
+_BE_LIBS_WebAssembly=	AsmParser Disassembler
+_BE_LIBS_X86=		AsmParser Disassembler
+_BE_LIBS_XCore=		Disassembler
+.for BE in FREEBSD NATIVE STANDARD
+.for BE_ARCH in ${${BE}_BACKENDS}
+_BE_LIBS_${BE}+=	${_BE_LIBS_COMMON:S/^/${BE_ARCH}/} \
+			${_BE_LIBS_${BE_ARCH}:S/^/${BE_ARCH}/}
+.endfor
+.endfor
+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= \
+	libclang_rt.asan-preinit-x86_64.a \
+	libclang_rt.asan-x86_64.a \
+	libclang_rt.asan-x86_64.a.syms \
+	libclang_rt.asan-x86_64.so \
+	libclang_rt.asan_cxx-x86_64.a \
+	libclang_rt.asan_cxx-x86_64.a.syms \
+	libclang_rt.builtins-x86_64.a \
+	libclang_rt.cfi-x86_64.a \
+	libclang_rt.cfi_diag-x86_64.a \
+	libclang_rt.dd-x86_64.a \
+	libclang_rt.dyndd-x86_64.so \
+	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 \
+	libclang_rt.msan_cxx-x86_64.a.syms \
+	libclang_rt.profile-x86_64.a \
+	libclang_rt.safestack-x86_64.a \
+	libclang_rt.stats-x86_64.a \
+	libclang_rt.stats_client-x86_64.a \
+	libclang_rt.tsan-x86_64.a \
+	libclang_rt.tsan-x86_64.a.syms \
+	libclang_rt.tsan_cxx-x86_64.a \
+	libclang_rt.tsan_cxx-x86_64.a.syms \
+	libclang_rt.ubsan_minimal-x86_64.a \
+	libclang_rt.ubsan_minimal-x86_64.a.syms \
+	libclang_rt.ubsan_minimal-x86_64.so \
+	libclang_rt.ubsan_standalone-x86_64.a \
+	libclang_rt.ubsan_standalone-x86_64.a.syms \
+	libclang_rt.ubsan_standalone-x86_64.so \
+	libclang_rt.ubsan_standalone_cxx-x86_64.a \
+	libclang_rt.ubsan_standalone_cxx-x86_64.a.syms \
+	libclang_rt.xray-basic-x86_64.a \
+	libclang_rt.xray-fdr-x86_64.a \
+	libclang_rt.xray-profiling-x86_64.a \
+	libclang_rt.xray-x86_64.a
+.if exists(/usr/lib32/libc.so.7)
+_COMPILER_RT_LIBS+=	${_COMPILER_RT_LIBS_i386}
+.endif
+.endif
+.if ${ARCH} == "i386"
+_COMPILER_RT_BLACKLISTS+=	asan_blacklist.txt
+_COMPILER_RT_LIBS+=	${_COMPILER_RT_LIBS_i386}
+.endif
+
+# Use lld for armv6 on clang 7 and up to avoid binutils ld issues
+# PR: 235282
+.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 70
+LDFLAGS_armv6=-fuse-ld=lld
+.endif
+
+.if ${ARCH} == "armv6"
+BUILD_DEPENDS+=	${LOCALBASE}/bin/ld:devel/binutils
+CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
+MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
+.endif
+
+# Comment out plist entries for unsupported options.
+.for opt in ${_ALL_OPTIONS}
+.if !${OPTIONS_DEFINE:M${opt}}
+PLIST_SUB+=     ${opt}="@comment "
+.endif
+.endfor
+
+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}.|g' \
+	    ${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}/llvm/CMakeLists.txt
+
+post-patch-CLANG-on:
+	${REINPLACE_CMD} -e 's|%%LLVM_PREFIX%%|${LLVM_PREFIX}|' \
+	    ${WRKSRC}/clang/lib/Driver/ToolChains/CommonArgs.cpp
+	${REINPLACE_CMD} -e 's|%%LLVM_SUFFIX%%|${LLVM_SUFFIX}|' \
+	    ${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']|" \
+		${WRKSRC}/lld/docs/conf.py
+
+post-install:
+	${RM} -r ${STAGEDIR}${LLVM_PREFIX}/include/llvm/MC/MCAnalysis
+	${INSTALL_SCRIPT} ${WRKDIR}/llvm-wrapper.sh \
+	    ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX}
+.for command in ${COMMANDS:C/^/XXXX/1:NXXXX*}
+	${LN} -f ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX} \
+	    ${STAGEDIR}${PREFIX}/bin/${command}${LLVM_SUFFIX}
+.endfor
+
+post-install-DOCS-on:
+	${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
+.endfor
+.if ! ${PORT_OPTIONS:MLIT}
+	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/lit.1
+	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/FileCheck.1
+.endif
+	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/
+	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/
+
+.if ${PORT_OPTIONS:MCLANG}
+post-install-DOCS-off:
+	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/scan-build.1
+	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/
+	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/
+.endif
+
+post-install-CLANG-on:
+	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/clang \
+	   ${STAGEDIR}${LLVM_PREFIX}/bin/clang-cpp
+	${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/clang-tblgen \
+	    ${STAGEDIR}${LLVM_PREFIX}/bin/
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/toolchains/
+	${INSTALL_DATA} ${WRKDIR}/xtoolchain.mk \
+	    ${STAGEDIR}${PREFIX}/share/toolchains/llvm${LLVM_SUFFIX}.mk
+
+post-install-LIT-on:
+	${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
+	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \
+	    ${STAGEDIR}${PREFIX}/bin/lit${LLVM_SUFFIX}
+	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \
+	    ${STAGEDIR}${PREFIX}/bin/llvm-lit${LLVM_SUFFIX}
+	${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}/llvm/utils/lit/lit/*.py \
+	    ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}
+	${INSTALL_DATA} ${WRKSRC}/llvm/utils/lit/lit/builtin_commands/*.py \
+			${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}/builtin_commands
+	${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/
+	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/FileCheck \
+	    ${STAGEDIR}${PREFIX}/bin/FileCheck${LLVM_SUFFIX}
+
+post-install-LLD-on:
+	${LN} -s ld.lld ${STAGEDIR}${LLVM_PREFIX}/bin/ld
+
+TEST_CMD=	'(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ${MAKE_CMD} check-local-lit)'
+do-test:
+	if [ `${ID} -u` = 0 ]; then \
+		${CHOWN} -R nobody ${WRKSRC}/test; \
+		su -m nobody -c ${TEST_CMD}; \
+	else \
+		${SH} -c ${TEST_CMD}; \
+	fi
+
+build-plist:
+	${RM} ${PLIST} ${PLIST}.tmp
+	${ECHO_CMD} "@comment >>>>> GENERATED FILE, DO NOT EDIT <<<<<" >> ${PLIST}.tmp
+	${ECHO_CMD} "@comment Alter build-plist target and regenerate as required" >> ${PLIST}.tmp
+.for command in ${COMMANDS}
+	${ECHO_CMD} bin/${command}%%LLVM_SUFFIX%% >> ${PLIST}.tmp
+.endfor
+.for command in ${LIT_COMMANDS}
+	${ECHO_CMD} %%LIT%%bin/${command}%%LLVM_SUFFIX%% >> ${PLIST}.tmp
+	${ECHO_CMD} %%LIT%%${LLVM_PREFIX:S|${PREFIX}/||:C|${LLVM_SUFFIX}|%%LLVM_SUFFIX%%|}/bin/${command} >> ${PLIST}.tmp
+.endfor
+
+	${FIND} ${STAGEDIR}${LLVM_PREFIX} -type f -o -type l | \
+	    ${GREP} -v '_blacklist.txt$$' | \
+	    ${GREP} -v '[/-]lit$$' | ${GREP} -v 'FileCheck$$' | \
+	    ${GREP} -v man/man1 | ${SED} -e 's|${STAGEDIR}${PREFIX}/||' \
+	    -e 's|${PYTHON_SITELIBDIR:C|${PREFIX}/||}|%%PYTHON_SITELIBDIR%%|' \
+	    -e 's|${LLVM_RELEASE}|%%LLVM_RELEASE%%|' \
+	    -e 's|release.cmake|%%CMAKE_BUILD_TYPE%%.cmake|' \
+	    -e 's|${LLVM_RELEASE:C/\./\\./g}|%%LLVM_RELEASE%%|' \
+	    -e 's|${LLVM_SUFFIX:C/\./\\./g}|%%LLVM_SUFFIX%%|' \
+	    -e 's|\([^0-9]\)${LLVM_MAJOR}$$|\1%%LLVM_MAJOR%%|' \
+	    -e 's|\([^0-9]\)${LLVM_MAJOR}\([^0-9]\)|\1%%LLVM_MAJOR%%\2|' \
+	    | ${SORT} >> ${PLIST}.tmp
+	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/lit${LLVM_SUFFIX} -type f | \
+	    ${SED} -e 's|${STAGEDIR}${PYTHON_SITELIBDIR}|%%LIT%%%%PYTHON_SITELIBDIR%%|' \
+	    -e 's|${LLVM_RELEASE:C/\./\\./g}|%%LLVM_RELEASE%%|' \
+	    -e 's|${LLVM_SUFFIX:C/\./\\./g}|%%LLVM_SUFFIX%%|' \
+	    -e 's|\([^0-9]\)${LLVM_MAJOR}$$|\1%%LLVM_MAJOR%%|' \
+	    -e 's|\([^0-9]\)${LLVM_MAJOR}\([^0-9]\)|\1%%LLVM_MAJOR%%\2|' \
+	    | ${SORT} >> ${PLIST}.tmp
+	${AWK} '{ \
+	    if ($$0 ~ /${CLANG_PATTERN}/ && $$0 !~ /(${OPENMP_PATTERN}|${EXTRAS_PATTERN}|libclang_rt|${PYCLANG_PATTERN})/) {printf "%%%%CLANG%%%%"} \
+	    if ($$0 ~ /${COMPILER_RT_PATTERN}/) \
+		{printf "%%%%COMPILER_RT%%%%"} \
+	    if ($$0 ~ /(${EXTRAS_PATTERN})/) {printf "%%%%EXTRAS%%%%"} \
+	    if ($$0 ~ /(bin\/(ld|lld|wasm-ld))|liblld[^b]|\/lld\// && $$0 !~ /(lldb)/) {printf "%%%%LLD%%%%"} \
+	    if ($$0 ~ /(argdumper|lldb|six.py)/) {printf "%%%%LLDB%%%%"} \
+	    if ($$0 ~ /(${OPENMP_PATTERN})/) {printf "%%%%OPENMP%%%%"} \
+	    if ($$0 ~ /(LLVMgold)/) {printf "%%%%GOLD%%%%"} \
+	    if ($$0 ~ /${PYCLANG_PATTERN}/) {printf "%%%%PYCLANG%%%%"} \
+	    if ($$0 !~ /(libclang_rt)/ && $$0 !~ /(${BE_PATTERN})$$/) {print}}' ${PLIST}.tmp >> ${PLIST}
+	${ECHO_CMD} '@postexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi' >> ${PLIST}
+	${ECHO_CMD} '@postunexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi' >> ${PLIST}
+	${RM} ${PLIST}.tmp
+
+check-commands:
+.for command in ${COMMANDS}
+	test -e ${STAGEDIR}${LLVM_PREFIX}/bin/${command}
+.endfor
+
+.include <bsd.port.post.mk>
diff --git a/devel/llvm13/Makefile.COMMANDS b/devel/llvm13/Makefile.COMMANDS
new file mode 100644
index 000000000000..d924b43939f2
--- /dev/null
+++ b/devel/llvm13/Makefile.COMMANDS
@@ -0,0 +1,112 @@
+LLVM_COMMANDS=	\
+		bugpoint \
+		dsymutil \
+		llc \
+		lli \
+		llvm-addr2line \
+		llvm-ar \
+		llvm-as \
+		llvm-bcanalyzer \
+		llvm-bitcode-strip \
+		llvm-cat \
+		llvm-cfi-verify \
+		llvm-config \
+		llvm-cov \
+		llvm-cvtres \
+		llvm-cxxmap \
+		llvm-diff \
+		llvm-dis \
+		llvm-dlltool \
+		llvm-dwarfdump \
+		llvm-dwp \
+		llvm-elfabi \
+		llvm-exegesis \
+		llvm-extract \
+		llvm-gsymutil \
+		llvm-ifs \
+		llvm-install-name-tool \
+		llvm-jitlink \
+		llvm-libtool-darwin \
+		llvm-link \
+		llvm-lipo \
+		llvm-mc \
+		llvm-mca \
+		llvm-ml \
+		llvm-modextract \
+		llvm-mt \
+		llvm-nm \
+		llvm-objcopy \
+		llvm-objdump \
+		llvm-opt-report \
+		llvm-pdbutil \
+		llvm-profdata \
+		llvm-profgen \
+		llvm-ranlib \
+		llvm-rc \
+		llvm-readelf \
+		llvm-readobj \
+		llvm-reduce \
+		llvm-rtdyld \
+		llvm-size \
+		llvm-split \
+		llvm-stress \
+		llvm-strings \
+		llvm-strip \
+		llvm-symbolizer \
+		llvm-tblgen \
+		llvm-undname \
+		llvm-xray \
+		opt \
+		sancov \
+		split-file
+
+CLANG_COMMANDS=	\
+		c-index-test \
+		clang \
+		clang++ \
+		clang-check \
+		clang-cpp \
+		clang-extdef-mapping \
+		clang-format \
+		clang-offload-bundler \
+		clang-offload-wrapper \
+		clang-rename \
+		clang-scan-deps \
+		diagtool \
+		hmaptool \
+		scan-build \
+		scan-view
+
+EXTRAS_COMMANDS= \
+		clangd \
+		clang-apply-replacements \
+		clang-change-namespace \
+		clang-doc \
+		clang-include-fixer \
+		clang-move \
+		clang-query \
+		clang-reorder-fields \
+		clang-tidy \
+		find-all-symbols \
+		modularize \
+		pp-trace
+
+LIT_COMMANDS=	\
+		FileCheck \
+		lit \
+		llvm-lit
+
+LLD_COMMANDS=	\
+		ld.lld \
+		ld64.lld \
+		ld64.lld.darwinnew \
+		lld \
+		lld-link \
+		wasm-ld
+
+LLDB_COMMANDS=	\
+		lldb \
+		lldb-argdumper \
+		lldb-instr \
+		lldb-server \
+		lldb-vscode
diff --git a/devel/llvm13/distinfo b/devel/llvm13/distinfo
new file mode 100644
index 000000000000..0c1d92850e85
--- /dev/null
+++ b/devel/llvm13/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1626371873
+SHA256 (llvm-project-12.0.1.src.tar.xz) = 129cb25cd13677aad951ce5c2deb0fe4afc1e9d98950f53b51bdcfb5a73afa0e
+SIZE (llvm-project-12.0.1.src.tar.xz) = 90910004
diff --git a/devel/llvm13/files/extra-patch-clang_lib_Driver_ToolChains_Clang.cpp b/devel/llvm13/files/extra-patch-clang_lib_Driver_ToolChains_Clang.cpp
new file mode 100644
index 000000000000..37304e59f444
--- /dev/null
+++ b/devel/llvm13/files/extra-patch-clang_lib_Driver_ToolChains_Clang.cpp
@@ -0,0 +1,12 @@
+--- clang/lib/Driver/ToolChains/Clang.cpp.orig	2021-08-11 19:51:00.122735000 +0200
++++ clang/lib/Driver/ToolChains/Clang.cpp	2021-08-11 19:51:24.346107000 +0200
+@@ -1921,8 +1921,7 @@
+   if (T.isOSBinFormatELF()) {
+     switch (getToolChain().getArch()) {
+     case llvm::Triple::ppc64: {
+-      if ((T.isOSFreeBSD() && T.getOSMajorVersion() >= 13) ||
+-          T.isOSOpenBSD() || T.isMusl())
++      if (T.isOSFreeBSD() || T.isOSOpenBSD() || T.isMusl())
+         ABIName = "elfv2";
+       else
+         ABIName = "elfv1";
diff --git a/devel/llvm13/files/llvm-wrapper.sh.in b/devel/llvm13/files/llvm-wrapper.sh.in
new file mode 100644
index 000000000000..096e483c32a0
--- /dev/null
+++ b/devel/llvm13/files/llvm-wrapper.sh.in
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+LLVM_PREFIX="%%LLVM_PREFIX%%"
+LLVM_SUFFIX="%%LLVM_SUFFIX%%"
+
+tool=$0
+[ -L "$tool" ] && tool=$(/bin/realpath $tool)
+tool=${tool##*/}
+tool="${LLVM_PREFIX}/bin/${tool%${LLVM_SUFFIX}}"
+LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+${LD_LIBRARY_PATH}:}${LLVM_PREFIX}/lib" \
+    exec "${tool}" "${@}"
diff --git a/devel/llvm13/files/patch-D77776 b/devel/llvm13/files/patch-D77776
new file mode 100644
index 000000000000..2b776ed06315
--- /dev/null
+++ b/devel/llvm13/files/patch-D77776
@@ -0,0 +1,20 @@
+[Driver] Default to libc++ on FreeBSD
+
+Downstream may naively translate between DSL and LLVM target
+triple. If OS version is lost in the process then Clang would
+default to a version that's no longer supported by OS vendor.
+
+https://reviews.llvm.org/D77776
+
+--- 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 &
+ }
+ 
+ ToolChain::CXXStdlibType FreeBSD::GetDefaultCXXStdlibType() const {
+-  if (getTriple().getOSMajorVersion() >= 10)
++  unsigned Major = getTriple().getOSMajorVersion();
++  if (Major >= 10 || Major == 0)
+     return ToolChain::CST_Libcxx;
+   return ToolChain::CST_Libstdcxx;
+ }
diff --git a/devel/llvm13/files/patch-clang_lib_Driver_ToolChains_FreeBSD.cpp b/devel/llvm13/files/patch-clang_lib_Driver_ToolChains_FreeBSD.cpp
new file mode 100644
index 000000000000..4c13ad977b21
--- /dev/null
+++ b/devel/llvm13/files/patch-clang_lib_Driver_ToolChains_FreeBSD.cpp
@@ -0,0 +1,33 @@
+[Driver] Default to libc++ on FreeBSD
+
+Downstream may naively translate between DSL and LLVM target
+triple. If OS version is lost in the process then Clang would
+default to a version that's no longer supported by OS vendor.
+
+https://reviews.llvm.org/D77776
+
+--- clang/lib/Driver/ToolChains/FreeBSD.cpp.orig	2021-06-28 16:23:38 UTC
++++ clang/lib/Driver/ToolChains/FreeBSD.cpp
+@@ -466,6 +466,7 @@ bool FreeBSD::IsUnwindTablesDefault(const ArgList &Arg
+ bool FreeBSD::isPIEDefault() const { return getSanitizerArgs().requiresPIE(); }
+ 
+ SanitizerMask FreeBSD::getSupportedSanitizers() const {
++  const bool IsAArch64 = getTriple().getArch() == llvm::Triple::aarch64;
+   const bool IsX86 = getTriple().getArch() == llvm::Triple::x86;
+   const bool IsX86_64 = getTriple().getArch() == llvm::Triple::x86_64;
+   const bool IsMIPS64 = getTriple().isMIPS64();
+@@ -484,8 +485,13 @@ SanitizerMask FreeBSD::getSupportedSanitizers() const 
+     Res |= SanitizerKind::Fuzzer;
+     Res |= SanitizerKind::FuzzerNoLink;
+   }
+-  if (IsX86_64)
++  if (IsAArch64 || IsX86_64) {
++    Res |= SanitizerKind::KernelAddress;
++    Res |= SanitizerKind::KernelMemory;
++  }
++  if (IsX86_64) {
+     Res |= SanitizerKind::Memory;
++  }
+   return Res;
+ }
+ 
diff --git a/devel/llvm13/files/patch-clang_lib_Headers_CMakeLists.txt b/devel/llvm13/files/patch-clang_lib_Headers_CMakeLists.txt
new file mode 100644
index 000000000000..bee363da7431
--- /dev/null
+++ b/devel/llvm13/files/patch-clang_lib_Headers_CMakeLists.txt
@@ -0,0 +1,32 @@
+--- 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
+@@ -102,13 +101,7 @@
+   s390intrin.h
+   shaintrin.h
+   smmintrin.h
+-  stdalign.h
+-  stdarg.h
+-  stdatomic.h
+-  stdbool.h
+-  stddef.h
+   __stddef_max_align_t.h
+-  stdint.h
+   stdnoreturn.h
+   tbmintrin.h
+   tgmath.h
+@@ -118,7 +111,6 @@
+   unwind.h
+   vadefs.h
+   vaesintrin.h
+-  varargs.h
+   vecintrin.h
+   vpclmulqdqintrin.h
+   waitpkgintrin.h
diff --git a/devel/llvm13/files/patch-clang_test_Driver_fsanitize.c b/devel/llvm13/files/patch-clang_test_Driver_fsanitize.c
new file mode 100644
index 000000000000..0c616740ceca
--- /dev/null
+++ b/devel/llvm13/files/patch-clang_test_Driver_fsanitize.c
@@ -0,0 +1,16 @@
+--- clang/test/Driver/fsanitize.c.orig	2021-06-28 16:23:38 UTC
++++ clang/test/Driver/fsanitize.c
+@@ -689,7 +689,13 @@
+ // RUN: %clang -target x86_64-unknown-cloudabi -fsanitize=safe-stack %s -### 2>&1 | FileCheck %s -check-prefix=SAFESTACK-CLOUDABI
+ // SAFESTACK-CLOUDABI: "-fsanitize=safe-stack"
+ 
++// RUN: %clang -target x86_64--freebsd -fsanitize=kernel-address %s -### 2>&1 | FileCheck %s -check-prefix=KERNEL-ADDRESS-FREEBSD
++// RUN: %clang -target aarch64--freebsd -fsanitize=kernel-address %s -### 2>&1 | FileCheck %s -check-prefix=KERNEL-ADDRESS-FREEBSD
++// KERNEL-ADDRESS-FREEBSD: "-fsanitize=kernel-address"
+ 
++// RUN: %clang -target x86_64--freebsd -fsanitize=kernel-memory %s -### 2>&1 | FileCheck %s -check-prefix=KERNEL-MEMORY-FREEBSD
++// RUN: %clang -target aarch64--freebsd -fsanitize=kernel-memory %s -### 2>&1 | FileCheck %s -check-prefix=KERNEL-MEMORY-FREEBSD
++// KERNEL-MEMORY-FREEBSD: "-fsanitize=kernel-memory"
+ 
+ // * NetBSD; please keep ordered as in Sanitizers.def *
+ 
diff --git a/devel/llvm13/files/patch-clang_tools_clang-format_clang-format-sublime.py b/devel/llvm13/files/patch-clang_tools_clang-format_clang-format-sublime.py
new file mode 100644
index 000000000000..4be5f233bfd5
--- /dev/null
+++ b/devel/llvm13/files/patch-clang_tools_clang-format_clang-format-sublime.py
@@ -0,0 +1,11 @@
+--- clang/tools/clang-format/clang-format-sublime.py.orig
++++ clang/tools/clang-format/clang-format-sublime.py
+@@ -18,7 +18,7 @@
+ import subprocess
+ 
+ # Change this to the full path if clang-format is not on the path.
+-binary = 'clang-format'
++binary = 'clang-format%%LLVM_SUFFIX%%'
+ 
+ # Change this to format according to other formatting styles. See the output of
+ # 'clang-format --help' for a list of supported styles. The default looks for
diff --git a/devel/llvm13/files/patch-clang_tools_clang-format_clang-format.py b/devel/llvm13/files/patch-clang_tools_clang-format_clang-format.py
new file mode 100644
index 000000000000..b002166e0a24
--- /dev/null
+++ b/devel/llvm13/files/patch-clang_tools_clang-format_clang-format.py
@@ -0,0 +1,11 @@
+--- 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
+ # Change this to the full path if clang-format is not on the path.
+-binary = 'clang-format'
++binary = 'clang-format%%LLVM_SUFFIX%%'
+ if vim.eval('exists("g:clang_format_path")') == "1":
+   binary = vim.eval('g:clang_format_path')
+ 
diff --git a/devel/llvm13/files/patch-clang_tools_clang-format_git-clang-format b/devel/llvm13/files/patch-clang_tools_clang-format_git-clang-format
new file mode 100644
index 000000000000..b48a644a1775
--- /dev/null
+++ b/devel/llvm13/files/patch-clang_tools_clang-format_git-clang-format
@@ -0,0 +1,29 @@
+--- clang/tools/clang-format/git-clang-format.orig
++++ clang/tools/clang-format/git-clang-format
+@@ -90,7 +90,7 @@
*** 4348 LINES SKIPPED ***


More information about the dev-commits-ports-main mailing list