diff --git a/lld/ELF/Arch/AArch64.cpp b/lld/ELF/Arch/AArch64.cpp index 9f9b88b7d3ea..b57fd61b65cc 100644 --- a/lld/ELF/Arch/AArch64.cpp +++ b/lld/ELF/Arch/AArch64.cpp @@ -62,7 +62,6 @@ AArch64::AArch64() { relativeRel = R_AARCH64_RELATIVE; iRelativeRel = R_AARCH64_IRELATIVE; gotRel = R_AARCH64_GLOB_DAT; - noneRel = R_AARCH64_NONE; pltRel = R_AARCH64_JUMP_SLOT; symbolicRel = R_AARCH64_ABS64; tlsDescRel = R_AARCH64_TLSDESC; diff --git a/lld/ELF/Arch/AMDGPU.cpp b/lld/ELF/Arch/AMDGPU.cpp index 466ad81922d0..cd7e7830d374 100644 --- a/lld/ELF/Arch/AMDGPU.cpp +++ b/lld/ELF/Arch/AMDGPU.cpp @@ -40,7 +40,6 @@ public: AMDGPU::AMDGPU() { relativeRel = R_AMDGPU_RELATIVE64; gotRel = R_AMDGPU_ABS64; - noneRel = R_AMDGPU_NONE; symbolicRel = R_AMDGPU_ABS64; } diff --git a/lld/ELF/Arch/ARM.cpp b/lld/ELF/Arch/ARM.cpp index 82611bf6e7d0..759fef154154 100644 --- a/lld/ELF/Arch/ARM.cpp +++ b/lld/ELF/Arch/ARM.cpp @@ -52,7 +52,6 @@ ARM::ARM() { relativeRel = R_ARM_RELATIVE; iRelativeRel = R_ARM_IRELATIVE; gotRel = R_ARM_GLOB_DAT; - noneRel = R_ARM_NONE; pltRel = R_ARM_JUMP_SLOT; symbolicRel = R_ARM_ABS32; tlsGotRel = R_ARM_TLS_TPOFF32; diff --git a/lld/ELF/Arch/AVR.cpp b/lld/ELF/Arch/AVR.cpp index d0d247225708..a3051dad9e8b 100644 --- a/lld/ELF/Arch/AVR.cpp +++ b/lld/ELF/Arch/AVR.cpp @@ -42,7 +42,6 @@ using namespace lld::elf; namespace { class AVR final : public TargetInfo { public: - AVR(); uint32_t calcEFlags() const override; RelExpr getRelExpr(RelType type, const Symbol &s, const uint8_t *loc) const override; @@ -51,8 +50,6 @@ public: }; } // namespace -AVR::AVR() { noneRel = R_AVR_NONE; } - RelExpr AVR::getRelExpr(RelType type, const Symbol &s, const uint8_t *loc) const { switch (type) { diff --git a/lld/ELF/Arch/Hexagon.cpp b/lld/ELF/Arch/Hexagon.cpp index 0d5fe0192ebb..300ca675519f 100644 --- a/lld/ELF/Arch/Hexagon.cpp +++ b/lld/ELF/Arch/Hexagon.cpp @@ -54,7 +54,6 @@ Hexagon::Hexagon() { // Hexagon Linux uses 64K pages by default. defaultMaxPageSize = 0x10000; - noneRel = R_HEX_NONE; tlsGotRel = R_HEX_TPREL_32; tlsModuleIndexRel = R_HEX_DTPMOD_32; tlsOffsetRel = R_HEX_DTPREL_32; diff --git a/lld/ELF/Arch/Mips.cpp b/lld/ELF/Arch/Mips.cpp index 48fe1925fdd6..8dc517fd1b3b 100644 --- a/lld/ELF/Arch/Mips.cpp +++ b/lld/ELF/Arch/Mips.cpp @@ -49,7 +49,6 @@ template MIPS::MIPS() { pltEntrySize = 16; pltHeaderSize = 32; copyRel = R_MIPS_COPY; - noneRel = R_MIPS_NONE; pltRel = R_MIPS_JUMP_SLOT; needsThunks = true; diff --git a/lld/ELF/Arch/PPC.cpp b/lld/ELF/Arch/PPC.cpp index d3a6f9bb378f..0dda9a40eef7 100644 --- a/lld/ELF/Arch/PPC.cpp +++ b/lld/ELF/Arch/PPC.cpp @@ -151,7 +151,6 @@ void elf::writePPC32GlinkSection(uint8_t *buf, size_t numEntries) { PPC::PPC() { copyRel = R_PPC_COPY; gotRel = R_PPC_GLOB_DAT; - noneRel = R_PPC_NONE; pltRel = R_PPC_JMP_SLOT; relativeRel = R_PPC_RELATIVE; iRelativeRel = R_PPC_IRELATIVE; diff --git a/lld/ELF/Arch/PPC64.cpp b/lld/ELF/Arch/PPC64.cpp index 77c07c15a01c..0bbaa912faaa 100644 --- a/lld/ELF/Arch/PPC64.cpp +++ b/lld/ELF/Arch/PPC64.cpp @@ -568,7 +568,6 @@ static uint64_t readPrefixedInstruction(const uint8_t *loc) { PPC64::PPC64() { copyRel = R_PPC64_COPY; gotRel = R_PPC64_GLOB_DAT; - noneRel = R_PPC64_NONE; pltRel = R_PPC64_JMP_SLOT; relativeRel = R_PPC64_RELATIVE; iRelativeRel = R_PPC64_IRELATIVE; diff --git a/lld/ELF/Arch/RISCV.cpp b/lld/ELF/Arch/RISCV.cpp index 37aa3e32e159..5ee9e4185f1a 100644 --- a/lld/ELF/Arch/RISCV.cpp +++ b/lld/ELF/Arch/RISCV.cpp @@ -75,7 +75,6 @@ static uint32_t utype(uint32_t op, uint32_t rd, uint32_t imm) { RISCV::RISCV() { copyRel = R_RISCV_COPY; - noneRel = R_RISCV_NONE; pltRel = R_RISCV_JUMP_SLOT; relativeRel = R_RISCV_RELATIVE; iRelativeRel = R_RISCV_IRELATIVE; diff --git a/lld/ELF/Arch/SPARCV9.cpp b/lld/ELF/Arch/SPARCV9.cpp index 9e18ae4753bc..1aebb57951cb 100644 --- a/lld/ELF/Arch/SPARCV9.cpp +++ b/lld/ELF/Arch/SPARCV9.cpp @@ -35,7 +35,6 @@ public: SPARCV9::SPARCV9() { copyRel = R_SPARC_COPY; gotRel = R_SPARC_GLOB_DAT; - noneRel = R_SPARC_NONE; pltRel = R_SPARC_JMP_SLOT; relativeRel = R_SPARC_RELATIVE; symbolicRel = R_SPARC_64; diff --git a/lld/ELF/Arch/X86.cpp b/lld/ELF/Arch/X86.cpp index 410c075a90cd..726160c7b501 100644 --- a/lld/ELF/Arch/X86.cpp +++ b/lld/ELF/Arch/X86.cpp @@ -52,7 +52,6 @@ public: X86::X86() { copyRel = R_386_COPY; gotRel = R_386_GLOB_DAT; - noneRel = R_386_NONE; pltRel = R_386_JUMP_SLOT; iRelativeRel = R_386_IRELATIVE; relativeRel = R_386_RELATIVE; diff --git a/lld/ELF/Arch/X86_64.cpp b/lld/ELF/Arch/X86_64.cpp index 7916d1d6ca65..39ac23ab21f6 100644 --- a/lld/ELF/Arch/X86_64.cpp +++ b/lld/ELF/Arch/X86_64.cpp @@ -78,7 +78,6 @@ static const std::vector> nopInstructions = { X86_64::X86_64() { copyRel = R_X86_64_COPY; gotRel = R_X86_64_GLOB_DAT; - noneRel = R_X86_64_NONE; pltRel = R_X86_64_JUMP_SLOT; relativeRel = R_X86_64_RELATIVE; iRelativeRel = R_X86_64_IRELATIVE; diff --git a/lld/ELF/Target.h b/lld/ELF/Target.h index da1f43d57a62..305edf5fa5d8 100644 --- a/lld/ELF/Target.h +++ b/lld/ELF/Target.h @@ -111,9 +111,9 @@ public: // True if _GLOBAL_OFFSET_TABLE_ is relative to .got.plt, false if .got. bool gotBaseSymInGotPlt = false; + static constexpr RelType noneRel = 0; RelType copyRel; RelType gotRel; - RelType noneRel; RelType pltRel; RelType relativeRel; RelType iRelativeRel;