From 60bb8f6c16f856e4bd4f843ea5e6745a3a70a870 Mon Sep 17 00:00:00 2001
From: Brooks Davis <brooks@one-eyed-alien.net>
Date: Sat, 1 Mar 2025 00:04:15 +0000
Subject: [PATCH] s/__CHERI__/__has_feature(capabilities)/

I hope to change the compiler to make __CHERI__ a synonym for
__CHERI_PURE_CAPABILITY__ to reflect the desired default programming
model.  This backwards compatible change facilitates that effort.
---
 .../tests/cheri/abi-mismatch/basic_hybrid_lib/basic.c      | 7 ++-----
 .../tests/cheri/abi-mismatch/basic_purecap_lib/basic.c     | 5 +++--
 tools/tools/syscall_timing/syscall_timing.c                | 2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/libexec/rtld-elf/tests/cheri/abi-mismatch/basic_hybrid_lib/basic.c b/libexec/rtld-elf/tests/cheri/abi-mismatch/basic_hybrid_lib/basic.c
index cd095e3550f8..dd194493c22f 100644
--- a/libexec/rtld-elf/tests/cheri/abi-mismatch/basic_hybrid_lib/basic.c
+++ b/libexec/rtld-elf/tests/cheri/abi-mismatch/basic_hybrid_lib/basic.c
@@ -29,12 +29,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-#if !__has_feature(capabilities)
-#error "This should support capabilities"
-#endif
 
-#ifndef __CHERI__
-#error Must be a hybrid library
+#if !__has_feature(capabilities)
+#error The compiler must support capabilities
 #endif
 #ifdef __CHERI_PURE_CAPABILITY__
 #error Must be a hybrid library
diff --git a/libexec/rtld-elf/tests/cheri/abi-mismatch/basic_purecap_lib/basic.c b/libexec/rtld-elf/tests/cheri/abi-mismatch/basic_purecap_lib/basic.c
index ee44e8069beb..b93e7951aed8 100644
--- a/libexec/rtld-elf/tests/cheri/abi-mismatch/basic_purecap_lib/basic.c
+++ b/libexec/rtld-elf/tests/cheri/abi-mismatch/basic_purecap_lib/basic.c
@@ -29,8 +29,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-#ifndef __CHERI__
-#error Must be a purecap library
+
+#if !__has_feature(capabilities)
+#error The compiler must support capabilities
 #endif
 #ifndef __CHERI_PURE_CAPABILITY__
 #error Must be a purecap library
diff --git a/tools/tools/syscall_timing/syscall_timing.c b/tools/tools/syscall_timing/syscall_timing.c
index ba16443c8c56..b23dc3182063 100644
--- a/tools/tools/syscall_timing/syscall_timing.c
+++ b/tools/tools/syscall_timing/syscall_timing.c
@@ -37,7 +37,7 @@
 #include <sys/time.h>
 #include <sys/wait.h>
 
-#ifdef __CHERI__
+#if __has_feature(capabilities)
 #include <cheri/cheri.h>
 #endif