diff options
| -rw-r--r-- | lld/lib/ReaderWriter/ELF/Mips/MipsRelocationHandler.cpp | 4 | ||||
| -rw-r--r-- | lld/lib/ReaderWriter/ELF/Mips/MipsRelocationPass.cpp | 2 | ||||
| -rw-r--r-- | lld/test/elf/Mips/rel-lit.test | 57 |
3 files changed, 62 insertions, 1 deletions
diff --git a/lld/lib/ReaderWriter/ELF/Mips/MipsRelocationHandler.cpp b/lld/lib/ReaderWriter/ELF/Mips/MipsRelocationHandler.cpp index fe1c2b6494e..96d664bdc00 100644 --- a/lld/lib/ReaderWriter/ELF/Mips/MipsRelocationHandler.cpp +++ b/lld/lib/ReaderWriter/ELF/Mips/MipsRelocationHandler.cpp @@ -117,6 +117,7 @@ static MipsRelocationParams getRelocationParams(uint32_t rType) { case R_MIPS_TLS_GD: case R_MIPS_TLS_LDM: case R_MIPS_TLS_GOTTPREL: + case R_MIPS_LITERAL: return {4, 0xffff, 0, false, signedCheck<16>}; case R_MIPS_GOT_HI16: case R_MIPS_GOT_LO16: @@ -455,7 +456,7 @@ static ErrorOr<int64_t> calculateRelocation(Reference::KindValue kind, return relocLo16(0, tgtAddr, addend, false, true); case R_MIPS_GPREL16: case R_MIPS_GPREL32: - return tgtAddr + addend - gpAddr; + case R_MIPS_LITERAL: case R_MICROMIPS_GPREL16: case R_MICROMIPS_GPREL7_S2: return tgtAddr + addend - gpAddr; @@ -634,6 +635,7 @@ Reference::Addend readMipsRelocAddend(Reference::KindValue kind, case R_MIPS_GPREL16: case R_MICROMIPS_GPREL16: case R_MIPS_PCLO16: + case R_MIPS_LITERAL: return llvm::SignExtend32<16>(res); case R_MICROMIPS_GPREL7_S2: return llvm::SignExtend32<9>(res); diff --git a/lld/lib/ReaderWriter/ELF/Mips/MipsRelocationPass.cpp b/lld/lib/ReaderWriter/ELF/Mips/MipsRelocationPass.cpp index 372990823ea..3fec1e12417 100644 --- a/lld/lib/ReaderWriter/ELF/Mips/MipsRelocationPass.cpp +++ b/lld/lib/ReaderWriter/ELF/Mips/MipsRelocationPass.cpp @@ -578,6 +578,7 @@ void RelocationPass<ELFT>::handleReference(const MipsELFDefinedAtom<ELFT> &atom, case R_MIPS_GPREL16: case R_MICROMIPS_GPREL16: case R_MICROMIPS_GPREL7_S2: + case R_MIPS_LITERAL: if (isLocal(ref.target())) ref.setAddend(ref.addend() + atom.file().getGP0()); break; @@ -624,6 +625,7 @@ static bool isConstrainSym(const MipsELFDefinedAtom<ELFT> &atom, case R_MIPS_GPREL32: case R_MICROMIPS_GPREL16: case R_MICROMIPS_GPREL7_S2: + case R_MIPS_LITERAL: return false; default: return true; diff --git a/lld/test/elf/Mips/rel-lit.test b/lld/test/elf/Mips/rel-lit.test new file mode 100644 index 00000000000..dcdc5429b7a --- /dev/null +++ b/lld/test/elf/Mips/rel-lit.test @@ -0,0 +1,57 @@ +# Check handling of R_MIPS_LITERAL relocation. + +# RUN: yaml2obj -format=elf %s > %t.o +# RUN: lld -flavor gnu -target mipsel -e T0 -o %t.exe %t.o +# RUN: llvm-objdump -s -t %t.exe | FileCheck %s + +# CHECK: Contents of section .text: +# CHECK-NEXT: 400130 0f100000 +# ^ 0x402000 + 0x7fff - 0x408ff0 = 0x100f + +# CHECK: 00402000 g .data 00000004 D0 +# CHECK: 00408ff0 g *ABS* 00000000 _gp_disp + +--- +FileHeader: + Class: ELFCLASS32 + Data: ELFDATA2LSB + Type: ET_REL + Machine: EM_MIPS + Flags: [EF_MIPS_PIC, EF_MIPS_CPIC, EF_MIPS_ABI_O32, EF_MIPS_ARCH_32] + +Sections: + - Name: .text + Type: SHT_PROGBITS + Flags: [ SHF_ALLOC, SHF_EXECINSTR ] + AddressAlign: 16 + Content: "ff7f0000" + + - Name: .rel.text + Type: SHT_REL + Link: .symtab + AddressAlign: 4 + Info: .text + Relocations: + - Offset: 0 + Symbol: D0 + Type: R_MIPS_LITERAL + + - Name: .data + Type: SHT_PROGBITS + Flags: [ SHF_ALLOC, SHF_WRITE ] + AddressAlign: 16 + Size: 4 + +Symbols: + Global: + - Name: T0 + Type: STT_FUNC + Section: .text + Value: 0 + Size: 4 + - Name: D0 + Type: STT_OBJECT + Section: .data + Value: 0 + Size: 4 +... |
