Revert "[LLD][PowerPC] Add support for R_PPC64_GOT_TLSGD_PCREL34 used in TLS General Dynamic"

This reverts commit 7912286.

Author: stefanp-synopsys

lld/ELF/Arch/PPC64.cpp

@@ -727,38 +727,15 @@ void PPC64::relaxTlsGdToLe(uint8_t *loc, const Relocation &rel,
     writeFromHalf16(loc, 0x3c6d0000); // addis r3, r13
     relocateNoSym(loc, R_PPC64_TPREL16_HA, val);
     break;
-  case R_PPC64_GOT_TLSGD_PCREL34:
-    // Relax from paddi r3, 0, x@got@tlsgd@pcrel, 1 to
-    //            paddi r3, r13, x@tprel, 0
-    writePrefixedInstruction(loc, 0x06000000386d0000);
-    relocateNoSym(loc, R_PPC64_TPREL34, val);
-    break;
-  case R_PPC64_TLSGD: {
-    // PC Relative Relaxation:
-    // Relax from bl __tls_get_addr@notoc(x@tlsgd) to
-    //            nop
-    // TOC Relaxation:
-    // Relax from bl __tls_get_addr(x@tlsgd)
-    //            nop
-    // to
-    //            nop
-    //            addi r3, r3, x@tprel@l
-    const uintptr_t locAsInt = reinterpret_cast<uintptr_t>(loc);
-    if (locAsInt % 4 == 0) {
-      write32(loc, NOP);            // nop
-      write32(loc + 4, 0x38630000); // addi r3, r3
-      // Since we are relocating a half16 type relocation and Loc + 4 points to
-      // the start of an instruction we need to advance the buffer by an extra
-      // 2 bytes on BE.
-      relocateNoSym(loc + 4 + (config->ekind == ELF64BEKind ? 2 : 0),
-                    R_PPC64_TPREL16_LO, val);
-    } else if (locAsInt % 4 == 1) {
-      write32(loc - 1, NOP);
-    } else {
-      errorOrWarn("R_PPC64_TLSGD has unexpected byte alignment");
-    }
+  case R_PPC64_TLSGD:
+    write32(loc, NOP);
+    write32(loc + 4, 0x38630000); // addi r3, r3
+    // Since we are relocating a half16 type relocation and Loc + 4 points to
+    // the start of an instruction we need to advance the buffer by an extra
+    // 2 bytes on BE.
+    relocateNoSym(loc + 4 + (config->ekind == ELF64BEKind ? 2 : 0),
+                  R_PPC64_TPREL16_LO, val);
     break;
-  }
   default:
     llvm_unreachable("unsupported relocation for TLS GD to LE relaxation");
   }
@@ -970,8 +947,6 @@ RelExpr PPC64::getRelExpr(RelType type, const Symbol &s,
   case R_PPC64_GOT_TLSGD16_HI:
   case R_PPC64_GOT_TLSGD16_LO:
     return R_TLSGD_GOT;
-  case R_PPC64_GOT_TLSGD_PCREL34:
-    return R_TLSGD_PC;
   case R_PPC64_GOT_TLSLD16:
   case R_PPC64_GOT_TLSLD16_HA:
   case R_PPC64_GOT_TLSLD16_HI:
@@ -1286,7 +1261,6 @@ void PPC64::relocate(uint8_t *loc, const Relocation &rel, uint64_t val) const {
     break;
   case R_PPC64_PCREL34:
   case R_PPC64_GOT_PCREL34:
-  case R_PPC64_GOT_TLSGD_PCREL34:
   case R_PPC64_GOT_TPREL_PCREL34:
   case R_PPC64_TPREL34: {
     const uint64_t si0Mask = 0x00000003ffff0000;
@@ -1366,8 +1340,7 @@ RelExpr PPC64::adjustRelaxExpr(RelType type, const uint8_t *data,
     if ((readPrefixedInstruction(data) & 0xfc000000) == 0xe4000000)
       return R_PPC64_RELAX_GOT_PC;
   }
-
-  if (type != R_PPC64_GOT_TLSGD_PCREL34 && expr == R_RELAX_TLS_GD_TO_IE)
+  if (expr == R_RELAX_TLS_GD_TO_IE)
     return R_RELAX_TLS_GD_TO_IE_GOT_OFF;
   if (expr == R_RELAX_TLS_LD_TO_LE)
     return R_RELAX_TLS_LD_TO_LE_ABS;
@@ -1408,35 +1381,10 @@ void PPC64::relaxTlsGdToIe(uint8_t *loc, const Relocation &rel,
     relocateNoSym(loc, R_PPC64_GOT_TPREL16_LO_DS, val);
     return;
   }
-  case R_PPC64_GOT_TLSGD_PCREL34: {
-    // Relax from paddi r3, 0, sym@got@tlsgd@pcrel, 1 to
-    //            pld r3, sym@got@tprel@pcrel
-    writePrefixedInstruction(loc, 0x04100000e4600000);
-    relocateNoSym(loc, R_PPC64_GOT_TPREL_PCREL34, val);
-    return;
-  }
-  case R_PPC64_TLSGD: {
-    // PC Relative Relaxation:
-    // Relax from bl __tls_get_addr@notoc(x@tlsgd) to
-    //            nop
-    // TOC Relaxation:
-    // Relax from bl __tls_get_addr(x@tlsgd)
-    //            nop
-    // to
-    //            nop
-    //            add r3, r3, r13
-    const uintptr_t locAsInt = reinterpret_cast<uintptr_t>(loc);
-    if (locAsInt % 4 == 0) {
-      write32(loc, NOP);            // bl __tls_get_addr(sym@tlsgd) --> nop
-      write32(loc + 4, 0x7c636A14); // nop --> add r3, r3, r13
-    } else if (locAsInt % 4 == 1) {
-      // bl __tls_get_addr(sym@tlsgd) --> add r3, r3, r13
-      write32(loc - 1, 0x7c636a14);
-    } else {
-      errorOrWarn("R_PPC64_TLSGD has unexpected byte alignment");
-    }
+  case R_PPC64_TLSGD:
+    write32(loc, NOP);            // bl __tls_get_addr(sym@tlsgd) --> nop
+    write32(loc + 4, 0x7c636A14); // nop --> add r3, r3, r13
     return;
-  }
   default:
     llvm_unreachable("unsupported relocation for TLS GD to IE relaxation");
   }

lld/ELF/Relocations.cpp

@@ -1357,19 +1357,6 @@ static void scanReloc(InputSectionBase &sec, OffsetGetter &getOffset, RelTy *&i,
     if (type == R_PPC64_TOC16_LO && sym.isSection() && isa<Defined>(sym) &&
         cast<Defined>(sym).section->name == ".toc")
       ppc64noTocRelax.insert({&sym, addend});
-
-    if (type == R_PPC64_TLSGD && expr == R_TLSDESC_CALL) {
-      if (i == end) {
-        errorOrWarn("R_PPC64_TLSGD may not be the last relocation" +
-                    getLocation(sec, sym, offset));
-        return;
-      }
-
-      // Offset the 4-byte aligned R_PPC64_TLSGD by one byte in the NOTOC case,
-      // so we can discern it later from the toc-case.
-      if (i->getType(/*isMips64EL=*/false) == R_PPC64_REL24_NOTOC)
-        ++offset;
-    }
   }
 
   // Relax relocations.