[lld][LoongArch] Adjust RelExpr after relaxation is applied

Author: ywgrit

lld/ELF/Arch/LoongArch.cpp

@@ -945,7 +945,7 @@ void LoongArch::finalizeRelax(int passes) const {
           continue;
 
         // Copy from last location to the current relocated location.
-        const Relocation &r = rels[i];
+        Relocation &r = rels[i];
         uint64_t size = r.offset - offset;
         memcpy(p, old.data() + offset, size);
         p += size;
@@ -959,6 +959,8 @@ void LoongArch::finalizeRelax(int passes) const {
           case R_LARCH_PCREL20_S2:
             skip = 4;
             write32le(p, aux.writes[writesIdx++]);
+            // RelExpr is needed for relocating.
+            r.expr = r.sym->hasFlag(NEEDS_PLT) ? R_PLT_PC : R_PC;
             break;
           default:
             llvm_unreachable("unsupported type");

lld/ELF/InputSection.cpp

@@ -737,17 +737,6 @@ uint64_t InputSectionBase::getRelocTargetVA(Ctx &ctx, const Relocation &r,
   int64_t a = r.addend;
   switch (r.expr) {
   case R_ABS:
-    // pcalau12i,addi.[wd] => pcaddi
-    // With relaxation applied, the relocation type of the third
-    // reloc entry which corresponds to the addi.[wd] insn is converted
-    // from R_LARCH_PCALA_LO12 to R_LARCH_PCREL20_S2.
-    if (r.type == R_LARCH_PCREL20_S2) {
-      if (r.sym->hasFlag(NEEDS_PLT))
-        return r.sym->getPltVA(ctx) + a - p;
-      else
-        return r.sym->getVA(a) - p;
-    }
-    [[fallthrough]];
   case R_DTPREL:
   case R_RELAX_TLS_LD_TO_LE_ABS:
   case R_RELAX_GOT_PC_NOPIC: