Split out lld changes

Created using spr 1.3.6-beta.1

Author: pcc

lld/ELF/Arch/AArch64.cpp

@@ -114,7 +114,6 @@ AArch64::AArch64(Ctx &ctx) : TargetInfo(ctx) {
   copyRel = R_AARCH64_COPY;
   relativeRel = R_AARCH64_RELATIVE;
   iRelativeRel = R_AARCH64_IRELATIVE;
-  iRelSymbolicRel = R_AARCH64_FUNCINIT64;
   gotRel = R_AARCH64_GLOB_DAT;
   pltRel = R_AARCH64_JUMP_SLOT;
   symbolicRel = R_AARCH64_ABS64;
@@ -138,7 +137,6 @@ RelExpr AArch64::getRelExpr(RelType type, const Symbol &s,
   case R_AARCH64_ABS16:
   case R_AARCH64_ABS32:
   case R_AARCH64_ABS64:
-  case R_AARCH64_FUNCINIT64:
   case R_AARCH64_ADD_ABS_LO12_NC:
   case R_AARCH64_LDST128_ABS_LO12_NC:
   case R_AARCH64_LDST16_ABS_LO12_NC:
@@ -269,8 +267,7 @@ bool AArch64::usesOnlyLowPageBits(RelType type) const {
 }
 
 RelType AArch64::getDynRel(RelType type) const {
-  if (type == R_AARCH64_ABS64 || type == R_AARCH64_AUTH_ABS64 ||
-      type == R_AARCH64_FUNCINIT64)
+  if (type == R_AARCH64_ABS64 || type == R_AARCH64_AUTH_ABS64)
     return type;
   return R_AARCH64_NONE;
 }

lld/ELF/Relocations.cpp

@@ -989,8 +989,8 @@ bool RelocationScanner::isStaticLinkTimeConstant(RelExpr e, RelType type,
   // only the low bits are used.
   if (e == R_GOT || e == R_PLT)
     return ctx.target->usesOnlyLowPageBits(type) || !ctx.arg.isPic;
-  // R_AARCH64_AUTH_ABS64 and iRelSymbolicRel require a dynamic relocation.
-  if (e == RE_AARCH64_AUTH || type == ctx.target->iRelSymbolicRel)
+  // R_AARCH64_AUTH_ABS64 requires a dynamic relocation.
+  if (e == RE_AARCH64_AUTH)
     return false;
 
   // The behavior of an undefined weak reference is implementation defined.
@@ -1163,23 +1163,6 @@ void RelocationScanner::processAux(RelExpr expr, RelType type, uint64_t offset,
         }
         return;
       }
-      if (LLVM_UNLIKELY(type == ctx.target->iRelSymbolicRel)) {
-        if (sym.isPreemptible) {
-          auto diag = Err(ctx);
-          diag << "relocation " << type
-               << " cannot be used against preemptible symbol '" << &sym << "'";
-          printLocation(diag, *sec, sym, offset);
-        } else if (isIfunc) {
-          auto diag = Err(ctx);
-          diag << "relocation " << type
-               << " cannot be used against ifunc symbol '" << &sym << "'";
-          printLocation(diag, *sec, sym, offset);
-        } else {
-          part.relaDyn->addReloc({ctx.target->iRelativeRel, sec, offset, false,
-                                  sym, addend, R_ABS});
-          return;
-        }
-      }
       part.relaDyn->addSymbolReloc(rel, *sec, offset, sym, addend, type);
 
       // MIPS ABI turns using of GOT and dynamic relocations inside out.

lld/ELF/Target.h

@@ -134,7 +134,6 @@ class TargetInfo {
   RelType relativeRel = 0;
   RelType iRelativeRel = 0;
   RelType symbolicRel = 0;
-  RelType iRelSymbolicRel = 0;
   RelType tlsDescRel = 0;
   RelType tlsGotRel = 0;
   RelType tlsModuleIndexRel = 0;