Skip to content

[MC][Mips] Generate required IMAGE_REL_MIPS_PAIR relocation #120876

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 20, 2025
Merged

[MC][Mips] Generate required IMAGE_REL_MIPS_PAIR relocation #120876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions llvm/lib/MC/WinCOFFObjectWriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -772,7 +772,10 @@ void WinCOFFWriter::assignFileOffsets(MCAssembler &Asm) {

for (auto &Relocation : Sec->Relocations) {
assert(Relocation.Symb->getIndex() != -1);
Relocation.Data.SymbolTableIndex = Relocation.Symb->getIndex();
if (Header.Machine != COFF::IMAGE_FILE_MACHINE_R4000 ||
Relocation.Data.Type != COFF::IMAGE_REL_MIPS_PAIR) {
Relocation.Data.SymbolTableIndex = Relocation.Symb->getIndex();
}
}
}

Expand Down Expand Up @@ -966,8 +969,18 @@ void WinCOFFWriter::recordRelocation(MCAssembler &Asm,
if (Fixup.getKind() == FK_SecRel_2)
FixedValue = 0;

if (OWriter.TargetObjectWriter->recordRelocation(Fixup))
if (OWriter.TargetObjectWriter->recordRelocation(Fixup)) {
Sec->Relocations.push_back(Reloc);
if (Header.Machine == COFF::IMAGE_FILE_MACHINE_R4000 &&
(Reloc.Data.Type == COFF::IMAGE_REL_MIPS_REFHI ||
Reloc.Data.Type == COFF::IMAGE_REL_MIPS_SECRELHI)) {
// IMAGE_REL_MIPS_REFHI and IMAGE_REL_MIPS_SECRELHI *must*
// be followed by IMAGE_REL_MIPS_PAIR
auto RelocPair = Reloc;
RelocPair.Data.Type = COFF::IMAGE_REL_MIPS_PAIR;
Sec->Relocations.push_back(RelocPair);
}
}
}

static std::time_t getTime() {
Expand Down
3 changes: 3 additions & 0 deletions llvm/test/MC/Mips/coff-relocs.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ define i32 @foo_var() {
; CHECK: - VirtualAddress: 32
; CHECK: SymbolName: var
; CHECK: Type: IMAGE_REL_MIPS_REFHI
; CHECK: - VirtualAddress: 32
; CHECK: SymbolName: .text
; CHECK: Type: IMAGE_REL_MIPS_PAIR
; CHECK: - VirtualAddress: 40
; CHECK: SymbolName: var
; CHECK: Type: IMAGE_REL_MIPS_REFLO
Expand Down
Loading