diff options
Diffstat (limited to 'lld')
| -rw-r--r-- | lld/ELF/Target.cpp | 12 | ||||
| -rw-r--r-- | lld/test/ELF/mips-64-got.s | 80 |
2 files changed, 90 insertions, 2 deletions
diff --git a/lld/ELF/Target.cpp b/lld/ELF/Target.cpp index ccc0efacbae..df41fcde999 100644 --- a/lld/ELF/Target.cpp +++ b/lld/ELF/Target.cpp @@ -1252,6 +1252,7 @@ RelExpr MipsTargetInfo<ELFT>::getRelExpr(uint32_t Type, return R_PLT; case R_MIPS_HI16: case R_MIPS_LO16: + case R_MIPS_GOT_OFST: // MIPS _gp_disp designates offset between start of function and 'gp' // pointer into GOT. __gnu_local_gp is equal to the current value of // the 'gp'. Therefore any relocations against them do not require @@ -1268,12 +1269,16 @@ RelExpr MipsTargetInfo<ELFT>::getRelExpr(uint32_t Type, case R_MIPS_PCLO16: return R_PC; case R_MIPS_GOT16: - case R_MIPS_CALL16: if (S.isLocal()) return R_MIPS_GOT_LOCAL; + // fallthrough + case R_MIPS_CALL16: + case R_MIPS_GOT_DISP: if (!S.isPreemptible()) return R_MIPS_GOT; return R_GOT_OFF; + case R_MIPS_GOT_PAGE: + return R_MIPS_GOT_LOCAL; } } @@ -1451,10 +1456,13 @@ void MipsTargetInfo<ELFT>::relocateOne(uint8_t *Loc, uint32_t Type, write32<E>(Loc, (Instr & ~0x3ffffff) | (Val >> 2)); break; } + case R_MIPS_GOT_DISP: + case R_MIPS_GOT_PAGE: case R_MIPS_GOT16: checkInt<16>(Val, Type); // fallthrough case R_MIPS_CALL16: + case R_MIPS_GOT_OFST: writeMipsLo16<E>(Loc, Val); break; case R_MIPS_GPREL16: { @@ -1515,7 +1523,7 @@ void MipsTargetInfo<ELFT>::relocateOne(uint8_t *Loc, uint32_t Type, template <class ELFT> bool MipsTargetInfo<ELFT>::usesOnlyLowPageBits(uint32_t Type) const { - return Type == R_MIPS_LO16; + return Type == R_MIPS_LO16 || Type == R_MIPS_GOT_OFST; } } } diff --git a/lld/test/ELF/mips-64-got.s b/lld/test/ELF/mips-64-got.s new file mode 100644 index 00000000000..7a078d6560b --- /dev/null +++ b/lld/test/ELF/mips-64-got.s @@ -0,0 +1,80 @@ +# Check MIPS N64 ABI GOT relocations + +# RUN: llvm-mc -filetype=obj -triple=mips64-unknown-linux \ +# RUN: %p/Inputs/mips-pic.s -o %t.so.o +# RUN: llvm-mc -filetype=obj -triple=mips64-unknown-linux %s -o %t.exe.o +# RUN: ld.lld %t.so.o -shared -o %t.so +# RUN: ld.lld %t.exe.o %t.so -o %t.exe +# RUN: llvm-objdump -d -t %t.exe | FileCheck %s +# RUN: llvm-readobj -r -mips-plt-got %t.exe | FileCheck -check-prefix=GOT %s + +# REQUIRES: mips + +# CHECK: __start: + +# CHECK-NEXT: 20000: df 82 80 20 ld $2, -32736($gp) +# CHECK-NEXT: 20004: 64 42 00 14 daddiu $2, $2, 20 +# CHECK-NEXT: 20008: 24 42 80 30 addiu $2, $2, -32720 +# CHECK-NEXT: 2000c: 24 42 80 28 addiu $2, $2, -32728 + +# CHECK: 0000000000020014 .text 00000000 foo +# CHECK: 0000000000037ff0 .got 00000000 .hidden _gp +# CHECK: 0000000000020000 .text 00000000 __start +# CHECK: 0000000000020010 .text 00000000 bar + +# GOT: Relocations [ +# GOT-NEXT: ] +# GOT-NEXT: Primary GOT { +# GOT-NEXT: Canonical gp value: 0x37FF0 +# GOT-NEXT: Reserved entries [ +# GOT-NEXT: Entry { +# GOT-NEXT: Address: 0x30000 +# GOT-NEXT: Access: -32752 +# GOT-NEXT: Initial: 0x0 +# GOT-NEXT: Purpose: Lazy resolver +# GOT-NEXT: } +# GOT-NEXT: Entry { +# GOT-NEXT: Address: 0x30008 +# GOT-NEXT: Access: -32744 +# GOT-NEXT: Initial: 0x8000000000000000 +# GOT-NEXT: Purpose: Module pointer (GNU extension) +# GOT-NEXT: } +# GOT-NEXT: ] +# GOT-NEXT: Local entries [ +# GOT-NEXT: Entry { +# GOT-NEXT: Address: 0x30010 +# GOT-NEXT: Access: -32736 +# GOT-NEXT: Initial: 0x20000 +# GOT-NEXT: } +# GOT-NEXT: Entry { +# GOT-NEXT: Address: 0x30018 +# GOT-NEXT: Access: -32728 +# GOT-NEXT: Initial: 0x20010 +# GOT-NEXT: } +# GOT-NEXT: ] +# GOT-NEXT: Global entries [ +# GOT-NEXT: Entry { +# GOT-NEXT: Address: 0x30020 +# GOT-NEXT: Access: -32720 +# GOT-NEXT: Initial: 0x0 +# GOT-NEXT: Value: 0x0 +# GOT-NEXT: Type: Function +# GOT-NEXT: Section: Undefined +# GOT-NEXT: Name: foo1a +# GOT-NEXT: } +# GOT-NEXT: ] +# GOT-NEXT: Number of TLS and multi-GOT entries: 0 +# GOT-NEXT: } + + .text + .global __start, bar +__start: + ld $v0,%got_page(foo)($gp) # R_MIPS_GOT_PAGE + daddiu $v0,$v0,%got_ofst(foo) # R_MIPS_GOT_OFST + addiu $v0,$v0,%got_disp(foo1a) # R_MIPS_GOT_DISP + addiu $v0,$v0,%got_disp(bar) # R_MIPS_GOT_DISP + +bar: + nop +foo: + nop |
