From 32f3e8fee587f3fcde578c7a0f46a05f103596fd Mon Sep 17 00:00:00 2001
From: Owen Anderson <resistor@mac.com>
Date: Tue, 19 Aug 2025 23:47:19 +0800
Subject: [PATCH] [CHERIoT] Make XCheriot imply the other features it depends
 on.

---
 llvm/lib/Target/RISCV/RISCVFeatures.td | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/llvm/lib/Target/RISCV/RISCVFeatures.td b/llvm/lib/Target/RISCV/RISCVFeatures.td
index 5bd2bb03e6bba..7d1d34b101b86 100644
--- a/llvm/lib/Target/RISCV/RISCVFeatures.td
+++ b/llvm/lib/Target/RISCV/RISCVFeatures.td
@@ -1384,7 +1384,9 @@ def NotPureCapABI
     : Predicate<"!RISCVABI::isCheriPureCapABI(Subtarget->getTargetABI())">;
 
 def FeatureVendorXCheriot
-    : RISCVExtension<1, 0, "Implements XCheriot extension">;
+    : RISCVExtension<1, 0, "Implements XCheriot extension",
+    [FeatureVendorXCheri, FeatureVendorXCheriPureCap, 
+     FeatureStdExtC, FeatureStdExtE, FeatureStdExtM]>;
 
 def HasCheriot
     : Predicate<"Subtarget->hasVendorXCheriot()">,