1 files changed, 133 insertions, 5 deletions
diff --git a/devel/llvm-cheriot/Makefile.COMMANDS b/devel/llvm-cheriot/Makefile.COMMANDS
index 3bc73fb92cda..fc5f93ab75f7 100644
--- a/devel/llvm-cheriot/Makefile.COMMANDS
+++ b/devel/llvm-cheriot/Makefile.COMMANDS
@@ -1,7 +1,135 @@
-.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-cgdata \
+		llvm-config \
+		llvm-cov \
+		llvm-ctxprof-util \
+		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 \
+		reduce-chunk-list \
+		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-installapi \
+		clang-linker-wrapper \
+		clang-nvlink-wrapper \
+		clang-offload-bundler \
+		clang-offload-packager \
+		clang-repl \
+		clang-scan-deps \
+		clang-sycl-linker \
+		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-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