From 2b4188a080b3c3de38c03d66af16b6523644192e Mon Sep 17 00:00:00 2001
From: Brooks Davis <brooks@one-eyed-alien.net>
Date: Fri, 21 Jul 2023 23:47:42 +0100
Subject: [PATCH] Remove the WITH(OUT)_CHERI option

It only gates code already gated by appropriate CPU and ABI flags
and these small programs aren't things we're going to want to turn
off any time soon.
---
 share/mk/src.opts.mk              | 2 --
 tools/build/options/WITHOUT_CHERI | 2 --
 tools/build/options/WITH_CHERI    | 3 ---
 3 files changed, 7 deletions(-)
 delete mode 100644 tools/build/options/WITHOUT_CHERI
 delete mode 100644 tools/build/options/WITH_CHERI

diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index 619986e2680e..a9c9309b5bae 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -213,7 +213,6 @@ __DEFAULT_NO_OPTIONS = \
     ZONEINFO_LEAPSECONDS_SUPPORT \
 
 __DEFAULT_YES_OPTIONS+=	\
-	CHERI \
 	CHERI_CAPREVOKE \
 	CHERIBSDBOX \
 	LIB64C
@@ -375,7 +374,6 @@ BROKEN_OPTIONS+=MLX5TOOL
 
 .if (${__C} != "cheri" && ${__C} != "morello" && \
     !${__T:Maarch64*c*} && !${__T:Mriscv64*c*})
-BROKEN_OPTIONS+=CHERI
 BROKEN_OPTIONS+=CHERI_CAPREVOKE
 .endif
 
diff --git a/tools/build/options/WITHOUT_CHERI b/tools/build/options/WITHOUT_CHERI
deleted file mode 100644
index d8e8b980ba26..000000000000
--- a/tools/build/options/WITHOUT_CHERI
+++ /dev/null
@@ -1,2 +0,0 @@
-.\" $FreeBSD$
-Set to not build software requiring CHERI capability support.
diff --git a/tools/build/options/WITH_CHERI b/tools/build/options/WITH_CHERI
deleted file mode 100644
index 08a10de2aaaf..000000000000
--- a/tools/build/options/WITH_CHERI
+++ /dev/null
@@ -1,3 +0,0 @@
-.\" $FreeBSD$
-Set to build software requiring CHERI capability support.
-This currently only makes sense on mips64 systems.