diff options
| -rw-r--r-- | lld/lib/ReaderWriter/ELF/Mips/MipsRelocationHandler.cpp | 3 | ||||
| -rw-r--r-- | lld/lib/ReaderWriter/ELF/Mips/MipsRelocationPass.cpp | 2 | ||||
| -rw-r--r-- | lld/test/elf/Mips/rel-lit-micro.test | 59 |
3 files changed, 64 insertions, 0 deletions
diff --git a/lld/lib/ReaderWriter/ELF/Mips/MipsRelocationHandler.cpp b/lld/lib/ReaderWriter/ELF/Mips/MipsRelocationHandler.cpp index 96d664bdc00..51c7376a836 100644 --- a/lld/lib/ReaderWriter/ELF/Mips/MipsRelocationHandler.cpp +++ b/lld/lib/ReaderWriter/ELF/Mips/MipsRelocationHandler.cpp @@ -129,6 +129,7 @@ static MipsRelocationParams getRelocationParams(uint32_t rType) { case R_MIPS_TLS_TPREL_LO16: return {4, 0xffff, 0, false, dummyCheck}; case R_MICROMIPS_GPREL16: + case R_MICROMIPS_LITERAL: return {4, 0xffff, 0, true, signedCheck<16>}; case R_MICROMIPS_GPREL7_S2: return {4, 0x7f, 2, false, signedCheck<9>}; @@ -459,6 +460,7 @@ static ErrorOr<int64_t> calculateRelocation(Reference::KindValue kind, case R_MIPS_LITERAL: case R_MICROMIPS_GPREL16: case R_MICROMIPS_GPREL7_S2: + case R_MICROMIPS_LITERAL: return tgtAddr + addend - gpAddr; case R_MIPS_JALR: case R_MICROMIPS_JALR: @@ -636,6 +638,7 @@ Reference::Addend readMipsRelocAddend(Reference::KindValue kind, case R_MICROMIPS_GPREL16: case R_MIPS_PCLO16: case R_MIPS_LITERAL: + case R_MICROMIPS_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 3fec1e12417..1d7f01b3b08 100644 --- a/lld/lib/ReaderWriter/ELF/Mips/MipsRelocationPass.cpp +++ b/lld/lib/ReaderWriter/ELF/Mips/MipsRelocationPass.cpp @@ -579,6 +579,7 @@ void RelocationPass<ELFT>::handleReference(const MipsELFDefinedAtom<ELFT> &atom, case R_MICROMIPS_GPREL16: case R_MICROMIPS_GPREL7_S2: case R_MIPS_LITERAL: + case R_MICROMIPS_LITERAL: if (isLocal(ref.target())) ref.setAddend(ref.addend() + atom.file().getGP0()); break; @@ -626,6 +627,7 @@ static bool isConstrainSym(const MipsELFDefinedAtom<ELFT> &atom, case R_MICROMIPS_GPREL16: case R_MICROMIPS_GPREL7_S2: case R_MIPS_LITERAL: + case R_MICROMIPS_LITERAL: return false; default: return true; diff --git a/lld/test/elf/Mips/rel-lit-micro.test b/lld/test/elf/Mips/rel-lit-micro.test new file mode 100644 index 00000000000..1a4671dba7b --- /dev/null +++ b/lld/test/elf/Mips/rel-lit-micro.test @@ -0,0 +1,59 @@ +# Check handling of R_MICROMIPS_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 00000f10 +# ^ 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, EF_MIPS_MICROMIPS] + +Sections: + - Name: .text + Type: SHT_PROGBITS + Flags: [ SHF_ALLOC, SHF_EXECINSTR ] + AddressAlign: 16 + Content: "0000ff7f" + + - Name: .rel.text + Type: SHT_REL + Link: .symtab + AddressAlign: 4 + Info: .text + Relocations: + - Offset: 0 + Symbol: D0 + Type: R_MICROMIPS_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 + Other: [STO_MIPS_MICROMIPS] + - Name: D0 + Type: STT_OBJECT + Section: .data + Value: 0 + Size: 4 +... |
