git: a19a05201688 - main - devel/llvm-cheriot: break up with devel/llvm-cheri

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Brooks Davis <brooks_at_FreeBSD.org>
Date: Mon, 12 May 2025 03:20:27 UTC
The branch main has been updated by brooks:

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

commit a19a05201688465386ea225544807a9e6a8c9063
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2025-05-11 23:59:50 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2025-05-12 03:20:11 +0000

    devel/llvm-cheriot: break up with devel/llvm-cheri
    
    There isn't enough commonality between llvm-cheri and llvm-cheriot due
    to increasing version skew so give llvm-cheriot it's own Makefile.
    
    No functional change intended.  Port version bumped due to WWW change.
    Update to the latest version to follow immediately.
---
 devel/llvm-cheriot/Makefile                        | 325 ++++++++++++++++++++-
 devel/llvm-cheriot/Makefile.COMMANDS               | 134 ++++++++-
 devel/llvm-cheriot/Makefile.MAN1SRCS               |  68 ++++-
 .../files/wrapper-cheriot.sh.in                    |   0
 4 files changed, 507 insertions(+), 20 deletions(-)

diff --git a/devel/llvm-cheriot/Makefile b/devel/llvm-cheriot/Makefile
index d22112cd23b5..e80416639fe4 100644
--- a/devel/llvm-cheriot/Makefile
+++ b/devel/llvm-cheriot/Makefile
@@ -1,24 +1,323 @@
-# llvm-cheriot
 
-LLVM_SUFFIX=	-cheriot
+PORTNAME=	llvm
+PORTVERSION=	${LLVM_MAJOR}.0.d${SNAPDATE}
+PORTREVISION=	2
+CATEGORIES=	devel lang
+PKGNAMESUFFIX=	${LLVM_SUFFIX}
 
+MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	LLVM and Clang with support the CHERIoT microcontroller
-WWW=		https://www.microsoft.com/en-us/research/publication/cheriot-rethinking-security-for-low-cost-embedded-systems/
+WWW=		https://cheriot.org
 
-DISTINFO_FILE=	${.CURDIR}/distinfo
-DESCR=		${.CURDIR}/pkg-descr
-PLIST=		${.CURDIR}/pkg-plist
+.include "${.PARSEDIR}/../llvm-devel/Makefile.LICENSE"
 
-GH_ACCOUNT=	CHERIoT-Platform
+NOT_FOR_ARCHS=		i386 armv6 armv7 powerpc mips
+NOT_FOR_ARCHS_REASON=	No one will develop CHERI from 32-bit
+
+LLVM_SUFFIX=	-cheriot
+LLVM_DIR=	llvm${LLVM_SUFFIX}
+LLVM_PREFIX=	${PREFIX}/llvm${LLVM_SUFFIX}
+COMMAND_SUFFIX=	${LLVM_SUFFIX}
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX}
+DATADIR=	${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX}
+
+USES=		cmake compiler:c++17-lang cpe shebangfix
+USE_LDCONFIG=	${LLVM_PREFIX}/lib
+SHEBANG_FILES=	\
+		clang/tools/clang-format/git-clang-format \
+		clang/tools/clang-format/clang-format-diff.py \
+		clang/tools/scan-build-py/bin/analyze-build \
+		clang/tools/scan-build-py/bin/intercept-build \
+		clang/tools/scan-build-py/bin/scan-build \
+		clang/tools/scan-build-py/libexec/analyze-cc \
+		clang/tools/scan-build-py/libexec/analyze-c++ \
+		clang/tools/scan-build-py/libexec/intercept-cc \
+		clang/tools/scan-build-py/libexec/intercept-c++ \
+		clang/tools/scan-view/bin/scan-view \
+		clang/utils/hmaptool/hmaptool \
+		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 \
+		llvm/utils/lit/lit.py \
+		llvm/utils/llvm-lit/llvm-lit.in
 
-OPTIONS_EXCLUDE=	XTOOLCHAIN STATIC_LIBS
+WRAPPER=	wrapper-cheriot.sh
+SUB_FILES+=	${WRAPPER}
+SUB_LIST+=	\
+		CONFIGURE_TARGET="${CONFIGURE_TARGET}" \
+		LLVM_PREFIX="${LLVM_PREFIX}" \
+		LLVM_SUFFIX="${LLVM_SUFFIX}"
 
-LLVM_TARGETS=          RISCV
+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_PARALLEL_LINK_JOBS=1
+CMAKE_ARGS+=	-DLLVM_ENABLE_Z3_SOLVER=OFF
+CMAKE_ARGS+=	-DLLVM_ENABLE_LIBXML2=OFF
+CMAKE_ARGS+=	-DLLVM_ENABLE_LIBEDIT=OFF
+CMAKE_ARGS+=	-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS}"
 CMAKE_FLAGS+=	-DLLVM_DEFAULT_TARGET_TRIPLE=riscv32-unknown-unknown
 
-DOCS_BUILD_DEPENDS= \
-	${PYTHON_PKGNAMEPREFIX}myst-parser>0:textproc/py-myst-parser@${PY_FLAVOR}
+.ifndef USE_GITLAB
+USE_GITHUB=	yes
+GH_PROJECT?=	llvm-project
+GH_ACCOUNT=	CHERIoT-Platform
+GH_TAGNAME=	${LLVM_COMMIT}
+.endif
+
+.include "${.CURDIR}/Makefile.snapshot"
+
+OPTIONS_DEFINE=	CLANG DOCS EXTRAS LIT LLD
+OPTIONS_DEFAULT=	CLANG EXTRAS LIT LLD
+OPTIONS_SUB=	yes
+
+CLANG_DESC=		Build clang
+CLANG_PORTDOCS=		clang
+CLANG_USES=		perl5
+# scan-build does require, but users can install it manually.
+CLANG_USE=		PERL5=build
+DOCS_BUILD_DEPENDS+= \
+	${PYTHON_PKGNAMEPREFIX}myst-parser>0:textproc/py-myst-parser@${PY_FLAVOR} \
+	${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR} \
+	${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR}
+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|^|share/man/man1/|:S|.1$|${LLVM_SUFFIX}.1.gz|}
+DOCS_PORTDOCS=		llvm
+EXTRAS_DESC=		Extra clang tools
+EXTRAS_IMPLIES=		CLANG
+EXTRAS_PLIST_DIRS=	${LLVM_DIR}/include/clang-tidy/plugin
+LIT_DESC=		Install lit and FileCheck test tools
+LIT_MOD_NAME=		lit${LLVM_SUFFIX:S/-/_/g}
+LIT_PLIST_SUB=		LIT_MOD_NAME=${LIT_MOD_NAME}
+LLD_DESC=		Install lld linker
+LLD_PORTDOCS=		lld
+LLDB_DESC=		Install lldb, the LLVM debugger
+LLDB_BUILD_DEPENDS=	swig:devel/swig
+
+LLVM_TARGETS=		RISCV
+
+PLIST_SUB+=	COMMAND_SUFFIX=${COMMAND_SUFFIX} \
+		LLVM_MAJOR=${LLVM_MAJOR} \
+		LLVM_RELEASE=${LLVM_RELEASE} \
+		LLVM_SUFFIX=${LLVM_SUFFIX}
+
+COMMANDS=	${LLVM_COMMANDS}
+FIRST_COMMAND=	${COMMANDS:C/^/XXXX/1:MXXXX*:C/^XXXX//}
+
+MAN1SRCS+=	${LLVM_MAN1SRCS}
+
+STRIP_LIBS=	BugpointPasses.so \
+		LLVMHello.so \
+		${LIBNAME}.0 \
+		libLTO.so
+
+EXTRAS_LIBS=	libclangApplyReplacements \
+		libclangChangeNamespace \
+		libclangDaemon \
+		libclangDoc \
+		libclangIncludeCleaner \
+		libclangIncludeFixer \
+		libclangMove \
+		libclangPseudo \
+		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>
+
+# keep in sync with /usr/src/lib/clang/clang.build.mk
+CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/:C/armv6hf/armv6/}-portbld-${OPSYS:tl}${OSREL}
+
+.if ${PORT_OPTIONS:MCLANG}
+LLVM_ENABLE_PROJECTS+=	clang
+COMMANDS+=	${CLANG_COMMANDS}
+MAN1SRCS+=	${CLANG_MAN1SRCS}
+CLANG_PATTERN=	(c-index-test|clang|diagtool|hmaptool|intercept-|libear|libscanbuild|analyze-|scan-|Reporter.py|ScanView.py|scanview.css|sorttable.js|startfile.py|c..-analyzer|AnalyzerPlugin.so)
+USES+=		gnome
+.endif
+
+.if ${PORT_OPTIONS:MEXTRAS}
+LLVM_ENABLE_PROJECTS+=	clang-tools-extra
+COMMANDS+=	${EXTRAS_COMMANDS}
+MAN1SRCS+=	${EXTRAS_MAN1SRCS}
+PORTDOCS+=	clang-tools
+.endif
+
+.if ${PORT_OPTIONS:MLIT}
+MAN1SRCS+=	${LIT_MAN1SRCS}
+# lit requires python, but don't install it by default.  Users can install.
+#_USES_PYTHON=	python
+.endif
+
+.if ${PORT_OPTIONS:MLLD}
+LLVM_ENABLE_PROJECTS+=	lld
+COMMANDS+=	${LLD_COMMANDS}
+.endif
+
+.if ${PORT_OPTIONS:MLLDB}
+LLVM_ENABLE_PROJECTS+=	lldb
+COMMANDS+=	${LLDB_COMMANDS}
+MAN1SRCS+=	${LLDB_MAN1SRCS}
+_USES_PYTHON=	python
+.endif
+
+.if defined(LLVM_ENABLE_PROJECTS)
+CMAKE_ARGS+=	-DLLVM_ENABLE_PROJECTS="${LLVM_ENABLE_PROJECTS:ts;}"
+.endif
+
+_USES_PYTHON?=	python:build
+USES+=		${_USES_PYTHON}
+
+.include <bsd.port.pre.mk>
+
+.if exists(${PATCHDIR}/llvm${LLVM_MAJOR})
+EXTRA_PATCHES+=	${PATCHDIR}/llvm${LLVM_MAJOR}
+.endif
+.if ${.PARSEDIR} != ${.CURDIR} && exists(${.CURDIR}/files)
+EXTRA_PATCHES+=	${.CURDIR}/files
+.endif
+
+.include "${.CURDIR}/Makefile.COMMANDS"
+.sinclude "${.CURDIR}/Makefile.MAN1SRCS"
+
+post-patch:
+	${REINPLACE_CMD} -e 's|import lit|import ${LIT_MOD_NAME}|' \
+	    -e 's|from lit|from ${LIT_MOD_NAME}|' \
+	    -e 's|lit\.|${LIT_MOD_NAME}.|' \
+	    ${WRKSRC}/llvm/utils/lit/lit.py ${WRKSRC}/llvm/utils/lit/lit/*.py
+
+post-patch-LLD-on:
+		${REINPLACE_CMD} -e "s|'indexsidebar.html'|['indexsidebar.html']|" \
+			${PATCH_WRKSRC}/lld/docs/conf.py
+
+post-install:
+	${INSTALL_SCRIPT} ${WRKDIR}/${WRAPPER} \
+	    ${STAGEDIR}${PREFIX}/bin/${COMMAND_PREFIX}${FIRST_COMMAND}${COMMAND_SUFFIX}
+.for command in ${COMMANDS:C/^/XXXX/1:NXXXX*}
+	${LN} -f ${STAGEDIR}${PREFIX}/bin/${COMMAND_PREFIX}${FIRST_COMMAND}${COMMAND_SUFFIX} \
+	    ${STAGEDIR}${PREFIX}/bin/${COMMAND_PREFIX}${command}${COMMAND_SUFFIX}
+.endfor
+	${RM} ${STAGEDIR}${LLVM_PREFIX}/lib/lib*.a
+
+post-install-DOCS-on:
+	${RM} -r ${STAGEDIR}${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/doc/LLVM/* ${STAGEDIR}${DOCSDIR}
+	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/doc/LLVM
+	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/doc
+.for _man in ${MAN1SRCS}
+	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/${_man} \
+	    ${STAGEDIR}${PREFIX}/share/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
+#.if ${PORT_OPTIONS:MCLANG}
+#	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/scan-build.1 \
+#	    ${STAGEDIR}${PREFIX}/man/man1/scan-build${LLVM_SUFFIX}.1
+#.endif
+.if !${PORT_OPTIONS:MLLDB}
+	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/lldb-tblgen.1
+.endif
+	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/mlir-tblgen.1
+	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/
+	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/
+
+post-install-CLANG-on:
+	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/clang \
+	    ${STAGEDIR}${LLVM_PREFIX}/bin/clang-cpp
+
+post-install-EXTRAS-on:
+	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/clang-tidy/misc/ConfusableTable
+
+post-install-LIT-on:
+	${INSTALL_SCRIPT} ${PATCH_WRKSRC}/llvm/utils/lit/lit.py \
+	    ${STAGEDIR}${LLVM_PREFIX}/bin/lit
+	${LN} -sf ${STAGEDIR}${LLVM_PREFIX}/bin/lit \
+	    ${STAGEDIR}${LLVM_PREFIX}/bin/llvm-lit
+	${LN} -sf ${STAGEDIR}${LLVM_PREFIX}/bin/lit \
+	    ${STAGEDIR}${PREFIX}/bin/${COMMAND_PREFIX}lit${LLVM_SUFFIX}
+	${LN} -sf ${STAGEDIR}${LLVM_PREFIX}/bin/lit \
+	    ${STAGEDIR}${PREFIX}/bin/${COMMAND_PREFIX}llvm-lit${LLVM_SUFFIX}
+	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${LIT_MOD_NAME}
+	${INSTALL_DATA} ${WRKSRC}/llvm/utils/lit/lit/*.py \
+	    ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${LIT_MOD_NAME}
+	${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/FileCheck \
+	    ${STAGEDIR}${LLVM_PREFIX}/bin/
+	${LN} -sf ${STAGEDIR}${LLVM_PREFIX}/bin/FileCheck \
+	    ${STAGEDIR}${PREFIX}/bin/${COMMAND_PREFIX}FileCheck${COMMAND_SUFFIX}
+
+post-install-LLD-on:
+	${LN} -s ld.lld ${STAGEDIR}${LLVM_PREFIX}/bin/ld
+
+post-install-LLDB-on:
+.if ${OPSYS} != "FreeBSD" || ${CHOSEN_COMPILER_TYPE} == clang
+	${RM} ${STAGEDIR}${LLVM_PREFIX}/lib/python*/site-packages/lib
+.endif
+
+TEST_CMD=	'(cd ${WRKSRC}/llvm/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}/llvm/test; \
+		su -m nobody -c ${TEST_CMD}; \
+	else \
+		${SH} -c ${TEST_CMD}; \
+	fi
+
+build-plist:
+	${RM} ${PLIST} ${PLIST}.tmp
+.for command in ${COMMANDS}
+	${ECHO_CMD} bin/${COMMAND_PREFIX}${command}%%COMMAND_SUFFIX%% >> ${PLIST}.tmp
+.endfor
+.for command in ${LIT_COMMANDS}
+	${ECHO_CMD} %%LIT%%bin/${COMMAND_PREFIX}${command}%%COMMAND_SUFFIX%% >> ${PLIST}.tmp
+	${ECHO_CMD} %%LIT%%${LLVM_PREFIX:S|${PREFIX}/||:S|${LLVM_SUFFIX}|%%LLVM_SUFFIX%%|}/bin/${command} >> ${PLIST}.tmp
+.endfor
+	${FIND} ${STAGEDIR}${LLVM_PREFIX} -type f -o -type l | \
+	    ${GREP} -v '[/-]lit$$' | ${GREP} -v 'FileCheck$$' | \
+	    ${GREP} -v man/man1 | ${SED} -e 's|${STAGEDIR}${PREFIX}/||' \
+	    -e 's|${PORTVERSION}|%%PORTVERSION%%|' \
+	    -e 's|release.cmake|%%CMAKE_BUILD_TYPE%%.cmake|' \
+	    -e 's|${LLVM_RELEASE:C/\./\\./g}|%%LLVM_RELEASE%%|' \
+	    -e 's|${LLVM_MAJOR:C/\./\\./}|%%LLVM_MAJOR%%|' \
+	    -e 's|${LLVM_SUFFIX}|%%LLVM_SUFFIX%%|' \
+	    | ${SORT} >> ${PLIST}.tmp
+	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/${LIT_MOD_NAME} -type f | \
+	    ${SED} -e 's|${STAGEDIR}${PYTHON_SITELIBDIR}|%%LIT%%%%PYTHON_SITELIBDIR%%|' \
+	    -e 's|${LIT_MOD_NAME}|%%LIT_MOD_NAME%%|' \
+	    -e 's|${LLVM_RELEASE:C/\./\\./g}|%%LLVM_RELEASE%%|' \
+	    -e 's|${LLVM_MAJOR:C/\./\\./}|%%LLVM_MAJOR%%|' \
+	    -e 's|${LLVM_SUFFIX}|%%LLVM_SUFFIX%%|' \
+	    | ${SORT} >> ${PLIST}.tmp
+	awk '{ \
+	    if ($$0 ~ /${CLANG_PATTERN}/ && $$0 !~ /(${EXTRAS_PATTERN})/) {printf "%%%%CLANG%%%%"} \
+	    if ($$0 ~ /(${EXTRAS_PATTERN})/) {printf "%%%%EXTRAS%%%%"} \
+	    if ($$0 ~ /(bin\/(ld|lld|wasm-ld))|liblld[^b]|\/lld\// && $$0 !~ /lldb/) {printf "%%%%LLD%%%%"} \
+	    if ($$0 ~ /(argdumper|lldb)/) {printf "%%%%LLDB%%%%"} \
+	    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
 
-MASTERDIR=	${.CURDIR}/../llvm-cheri
+check-commands:
+.for command in ${COMMANDS}
+	test -e ${STAGEDIR}${LLVM_PREFIX}/bin/${command}
+.endfor
 
-.include "${MASTERDIR}/Makefile"
+.include <bsd.port.post.mk>
diff --git a/devel/llvm-cheriot/Makefile.COMMANDS b/devel/llvm-cheriot/Makefile.COMMANDS
index 3bc73fb92cda..67859e2ced67 100644
--- a/devel/llvm-cheriot/Makefile.COMMANDS
+++ b/devel/llvm-cheriot/Makefile.COMMANDS
@@ -1,7 +1,131 @@
-.include "${.CURDIR}/../llvm-cheri/Makefile.COMMANDS"
+LLVM_COMMANDS=	\
+		amdgpu-arch \
+		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-cxxdump \
+		llvm-cxxfilt \
+		llvm-cxxmap \
+		llvm-debuginfo-analyzer \
+		llvm-debuginfod \
+		llvm-debuginfod-find \
+		llvm-diff \
+		llvm-dis \
+		llvm-dlltool \
+		llvm-dwarfdump \
+		llvm-dwarfutil \
+		llvm-dwp \
+		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-otool \
+		llvm-pdbutil \
+		llvm-profdata \
+		llvm-profgen \
+		llvm-ranlib \
+		llvm-rc \
+		llvm-readelf \
+		llvm-readobj \
+		llvm-readtapi \
+		llvm-reduce \
+		llvm-remarkutil \
+		llvm-rtdyld \
+		llvm-sim \
+		llvm-size \
+		llvm-split \
+		llvm-stress \
+		llvm-strings \
+		llvm-strip \
+		llvm-symbolizer \
+		llvm-tblgen \
+		llvm-tli-checker \
+		llvm-undname \
+		llvm-windres \
+		llvm-xray \
+		nvptx-arch \
+		opt \
+		sancov
 
-# Work around version skew with llvm-cheri/llvm-morello
-LLVM_COMMANDS+= \
-	llvm-readtapi
+CLANG_COMMANDS=	\
+		analyze-build \
+		c-index-test \
+		clang \
+		clang++ \
+		clang-check \
+		clang-cpp \
+		clang-extdef-mapping \
+		clang-format \
+		clang-linker-wrapper \
+		clang-offload-bundler \
+		clang-offload-packager \
+		clang-rename \
+		clang-repl \
+		clang-scan-deps \
+		clang-tblgen \
+		diagtool \
+		hmaptool \
+		intercept-build \
+		scan-build \
+		scan-build-py \
+		scan-view
 
-LLVM_COMMANDS:=	${LLVM_COMMANDS:Nllvm-remark-size-diff:Nllvm-tapi-diff:Nsplit-file}
+EXTRAS_COMMANDS= \
+		clangd \
+		clang-apply-replacements \
+		clang-change-namespace \
+		clang-doc \
+		clang-include-fixer \
+		clang-move \
+		clang-pseudo \
+		clang-query \
+		clang-reorder-fields \
+		clang-tidy \
+		find-all-symbols \
+		modularize \
+		pp-trace \
+		run-clang-tidy
+
+LIT_COMMANDS=	\
+		FileCheck \
+		lit \
+		llvm-lit
+
+LLD_COMMANDS=	\
+		ld.lld \
+		ld64.lld \
+		lld \
+		lld-link \
+		wasm-ld
+
+LLDB_COMMANDS=	\
+		lldb \
+		lldb-argdumper \
+		lldb-instr \
+		lldb-server \
+		lldb-vscode
diff --git a/devel/llvm-cheriot/Makefile.MAN1SRCS b/devel/llvm-cheriot/Makefile.MAN1SRCS
index 9564218a3bc6..da85abfd24ba 100644
--- a/devel/llvm-cheriot/Makefile.MAN1SRCS
+++ b/devel/llvm-cheriot/Makefile.MAN1SRCS
@@ -1,3 +1,67 @@
-.include "${.PARSEDIR}/../llvm-cheri/Makefile.MAN1SRCS"
+LLVM_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-debuginfo-analyzer.1 \
+	llvm-diff.1 \
+	llvm-dis.1 \
+	llvm-dwarfdump.1 \
+	llvm-dwarfutil.1 \
+	llvm-exegesis.1 \
+	llvm-extract.1 \
+	llvm-ifs.1 \
+	llvm-install-name-tool.1 \
+	llvm-lib.1 \
+	llvm-libtool-darwin.1 \
+	llvm-link.1 \
+	llvm-lipo.1 \
+	llvm-locstats.1 \
+	llvm-mc.1 \
+	llvm-mca.1 \
+	llvm-nm.1 \
+	llvm-objcopy.1 \
+	llvm-objdump.1 \
+	llvm-opt-report.1 \
+	llvm-otool.1 \
+	llvm-pdbutil.1 \
+	llvm-profdata.1 \
+	llvm-profgen.1 \
+	llvm-ranlib.1 \
+	llvm-readelf.1 \
+	llvm-readobj.1 \
+	llvm-reduce.1 \
+	llvm-remarkutil.1 \
+	llvm-size.1 \
+	llvm-stress.1 \
+	llvm-strings.1 \
+	llvm-strip.1 \
+	llvm-symbolizer.1 \
+	llvm-tblgen.1 \
+	llvm-tli-checker.1 \
+	opt.1 \
+	tblgen.1
 
-LLVM_MAN1SRCS:=	${LLVM_MAN1SRCS:Nllvm-remark-size-diff.1}
+CLANG_MAN1SRCS= \
+	clang.1 \
+	clang-tblgen.1 \
+	diagtool.1 \
+	scan-build.1
+
+EXTRAS_MAN1SRCS= \
+	extraclangtools.1
+
+LIT_MAN1SRCS= \
+	lit.1 \
+	FileCheck.1
+
+LLDB_MAN1SRCS= \
+	lldb-tblgen.1
diff --git a/devel/llvm-cheri/files/wrapper-cheriot.sh.in b/devel/llvm-cheriot/files/wrapper-cheriot.sh.in
similarity index 100%
rename from devel/llvm-cheri/files/wrapper-cheriot.sh.in
rename to devel/llvm-cheriot/files/wrapper-cheriot.sh.in