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.
CTSRD-CHERI · Jul 22, 2023 · 2b4188a · 2b4188a
1 parent 50dfbb8
commit 2b4188a
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 7 deletions.
diff --git 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
diff --git a/tools/build/options/WITH_CHERI b/tools/build/options/WITH_CHERI