[NFC][ELF][CHERI] Rename cheriCap(Call)Rel to symbolicCap(Call)Rel

This makes it clearer they're equivalent to symbolicRel.

Author: jrtc27

lld/ELF/Arch/Cheri.cpp

@@ -690,8 +690,8 @@ uint64_t MipsCheriCapTableSection::assignIndices(uint64_t startIndex,
     // relocation instead which allows the runtime linker to create non-unique
     // plt stubs.
     RelType elfCapabilityReloc = it.second.usedInCallExpr
-                                     ? *ctx.target->cheriCapCallRel
-                                     : *ctx.target->cheriCapRel;
+                                     ? *ctx.target->symbolicCapCallRel
+                                     : *ctx.target->symbolicCapRel;
     // All capability call relocations should end up in the pltrel section
     // rather than the normal relocation section to make processing of PLT
     // relocations in RTLD more efficient.
@@ -903,7 +903,7 @@ static bool needsCheriMipsTrampoline(Ctx &ctx, RelType type,
   if (ctx.arg.emachine != EM_MIPS)
     return false;
 
-  if (!sym.isFunc() || type == *ctx.target->cheriCapCallRel)
+  if (!sym.isFunc() || type == *ctx.target->symbolicCapCallRel)
     return false;
 
   // In static binaries we do not need PLT stubs for function pointers since

lld/ELF/Arch/Mips.cpp

@@ -48,8 +48,8 @@ template <class ELFT> MIPS<ELFT>::MIPS(Ctx &ctx) : TargetInfo(ctx) {
   pltHeaderSize = 32;
   copyRel = R_MIPS_COPY;
   pltRel = R_MIPS_JUMP_SLOT;
-  cheriCapRel = R_MIPS_CHERI_CAPABILITY;
-  cheriCapCallRel = R_MIPS_CHERI_CAPABILITY_CALL;
+  symbolicCapRel = R_MIPS_CHERI_CAPABILITY;
+  symbolicCapCallRel = R_MIPS_CHERI_CAPABILITY_CALL;
   needsThunks = true;
 
   // Set `sigrie 1` as a trap instruction.
@@ -237,7 +237,7 @@ RelExpr MIPS<ELFT>::getRelExpr(RelType type, const Symbol &s,
 }
 
 template <class ELFT> RelType MIPS<ELFT>::getDynRel(RelType type) const {
-  if (type == symbolicRel || type == cheriCapRel)
+  if (type == symbolicRel || type == symbolicCapRel)
     return type;
   return R_MIPS_NONE;
 }

lld/ELF/Arch/RISCV.cpp

@@ -127,7 +127,7 @@ RISCV::RISCV(Ctx &ctx) : TargetInfo(ctx) {
   pltRel = R_RISCV_JUMP_SLOT;
   relativeRel = R_RISCV_RELATIVE;
   iRelativeRel = R_RISCV_IRELATIVE;
-  cheriCapRel = R_RISCV_CHERI_CAPABILITY;
+  symbolicCapRel = R_RISCV_CHERI_CAPABILITY;
   if (ctx.arg.is64) {
     symbolicRel = R_RISCV_64;
     tlsModuleIndexRel = R_RISCV_TLS_DTPMOD64;
@@ -140,7 +140,7 @@ RISCV::RISCV(Ctx &ctx) : TargetInfo(ctx) {
     tlsGotRel = R_RISCV_TLS_TPREL32;
   }
   if (ctx.arg.isCheriAbi)
-    gotRel = *cheriCapRel;
+    gotRel = *symbolicCapRel;
   else
     gotRel = symbolicRel;
   tlsDescRel = R_RISCV_TLSDESC;
@@ -308,7 +308,7 @@ void RISCV::writePlt(uint8_t *buf, const Symbol &sym,
 }
 
 RelType RISCV::getDynRel(RelType type) const {
-  return type == symbolicRel || type == cheriCapRel
+  return type == symbolicRel || type == symbolicCapRel
              ? type
              : static_cast<RelType>(R_RISCV_NONE);
 }

lld/ELF/Relocations.cpp

@@ -950,12 +950,12 @@ static void addPltEntry(Ctx &ctx, PltSection &plt, GotPltSection &gotPlt,
     if (!sym.isPreemptible) {
       addRelativeCapabilityRelocation(ctx, gotPlt, sym.getGotPltOffset(ctx),
                                       &sym, 0, R_ABS_CAP,
-                                      *ctx.target->cheriCapRel);
+                                      *ctx.target->symbolicCapRel);
       return;
     }
 
     addRelativeCapabilityRelocation(ctx, gotPlt, sym.getGotPltOffset(ctx), &plt,
-                                    0, R_ABS_CAP, *ctx.target->cheriCapRel);
+                                    0, R_ABS_CAP, *ctx.target->symbolicCapRel);
   }
 
   rel.addReloc({type, &gotPlt, sym.getGotPltOffset(ctx),
@@ -978,7 +978,9 @@ void elf::addGotEntry(Ctx &ctx, Symbol &sym) {
   }
 
   RelType type =
-      ctx.arg.isCheriAbi ? *ctx.target->cheriCapRel : ctx.target->symbolicRel;
+
+      ctx.arg.isCheriAbi ? *ctx.target->symbolicCapRel
+                         : ctx.target->symbolicRel;
 
   // Otherwise, the value is either a link-time constant or the load base
   // plus a constant. For CHERI it always requires run-time initialisation,
@@ -1244,7 +1246,8 @@ void RelocationScanner::processAux(RelExpr expr, RelType type, uint64_t offset,
   if (canWrite) {
     RelType rel = ctx.target->getDynRel(type);
     if (oneof<R_GOT, RE_LOONGARCH_GOT>(expr) ||
-        ((rel == ctx.target->symbolicRel || rel == ctx.target->cheriCapRel) &&
+        ((rel == ctx.target->symbolicRel ||
+          rel == ctx.target->symbolicCapRel) &&
          !sym.isPreemptible)) {
       addRelativeReloc<true>(ctx, *sec, offset, sym, addend, expr, type);
       return;

lld/ELF/SyntheticSections.cpp

@@ -1749,8 +1749,8 @@ RelocationBaseSection::RelocationBaseSection(Ctx &ctx, StringRef name,
 void RelocationBaseSection::addSymbolReloc(
     RelType dynType, InputSectionBase &isec, uint64_t offsetInSec, Symbol &sym,
     int64_t addend, std::optional<RelType> addendRelType) {
-  bool isCap = dynType == ctx.target->cheriCapRel ||
-               dynType == ctx.target->cheriCapCallRel;
+  bool isCap = dynType == ctx.target->symbolicCapRel ||
+               dynType == ctx.target->symbolicCapCallRel;
   if (isCap && sym.isFunc() && addend != 0) {
     auto diag = Warn(ctx);
     diag << "capability relocation with non-zero addend (0x"

lld/ELF/Target.h

@@ -138,8 +138,8 @@ class TargetInfo {
   RelType tlsOffsetRel = 0;
   std::optional<RelType> absPointerRel; // TODO: remove the optional
   std::optional<RelType> sizeRel;
-  std::optional<RelType> cheriCapRel;
-  std::optional<RelType> cheriCapCallRel;
+  std::optional<RelType> symbolicCapRel;
+  std::optional<RelType> symbolicCapCallRel;
   unsigned gotEntrySize = ctx.arg.wordsize;
   unsigned pltEntrySize = 0;
   unsigned pltHeaderSize = 0;