diff --git a/clang/lib/Basic/Targets/RISCV.cpp b/clang/lib/Basic/Targets/RISCV.cpp
index 56d248da96cad..97bfe1cda4ad0 100644
--- a/clang/lib/Basic/Targets/RISCV.cpp
+++ b/clang/lib/Basic/Targets/RISCV.cpp
@@ -245,7 +245,7 @@ void RISCVTargetInfo::getTargetDefines(const LangOptions &Opts,
     }
 
     // Macros for use with the set and get permissions builtins.
-    if (getTriple().getSubArch() == llvm::Triple::RISCV32SubArch_cheriot_v1) {
+    if (ISAInfo->hasExtension("xcheriot")) {
       // Expose CHERI-compatible macros for permissions that overlap with other
       // CHERI implementations.
       Builder.defineMacro("__CHERI_CAP_PERMISSION_GLOBAL__", Twine(1 << 0));
@@ -379,6 +379,7 @@ bool RISCVTargetInfo::initFeatureMap(
 
   if (getTriple().getSubArch() == llvm::Triple::RISCV32SubArch_cheriot_v1) {
     Features["xcheri"] = true;
+    Features["xcheriot"] = true;
     Features["xcheripurecap"] = true;
     Features["c"] = true;
     Features["e"] = true;
diff --git a/clang/test/CodeGen/cheri/cheriot-struct-ret.c b/clang/test/CodeGen/cheri/cheriot-struct-ret.c
index fafeed8c299b7..facc7c320c50a 100644
--- a/clang/test/CodeGen/cheri/cheriot-struct-ret.c
+++ b/clang/test/CodeGen/cheri/cheriot-struct-ret.c
@@ -808,8 +808,3 @@ __attribute__((cheri_compartment("example"))) void CheckOnePtr () {
   // CHECK:   ret void
   return;
 }
-
-
-// CHECK: attributes #0 = { mustprogress nofree noinline norecurse nosync nounwind willreturn memory(readwrite, argmem: none, inaccessiblemem: none) "cheri-compartment"="example" "interrupt-state"="enabled" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-features"="+32bit,+c,+e,+m,+xcheri,+xcheripurecap" }
-// CHECK: attributes #1 = { mustprogress nofree noinline norecurse nosync nounwind willreturn memory(readwrite, inaccessiblemem: none) "cheri-compartment"="example" "interrupt-state"="enabled" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-features"="+32bit,+c,+e,+m,+xcheri,+xcheripurecap" }
-// CHECK: attributes #2 = { mustprogress nofree norecurse nosync nounwind willreturn memory(readwrite, inaccessiblemem: none) "cheri-compartment"="example" "interrupt-state"="enabled" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-features"="+32bit,+c,+e,+m,+xcheri,+xcheripurecap" }
diff --git a/clang/test/CodeGen/cheri/riscv/cheriot-static-sealed-value-attr.c b/clang/test/CodeGen/cheri/riscv/cheriot-static-sealed-value-attr.c
index 89f2f6eea05c7..15a8093b317e5 100644
--- a/clang/test/CodeGen/cheri/riscv/cheriot-static-sealed-value-attr.c
+++ b/clang/test/CodeGen/cheri/riscv/cheriot-static-sealed-value-attr.c
@@ -40,8 +40,3 @@ void func() {
 
 // CHECK: declare void @doSomething(ptr addrspace(200) noundef) local_unnamed_addr addrspace(200) #2
 // CHECK: declare void @doSomething2(ptr addrspace(200) noundef) local_unnamed_addr addrspace(200) #2
-
-// CHECK: attributes #0 = { "cheriot_sealed_value" }
-// CHECK: attributes #1 = { minsize nounwind optsize "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-features"="+32bit,+c,+e,+m,+xcheri,+xcheripurecap" }
-// CHECK: attributes #2 = { minsize optsize "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-features"="+32bit,+c,+e,+m,+xcheri,+xcheripurecap" }
-// CHECK: attributes #3 = { minsize nounwind optsize }
diff --git a/llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFObjectWriter.cpp b/llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFObjectWriter.cpp
index c83f829e6465e..b43461b6df2aa 100644
--- a/llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFObjectWriter.cpp
+++ b/llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFObjectWriter.cpp
@@ -108,9 +108,7 @@ unsigned RISCVELFObjectWriter::getRelocType(MCContext &Ctx,
       return ELF::R_RISCV_CHERI_CJAL;
     case RISCV::fixup_riscv_ccall: {
       const auto *STI = Ctx.getSubtargetInfo();
-      if (STI->hasFeature(RISCV::FeatureVendorXCheriot) ||
-          STI->getTargetTriple().getSubArch() ==
-              Triple::RISCV32SubArch_cheriot_v1)
+      if (STI->hasFeature(RISCV::FeatureVendorXCheriot))
         return ELF::R_RISCV_CHERIOT_CCALL;
       return ELF::R_RISCV_CHERI_CCALL;
     }