mirrors/llvm-project
0
0
Fork 0
mirror of https://github.com/llvm/llvm-project.git synced 2025-04-21 19:57:00 +00:00
Code Issues Projects Releases Wiki Activity

ELFObjectWriter: Make .reloc test generic

Browse Source 
Move `Fixup.getKind() >= FirstLiteralRelocationKind` from target hooks
to ELFObjectWriter::recordRelocation.

Currently, getRelocType cannot be skipped for LoongArch due to
This commit is contained in:
Fangrui Song 2025-04-12 23:02:24 -07:00
parent 734660b6dd
commit 19730e37ec
11 changed files with 9 additions and 28 deletions
llvm/lib
MC
ELFObjectWriter.cpp
Target
AArch64/MCTargetDesc
AArch64ELFObjectWriter.cpp
AMDGPU/MCTargetDesc
AMDGPUELFObjectWriter.cpp
ARM/MCTargetDesc
ARMELFObjectWriter.cpp
AVR/MCTargetDesc
AVRELFObjectWriter.cpp
Mips/MCTargetDesc
MipsELFObjectWriter.cpp
PowerPC/MCTargetDesc
PPCELFObjectWriter.cpp
RISCV/MCTargetDesc
RISCVELFObjectWriter.cpp
Sparc/MCTargetDesc
SparcELFObjectWriter.cpp
SystemZ/MCTargetDesc
SystemZELFObjectWriter.cpp
X86/MCTargetDesc
X86ELFObjectWriter.cpp

12
llvm/lib/MC/ELFObjectWriter.cpp

@ -1383,7 +1383,14 @@ void ELFObjectWriter::recordRelocation(MCAssembler &Asm,
if (!checkRelocation(Ctx, Fixup.getLoc(), &FixupSection, SecA))
return;
unsigned Type = TargetObjectWriter->getRelocType(Ctx, Target, Fixup, IsPCRel);
auto EMachine = TargetObjectWriter->getEMachine();
unsigned Type;
if (Fixup.getKind() >= FirstLiteralRelocationKind &&
EMachine != ELF::EM_LOONGARCH)
Type = Fixup.getKind() - FirstLiteralRelocationKind;
else
Type = TargetObjectWriter->getRelocType(Ctx, Target, Fixup, IsPCRel);
bool UseSectionSym =
SymA && SymA->getBinding() == ELF::STB_LOCAL && !SymA->isUndefined();
if (UseSectionSym) {
@ -1402,8 +1409,7 @@ void ELFObjectWriter::recordRelocation(MCAssembler &Asm,
} else {
// In PPC64 ELFv1, .quad .TOC.@tocbase in the .opd section is expected to
// reference the null symbol.
if (Type == ELF::R_PPC64_TOC &&
TargetObjectWriter->getEMachine() == ELF::EM_PPC64)
if (Type == ELF::R_PPC64_TOC && EMachine == ELF::EM_PPC64)
SymA = nullptr;
if (SymA) {

2
llvm/lib/Target/AArch64/MCTargetDesc/AArch64ELFObjectWriter.cpp

@ -109,8 +109,6 @@ unsigned AArch64ELFObjectWriter::getRelocType(MCContext &Ctx,
const MCFixup &Fixup,
bool IsPCRel) const {
unsigned Kind = Fixup.getTargetKind();
if (Kind >= FirstLiteralRelocationKind)
return Kind - FirstLiteralRelocationKind;
AArch64MCExpr::Specifier RefKind =
static_cast<AArch64MCExpr::Specifier>(Target.getSpecifier());
AArch64MCExpr::Specifier SymLoc = AArch64MCExpr::getSymbolLoc(RefKind);

2
llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUELFObjectWriter.cpp

@ -68,8 +68,6 @@ unsigned AMDGPUELFObjectWriter::getRelocType(MCContext &Ctx,
}
MCFixupKind Kind = Fixup.getKind();
if (Kind >= FirstLiteralRelocationKind)
return Kind - FirstLiteralRelocationKind;
switch (Kind) {
default: break;
case FK_PCRel_4:

2
llvm/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp

@ -80,8 +80,6 @@ unsigned ARMELFObjectWriter::GetRelocTypeInner(const MCValue &Target,
bool IsPCRel,
MCContext &Ctx) const {
unsigned Kind = Fixup.getTargetKind();
if (Kind >= FirstLiteralRelocationKind)
return Kind - FirstLiteralRelocationKind;
uint8_t Specifier = Target.getSpecifier();
auto CheckFDPIC = [&](uint32_t Type) {
if (getOSABI() != ELF::ELFOSABI_ARM_FDPIC)

3
llvm/lib/Target/AVR/MCTargetDesc/AVRELFObjectWriter.cpp

@ -37,9 +37,6 @@ AVRELFObjectWriter::AVRELFObjectWriter(uint8_t OSABI)
unsigned AVRELFObjectWriter::getRelocType(MCContext &Ctx, const MCValue &Target,
const MCFixup &Fixup,
bool IsPCRel) const {
const unsigned Kind = Fixup.getTargetKind();
if (Kind >= FirstLiteralRelocationKind)
return Kind - FirstLiteralRelocationKind;
auto Modifier = AVRMCExpr::Specifier(Target.getSpecifier());
switch ((unsigned)Fixup.getKind()) {
case FK_Data_1:

3
llvm/lib/Target/Mips/MCTargetDesc/MipsELFObjectWriter.cpp

@ -159,9 +159,6 @@ unsigned MipsELFObjectWriter::getRelocType(MCContext &Ctx,
bool IsPCRel) const {
// Determine the type of the relocation.
unsigned Kind = Fixup.getTargetKind();
if (Kind >= FirstLiteralRelocationKind)
return Kind - FirstLiteralRelocationKind;
switch (Target.getSpecifier()) {
case MipsMCExpr::MEK_DTPREL:
case MipsMCExpr::MEK_DTPREL_HI:

2
llvm/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp

@ -42,8 +42,6 @@ unsigned PPCELFObjectWriter::getRelocType(MCContext &Ctx, const MCValue &Target,
const MCFixup &Fixup,
bool IsPCRel) const {
MCFixupKind Kind = Fixup.getKind();
if (Kind >= FirstLiteralRelocationKind)
return Kind - FirstLiteralRelocationKind;
SMLoc Loc = Fixup.getValue()->getLoc();
auto Spec = static_cast<PPCMCExpr::Specifier>(Target.getSpecifier());
switch (Spec) {

3
llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFObjectWriter.cpp

@ -53,9 +53,6 @@ unsigned RISCVELFObjectWriter::getRelocType(MCContext &Ctx,
const MCExpr *Expr = Fixup.getValue();
// Determine the type of the relocation
unsigned Kind = Fixup.getTargetKind();
if (Kind >= FirstLiteralRelocationKind)
return Kind - FirstLiteralRelocationKind;
auto Spec = RISCVMCExpr::Specifier(Target.getSpecifier());
switch (Spec) {
case RISCVMCExpr::VK_TPREL_HI:

4
llvm/lib/Target/Sparc/MCTargetDesc/SparcELFObjectWriter.cpp

@ -42,10 +42,6 @@ unsigned SparcELFObjectWriter::getRelocType(MCContext &Ctx,
const MCValue &Target,
const MCFixup &Fixup,
bool IsPCRel) const {
MCFixupKind Kind = Fixup.getKind();
if (Kind >= FirstLiteralRelocationKind)
return Kind - FirstLiteralRelocationKind;
switch (Target.getSpecifier()) {
case SparcMCExpr::VK_TLS_GD_HI22:
case SparcMCExpr::VK_TLS_GD_LO10:

2
llvm/lib/Target/SystemZ/MCTargetDesc/SystemZELFObjectWriter.cpp

@ -156,8 +156,6 @@ unsigned SystemZELFObjectWriter::getRelocType(MCContext &Ctx,
bool IsPCRel) const {
SMLoc Loc = Fixup.getLoc();
unsigned Kind = Fixup.getKind();
if (Kind >= FirstLiteralRelocationKind)
return Kind - FirstLiteralRelocationKind;
auto Specifier = SystemZMCExpr::Specifier(Target.getSpecifier());
switch (Specifier) {
case SystemZMCExpr::VK_INDNTPOFF:

2
llvm/lib/Target/X86/MCTargetDesc/X86ELFObjectWriter.cpp

@ -338,8 +338,6 @@ unsigned X86ELFObjectWriter::getRelocType(MCContext &Ctx, const MCValue &Target,
const MCFixup &Fixup,
bool IsPCRel) const {
MCFixupKind Kind = Fixup.getKind();
if (Kind >= FirstLiteralRelocationKind)
return Kind - FirstLiteralRelocationKind;
auto Specifier = X86MCExpr::Specifier(Target.getSpecifier());
switch (Specifier) {
case X86MCExpr::VK_GOTTPOFF: