Skip to content

Commit 158fa4a

Browse files
committed
AMDGPU: Replace deprecated FK_PCRel_ with FK_Data_ fixup and PCRel flag
We will unify the generic fixup kinds FK_Data_ and FK_PCRel_. A FK_PCRel_ kind is essentially the corresponding FK_Data_ fixup with the PCRel flag set.
1 parent 49c91ec commit 158fa4a

File tree

3 files changed

+2
-11
lines changed

3 files changed

+2
-11
lines changed

llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUAsmBackend.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ static unsigned getFixupKindNumBytes(unsigned Kind) {
9494
return 2;
9595
case FK_SecRel_4:
9696
case FK_Data_4:
97-
case FK_PCRel_4:
9897
return 4;
9998
case FK_SecRel_8:
10099
case FK_Data_8:
@@ -121,7 +120,6 @@ static uint64_t adjustFixupValue(const MCFixup &Fixup, uint64_t Value,
121120
case FK_Data_2:
122121
case FK_Data_4:
123122
case FK_Data_8:
124-
case FK_PCRel_4:
125123
case FK_SecRel_4:
126124
return Value;
127125
default:

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,6 @@ unsigned AMDGPUELFObjectWriter::getRelocType(const MCFixup &Fixup,
6969
MCFixupKind Kind = Fixup.getKind();
7070
switch (Kind) {
7171
default: break;
72-
case FK_PCRel_4:
73-
return ELF::R_AMDGPU_REL32;
7472
case FK_Data_4:
7573
case FK_SecRel_4:
7674
return IsPCRel ? ELF::R_AMDGPU_REL32 : ELF::R_AMDGPU_ABS32;

llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCCodeEmitter.cpp

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -656,16 +656,11 @@ void AMDGPUMCCodeEmitter::getMachineOpValueCommon(
656656
//
657657
// .Ltmp1:
658658
// s_add_u32 s2, s2, (extern_const_addrspace+16)-.Ltmp1
659-
MCFixupKind Kind;
660-
if (needsPCRel(MO.getExpr()))
661-
Kind = FK_PCRel_4;
662-
else
663-
Kind = FK_Data_4;
664-
659+
bool PCRel = needsPCRel(MO.getExpr());
665660
const MCInstrDesc &Desc = MCII.get(MI.getOpcode());
666661
uint32_t Offset = Desc.getSize();
667662
assert(Offset == 4 || Offset == 8);
668-
addFixup(Fixups, Offset, MO.getExpr(), Kind, Kind == FK_PCRel_4);
663+
addFixup(Fixups, Offset, MO.getExpr(), FK_Data_4, PCRel);
669664
}
670665

671666
const MCInstrDesc &Desc = MCII.get(MI.getOpcode());

0 commit comments

Comments
 (0)