[CHERI] Rename target-specific RelExpr entries to match upstream naming convention.

resistor · resistor · commit 34bd8611868e · 2025-11-21T23:49:21.000-06:00
diff --git a/lld/ELF/Arch/Cheri.cpp b/lld/ELF/Arch/Cheri.cpp
@@ -496,8 +496,8 @@ void MipsCheriCapTableSection::addEntry(Symbol &sym, RelExpr expr,
   idx.firstUse = SymbolAndOffset(isec, offset);
   assert(!idx.firstUse->symOrSec.isNull());
   switch (expr) {
-  case R_MIPS_CHERI_CAPTAB_INDEX_SMALL_IMMEDIATE:
-  case R_MIPS_CHERI_CAPTAB_INDEX_CALL_SMALL_IMMEDIATE:
+  case RE_MIPS_CHERI_CAPTAB_INDEX_SMALL_IMMEDIATE:
+  case RE_MIPS_CHERI_CAPTAB_INDEX_CALL_SMALL_IMMEDIATE:
     idx.needsSmallImm = true;
     break;
   default:
@@ -509,8 +509,8 @@ void MipsCheriCapTableSection::addEntry(Symbol &sym, RelExpr expr,
   // not used as a function pointer and therefore does not need a unique
   // address (plt stub) across all DSOs.
   switch (expr) {
-  case R_MIPS_CHERI_CAPTAB_INDEX_CALL:
-  case R_MIPS_CHERI_CAPTAB_INDEX_CALL_SMALL_IMMEDIATE:
+  case RE_MIPS_CHERI_CAPTAB_INDEX_CALL:
+  case RE_MIPS_CHERI_CAPTAB_INDEX_CALL_SMALL_IMMEDIATE:
     if (!sym.isFunc() && !sym.isUndefWeak()) {
       CheriCapRelocLocation loc{isec, offset};
       std::string msg = "call relocation against non-function symbol " +
diff --git a/lld/ELF/Arch/Mips.cpp b/lld/ELF/Arch/Mips.cpp
@@ -121,7 +121,7 @@ RelExpr MIPS<ELFT>::getRelExpr(RelType type, const Symbol &s,
   case R_MICROMIPS_GPREL7_S2:
     return RE_MIPS_GOTREL;
   case R_MIPS_CHERI_CAPTABLEREL16:
-    return R_MIPS_CHERI_CAPTAB_REL;
+    return RE_MIPS_CHERI_CAPTAB_REL;
   case R_MIPS_26:
   case R_MICROMIPS_26_S1:
     return R_PLT;
@@ -210,25 +210,25 @@ RelExpr MIPS<ELFT>::getRelExpr(RelType type, const Symbol &s,
     return R_ABS_CAP;
   case R_MIPS_CHERI_CAPTAB_LO16:
   case R_MIPS_CHERI_CAPTAB_HI16:
-    return R_MIPS_CHERI_CAPTAB_INDEX;
+    return RE_MIPS_CHERI_CAPTAB_INDEX;
   case R_MIPS_CHERI_CAPCALL_LO16:
   case R_MIPS_CHERI_CAPCALL_HI16:
-    return R_MIPS_CHERI_CAPTAB_INDEX_CALL;
+    return RE_MIPS_CHERI_CAPTAB_INDEX_CALL;
   case R_MIPS_CHERI_CAPTAB_CLC11:
   case R_MIPS_CHERI_CAPTAB20:
-    return R_MIPS_CHERI_CAPTAB_INDEX_SMALL_IMMEDIATE;
+    return RE_MIPS_CHERI_CAPTAB_INDEX_SMALL_IMMEDIATE;
   case R_MIPS_CHERI_CAPCALL_CLC11:
   case R_MIPS_CHERI_CAPCALL20:
-    return R_MIPS_CHERI_CAPTAB_INDEX_CALL_SMALL_IMMEDIATE;
+    return RE_MIPS_CHERI_CAPTAB_INDEX_CALL_SMALL_IMMEDIATE;
   case R_MIPS_CHERI_CAPTAB_TLS_GD_LO16:
   case R_MIPS_CHERI_CAPTAB_TLS_GD_HI16:
-    return R_MIPS_CHERI_CAPTAB_TLSGD;
+    return RE_MIPS_CHERI_CAPTAB_TLSGD;
   case R_MIPS_CHERI_CAPTAB_TLS_LDM_LO16:
   case R_MIPS_CHERI_CAPTAB_TLS_LDM_HI16:
-    return R_MIPS_CHERI_CAPTAB_TLSLD;
+    return RE_MIPS_CHERI_CAPTAB_TLSLD;
   case R_MIPS_CHERI_CAPTAB_TLS_TPREL_LO16:
   case R_MIPS_CHERI_CAPTAB_TLS_TPREL_HI16:
-    return R_MIPS_CHERI_CAPTAB_TPREL;
+    return RE_MIPS_CHERI_CAPTAB_TPREL;
   default:
     Err(ctx) << getErrorLoc(ctx, loc) << "unknown relocation (" << type.v
              << ") against symbol " << &s;
diff --git a/lld/ELF/Arch/RISCV.cpp b/lld/ELF/Arch/RISCV.cpp
@@ -397,13 +397,14 @@ RelExpr RISCV::getRelExpr(const RelType type, const Symbol &s,
   case R_RISCV_CHERI_TLS_GD_CAPTAB_PCREL_HI20:
     return R_TLSGD_PC;
   case R_RISCV_CHERIOT_COMPARTMENT_HI:
-    return isPCCRelative(ctx, loc, &s) ? R_PC : R_CHERIOT_COMPARTMENT_CGPREL_HI;
+    return isPCCRelative(ctx, loc, &s) ? R_PC
+                                       : RE_CHERIOT_COMPARTMENT_CGPREL_HI;
   case R_RISCV_CHERIOT_COMPARTMENT_LO_I:
-    return R_CHERIOT_COMPARTMENT_CGPREL_LO_I;
+    return RE_CHERIOT_COMPARTMENT_CGPREL_LO_I;
   case R_RISCV_CHERIOT_COMPARTMENT_LO_S:
-    return R_CHERIOT_COMPARTMENT_CGPREL_LO_S;
+    return RE_CHERIOT_COMPARTMENT_CGPREL_LO_S;
   case R_RISCV_CHERIOT_COMPARTMENT_SIZE:
-    return R_CHERIOT_COMPARTMENT_SIZE;
+    return RE_CHERIOT_COMPARTMENT_SIZE;
   default:
     Err(ctx) << getErrorLoc(ctx, loc) << "unknown relocation (" << type.v
              << ") against symbol " << &s;
diff --git a/lld/ELF/InputSection.cpp b/lld/ELF/InputSection.cpp
@@ -1020,53 +1020,53 @@ uint64_t InputSectionBase::getRelocTargetVA(Ctx &ctx, const Relocation &r,
     assert(r.sym->isUndefined() &&
            "cannot encode non-null derived capability yet");
     return 0;
-  case R_MIPS_CHERI_CAPTAB_INDEX:
-  case R_MIPS_CHERI_CAPTAB_INDEX_SMALL_IMMEDIATE:
-  case R_MIPS_CHERI_CAPTAB_INDEX_CALL:
-  case R_MIPS_CHERI_CAPTAB_INDEX_CALL_SMALL_IMMEDIATE:
+  case RE_MIPS_CHERI_CAPTAB_INDEX:
+  case RE_MIPS_CHERI_CAPTAB_INDEX_SMALL_IMMEDIATE:
+  case RE_MIPS_CHERI_CAPTAB_INDEX_CALL:
+  case RE_MIPS_CHERI_CAPTAB_INDEX_CALL_SMALL_IMMEDIATE:
     assert(a == 0 && "capability table index relocs should not have addends");
     return r.sym->getMipsCheriCapTableOffset(ctx, this, r.offset);
-  case R_MIPS_CHERI_CAPTAB_REL:
+  case RE_MIPS_CHERI_CAPTAB_REL:
     if (!ctx.sym.mipsCheriCapabilityTable) {
       error("cannot compute difference between non-existent "
             "CheriCapabilityTable and symbol " + toStr(ctx, *r.sym));
       return r.sym->getVA(ctx, a);
     }
     return r.sym->getVA(ctx, a) - ctx.sym.mipsCheriCapabilityTable->getVA(ctx);
-  case R_MIPS_CHERI_CAPTAB_TLSGD:
+  case RE_MIPS_CHERI_CAPTAB_TLSGD:
     assert(a == 0 && "capability table index relocs should not have addends");
     return ctx.in.mipsCheriCapTable->getDynTlsOffset(*r.sym);
-  case R_MIPS_CHERI_CAPTAB_TLSLD:
+  case RE_MIPS_CHERI_CAPTAB_TLSLD:
     assert(a == 0 && "capability table index relocs should not have addends");
     return ctx.in.mipsCheriCapTable->getTlsIndexOffset();
-  case R_MIPS_CHERI_CAPTAB_TPREL:
+  case RE_MIPS_CHERI_CAPTAB_TPREL:
     assert(a == 0 && "capability table index relocs should not have addends");
     return ctx.in.mipsCheriCapTable->getTlsOffset(*r.sym);
   // LO_I is used for both PCC and CGP-relative addresses.  For backwards
   // compatibility, the symbol may be a CGP-relative symbol.  In newer code, it
   // will always be the symbol containing the accompanying HI relocation.
-  case R_CHERIOT_COMPARTMENT_CGPREL_LO_I: {
+  case RE_CHERIOT_COMPARTMENT_CGPREL_LO_I: {
     if (isPCCRelative(ctx, nullptr, r.sym)) {
       if (const Relocation *hiRel = getRISCVPCRelHi20(ctx, this, r)) {
         if (isPCCRelative(ctx, nullptr, hiRel->sym))
           return getRelocTargetVA(ctx, *hiRel, r.sym->getVA(ctx));
         return getBiasedCGPOffsetLo12(ctx, *hiRel->sym);
       }
-      fatal("R_CHERIOT_COMPARTMENT_CGPREL_LO_I relocation points to " +
+      fatal("RE_CHERIOT_COMPARTMENT_CGPREL_LO_I relocation points to " +
             r.sym->getName() +
             " without an associated R_RISCV_PCREL_HI20 relocation");
     }
     return getBiasedCGPOffsetLo12(ctx, *r.sym);
   }
   // Reached only for CGP-relative relocations.  PCC-relative addresses are
   // calculated with the R_PC and R_PC_INDIRECT cases.
-  case R_CHERIOT_COMPARTMENT_CGPREL_LO_S:
+  case RE_CHERIOT_COMPARTMENT_CGPREL_LO_S:
     return getBiasedCGPOffsetLo12(ctx, *r.sym);
-  case R_CHERIOT_COMPARTMENT_CGPREL_HI:
+  case RE_CHERIOT_COMPARTMENT_CGPREL_HI:
     return (getBiasedCGPOffset(ctx, *r.sym) -
             getBiasedCGPOffsetLo12(ctx, *r.sym)) >>
            11;
-  case R_CHERIOT_COMPARTMENT_SIZE:
+  case RE_CHERIOT_COMPARTMENT_SIZE:
     return r.sym->getSize(ctx);
   default:
     llvm_unreachable("invalid expression");
diff --git a/lld/ELF/Relocations.cpp b/lld/ELF/Relocations.cpp
@@ -215,10 +215,10 @@ bool lld::elf::needsGot(RelExpr expr) {
 // returns false for TLS variables even though then need a captable entry,
 // because TLS variables use the captable differently than regular variables.
 static bool needsMipsCheriCapTable(RelExpr expr) {
-  return oneof<R_MIPS_CHERI_CAPTAB_INDEX,
-               R_MIPS_CHERI_CAPTAB_INDEX_SMALL_IMMEDIATE,
-               R_MIPS_CHERI_CAPTAB_INDEX_CALL,
-               R_MIPS_CHERI_CAPTAB_INDEX_CALL_SMALL_IMMEDIATE>(expr);
+  return oneof<RE_MIPS_CHERI_CAPTAB_INDEX,
+               RE_MIPS_CHERI_CAPTAB_INDEX_SMALL_IMMEDIATE,
+               RE_MIPS_CHERI_CAPTAB_INDEX_CALL,
+               RE_MIPS_CHERI_CAPTAB_INDEX_CALL_SMALL_IMMEDIATE>(expr);
 }
 
 // True if this expression is of the form Sym - X, where X is a position in the
@@ -227,7 +227,7 @@ static bool isRelExpr(RelExpr expr) {
   return oneof<R_PC, R_GOTREL, R_GOTPLTREL, RE_ARM_PCA, RE_MIPS_GOTREL,
                RE_PPC64_CALL, RE_PPC64_RELAX_TOC, RE_AARCH64_PAGE_PC,
                R_RELAX_GOT_PC, RE_RISCV_PC_INDIRECT, RE_PPC64_RELAX_GOT_PC,
-               RE_LOONGARCH_PAGE_PC, R_MIPS_CHERI_CAPTAB_REL>(expr);
+               RE_LOONGARCH_PAGE_PC, RE_MIPS_CHERI_CAPTAB_REL>(expr);
 }
 
 static RelExpr toPlt(RelExpr expr) {
@@ -1060,21 +1060,22 @@ bool RelocationScanner::isStaticLinkTimeConstant(RelExpr e, RelType type,
                                                  const Symbol &sym,
                                                  uint64_t relOff) const {
   // These expressions always compute a constant
-  if (oneof<
-          R_GOTPLT, R_GOT_OFF, R_RELAX_HINT, RE_MIPS_GOT_LOCAL_PAGE,
-          RE_MIPS_GOTREL, RE_MIPS_GOT_OFF, RE_MIPS_GOT_OFF32, RE_MIPS_GOT_GP_PC,
-          RE_AARCH64_GOT_PAGE_PC, RE_AARCH64_AUTH_GOT_PAGE_PC, R_GOT_PC,
-          R_GOTONLY_PC, R_GOTPLTONLY_PC, R_PLT_PC, R_PLT_GOTREL, R_PLT_GOTPLT,
-          R_GOTPLT_GOTREL, R_GOTPLT_PC, RE_PPC32_PLTREL, RE_PPC64_CALL_PLT,
-          RE_PPC64_RELAX_TOC, RE_RISCV_ADD, RE_AARCH64_GOT_PAGE,
-          RE_AARCH64_AUTH_GOT, RE_AARCH64_AUTH_GOT_PC, RE_LOONGARCH_PLT_PAGE_PC,
-          RE_LOONGARCH_GOT, RE_LOONGARCH_GOT_PAGE_PC, R_MIPS_CHERI_CAPTAB_INDEX,
-          R_MIPS_CHERI_CAPTAB_INDEX_SMALL_IMMEDIATE,
-          R_MIPS_CHERI_CAPTAB_INDEX_CALL,
-          R_MIPS_CHERI_CAPTAB_INDEX_CALL_SMALL_IMMEDIATE,
-          R_MIPS_CHERI_CAPTAB_REL, R_CHERIOT_COMPARTMENT_CGPREL_HI,
-          R_CHERIOT_COMPARTMENT_CGPREL_LO_I, R_CHERIOT_COMPARTMENT_CGPREL_LO_S,
-          R_CHERIOT_COMPARTMENT_SIZE>(e))
+  if (oneof<R_GOTPLT, R_GOT_OFF, R_RELAX_HINT, RE_MIPS_GOT_LOCAL_PAGE,
+            RE_MIPS_GOTREL, RE_MIPS_GOT_OFF, RE_MIPS_GOT_OFF32,
+            RE_MIPS_GOT_GP_PC, RE_AARCH64_GOT_PAGE_PC,
+            RE_AARCH64_AUTH_GOT_PAGE_PC, R_GOT_PC, R_GOTONLY_PC,
+            R_GOTPLTONLY_PC, R_PLT_PC, R_PLT_GOTREL, R_PLT_GOTPLT,
+            R_GOTPLT_GOTREL, R_GOTPLT_PC, RE_PPC32_PLTREL, RE_PPC64_CALL_PLT,
+            RE_PPC64_RELAX_TOC, RE_RISCV_ADD, RE_AARCH64_GOT_PAGE,
+            RE_AARCH64_AUTH_GOT, RE_AARCH64_AUTH_GOT_PC,
+            RE_LOONGARCH_PLT_PAGE_PC, RE_LOONGARCH_GOT,
+            RE_LOONGARCH_GOT_PAGE_PC, RE_MIPS_CHERI_CAPTAB_INDEX,
+            RE_MIPS_CHERI_CAPTAB_INDEX_SMALL_IMMEDIATE,
+            RE_MIPS_CHERI_CAPTAB_INDEX_CALL,
+            RE_MIPS_CHERI_CAPTAB_INDEX_CALL_SMALL_IMMEDIATE,
+            RE_MIPS_CHERI_CAPTAB_REL, RE_CHERIOT_COMPARTMENT_CGPREL_HI,
+            RE_CHERIOT_COMPARTMENT_CGPREL_LO_I,
+            RE_CHERIOT_COMPARTMENT_CGPREL_LO_S, RE_CHERIOT_COMPARTMENT_SIZE>(e))
     return true;
 
   // Cheri capability relocations are never static link time constants since
@@ -1418,17 +1419,17 @@ static unsigned handleMipsTlsRelocation(Ctx &ctx, RelType type, Symbol &sym,
     c.addReloc(ctx, {expr, type, offset, addend, &sym});
     return 1;
   }
-  if (expr == R_MIPS_CHERI_CAPTAB_TLSLD) {
+  if (expr == RE_MIPS_CHERI_CAPTAB_TLSLD) {
     ctx.in.mipsCheriCapTable->addTlsIndex();
     c.addReloc(ctx, {expr, type, offset, addend, &sym});
     return 1;
   }
-  if (expr == R_MIPS_CHERI_CAPTAB_TLSGD) {
+  if (expr == RE_MIPS_CHERI_CAPTAB_TLSGD) {
     ctx.in.mipsCheriCapTable->addDynTlsEntry(sym);
     c.addReloc(ctx, {expr, type, offset, addend, &sym});
     return 1;
   }
-  if (expr == R_MIPS_CHERI_CAPTAB_TPREL) {
+  if (expr == RE_MIPS_CHERI_CAPTAB_TPREL) {
     ctx.in.mipsCheriCapTable->addTlsEntry(sym);
     c.addReloc(ctx, {expr, type, offset, addend, &sym});
     return 1;
diff --git a/lld/ELF/Relocations.h b/lld/ELF/Relocations.h
@@ -125,18 +125,18 @@ enum RelExpr {
   RE_RISCV_ADD,
   RE_RISCV_LEB128,
   RE_RISCV_PC_INDIRECT,
-  R_MIPS_CHERI_CAPTAB_INDEX,
-  R_MIPS_CHERI_CAPTAB_INDEX_SMALL_IMMEDIATE,
-  R_MIPS_CHERI_CAPTAB_INDEX_CALL,
-  R_MIPS_CHERI_CAPTAB_INDEX_CALL_SMALL_IMMEDIATE,
-  R_MIPS_CHERI_CAPTAB_REL, // relative offset to _CHERI_CAPABILITY_TABLE_
-  R_MIPS_CHERI_CAPTAB_TLSGD,
-  R_MIPS_CHERI_CAPTAB_TLSLD,
-  R_MIPS_CHERI_CAPTAB_TPREL,
-  R_CHERIOT_COMPARTMENT_CGPREL_HI,
-  R_CHERIOT_COMPARTMENT_CGPREL_LO_S,
-  R_CHERIOT_COMPARTMENT_CGPREL_LO_I,
-  R_CHERIOT_COMPARTMENT_SIZE,
+  RE_MIPS_CHERI_CAPTAB_INDEX,
+  RE_MIPS_CHERI_CAPTAB_INDEX_SMALL_IMMEDIATE,
+  RE_MIPS_CHERI_CAPTAB_INDEX_CALL,
+  RE_MIPS_CHERI_CAPTAB_INDEX_CALL_SMALL_IMMEDIATE,
+  RE_MIPS_CHERI_CAPTAB_REL, // relative offset to _CHERI_CAPABILITY_TABLE_
+  RE_MIPS_CHERI_CAPTAB_TLSGD,
+  RE_MIPS_CHERI_CAPTAB_TLSLD,
+  RE_MIPS_CHERI_CAPTAB_TPREL,
+  RE_CHERIOT_COMPARTMENT_CGPREL_HI,
+  RE_CHERIOT_COMPARTMENT_CGPREL_LO_S,
+  RE_CHERIOT_COMPARTMENT_CGPREL_LO_I,
+  RE_CHERIOT_COMPARTMENT_SIZE,
   // Same as R_PC but with page-aligned semantics.
   RE_LOONGARCH_PAGE_PC,
   // Same as R_PLT_PC but with page-aligned semantics.
