[lld] r279118 - [ELF][MIPS] Support R_MIPS_CALL_HI16 / R_MIPS_CALL_LO16 relocations calculation

[Simon Atanasyan via llvm-commits]

Author: atanasyan
Date: Thu Aug 18 14:08:36 2016
New Revision: 279118

URL: http://llvm.org/viewvc/llvm-project?rev=279118&view=rev
Log:
[ELF][MIPS] Support R_MIPS_CALL_HI16 / R_MIPS_CALL_LO16 relocations calculation

Added:
    lld/trunk/test/ELF/mips-call-hilo.s
Modified:
    lld/trunk/ELF/Target.cpp

Modified: lld/trunk/ELF/Target.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Target.cpp?rev=279118&r1=279117&r2=279118&view=diff
==============================================================================
--- lld/trunk/ELF/Target.cpp (original)
+++ lld/trunk/ELF/Target.cpp Thu Aug 18 14:08:36 2016
@@ -1901,6 +1901,8 @@ RelExpr MipsTargetInfo<ELFT>::getRelExpr
       return R_MIPS_GOT_LOCAL_PAGE;
   // fallthrough
   case R_MIPS_CALL16:
+  case R_MIPS_CALL_HI16:
+  case R_MIPS_CALL_LO16:
   case R_MIPS_GOT_DISP:
   case R_MIPS_TLS_GOTTPREL:
     return R_MIPS_GOT_OFF;
@@ -2128,6 +2130,7 @@ void MipsTargetInfo<ELFT>::relocateOne(u
     checkInt<16>(Val, Type);
   // fallthrough
   case R_MIPS_CALL16:
+  case R_MIPS_CALL_LO16:
   case R_MIPS_GOT_OFST:
   case R_MIPS_LO16:
   case R_MIPS_PCLO16:
@@ -2136,6 +2139,7 @@ void MipsTargetInfo<ELFT>::relocateOne(u
   case R_MIPS_TLS_TPREL_LO16:
     writeMipsLo16<E>(Loc, Val);
     break;
+  case R_MIPS_CALL_HI16:
   case R_MIPS_HI16:
   case R_MIPS_PCHI16:
   case R_MIPS_TLS_DTPREL_HI16:

Added: lld/trunk/test/ELF/mips-call-hilo.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/mips-call-hilo.s?rev=279118&view=auto
==============================================================================
--- lld/trunk/test/ELF/mips-call-hilo.s (added)
+++ lld/trunk/test/ELF/mips-call-hilo.s Thu Aug 18 14:08:36 2016
@@ -0,0 +1,62 @@
+# Check R_MIPS_CALL_HI16 / R_MIPS_CALL_LO16 relocations calculation.
+
+# RUN: llvm-mc -filetype=obj -triple=mips-unknown-linux %s -o %t.o
+# RUN: ld.lld %t.o -shared -o %t.so
+# RUN: llvm-objdump -d %t.so | FileCheck %s
+# RUN: llvm-readobj -r -mips-plt-got %t.so | FileCheck -check-prefix=GOT %s
+
+# REQUIRES: mips
+
+# CHECK:      Disassembly of section .text:
+# CHECK-NEXT: foo:
+# CHECK-NEXT:    10000:       3c 02 00 00     lui     $2, 0
+# CHECK-NEXT:    10004:       8c 42 80 20     lw      $2, -32736($2)
+# CHECK-NEXT:    10008:       3c 02 00 00     lui     $2, 0
+# CHECK-NEXT:    1000c:       8c 42 80 18     lw      $2, -32744($2)
+# CHECK-NEXT:    10010:       3c 02 00 00     lui     $2, 0
+# CHECK-NEXT:    10014:       8c 42 80 1c     lw      $2, -32740($2)
+
+# GOT:      Relocations [
+# GOT-NEXT: ]
+
+# GOT:      Primary GOT {
+# GOT-NEXT:   Canonical gp value: 0x27FF0
+# GOT:        Local entries [
+# GOT-NEXT:     Entry {
+# GOT-NEXT:       Address: 0x20008
+# GOT-NEXT:       Access: -32744
+# GOT-NEXT:       Initial: 0x10018
+# GOT-NEXT:     }
+# GOT-NEXT:     Entry {
+# GOT-NEXT:       Address: 0x2000C
+# GOT-NEXT:       Access: -32740
+# GOT-NEXT:       Initial: 0x1001C
+# GOT-NEXT:     }
+# GOT-NEXT:   ]
+# GOT-NEXT:   Global entries [
+# GOT-NEXT:     Entry {
+# GOT-NEXT:       Address: 0x20010
+# GOT-NEXT:       Access: -32736
+# GOT-NEXT:       Initial: 0x0
+# GOT-NEXT:       Value: 0x0
+# GOT-NEXT:       Type: None
+# GOT-NEXT:       Section: Undefined
+# GOT-NEXT:       Name: bar
+# GOT-NEXT:     }
+# GOT-NEXT:   ]
+# GOT-NEXT:   Number of TLS and multi-GOT entries: 0
+# GOT-NEXT: }
+
+  .text
+  .global foo
+foo:
+  lui   $2, %call_hi(bar)
+  lw    $2, %call_lo(bar)($2)
+  lui   $2, %call_hi(loc1)
+  lw    $2, %call_lo(loc1)($2)
+  lui   $2, %call_hi(loc2)
+  lw    $2, %call_lo(loc2)($2)
+loc1:
+  nop
+loc2:
+  nop