[lld] r328103 - [ELF][PPC64] Fix getRelExpr for R_PPC64_REL16_LO and R_PPC64_REL16_HA

[Zaara Syeda via llvm-commits]

Author: syzaara
Date: Wed Mar 21 08:04:04 2018
New Revision: 328103

URL: http://llvm.org/viewvc/llvm-project?rev=328103&view=rev
Log:
[ELF][PPC64] Fix getRelExpr for R_PPC64_REL16_LO and R_PPC64_REL16_HA

The relocations R_PPC64_REL16_LO and R_PPC64_REL16_HA should return R_PC
for getRelExpr since they compute #lo(S + A – P) and #ha(S + A – P).

Differential Revision: https://reviews.llvm.org/D44648

Added:
    lld/trunk/test/ELF/ppc64_entry_point.s
Modified:
    lld/trunk/ELF/Arch/PPC64.cpp

Modified: lld/trunk/ELF/Arch/PPC64.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Arch/PPC64.cpp?rev=328103&r1=328102&r2=328103&view=diff
==============================================================================
--- lld/trunk/ELF/Arch/PPC64.cpp (original)
+++ lld/trunk/ELF/Arch/PPC64.cpp Wed Mar 21 08:04:04 2018
@@ -139,6 +139,9 @@ RelExpr PPC64::getRelExpr(RelType Type,
     return R_PPC_TOC;
   case R_PPC64_REL24:
     return R_PPC_PLT_OPD;
+  case R_PPC64_REL16_LO:
+  case R_PPC64_REL16_HA:
+    return R_PC;
   default:
     return R_ABS;
   }
@@ -232,10 +235,10 @@ void PPC64::relocateOne(uint8_t *Loc, Re
     write16(Loc, applyPPCHighesta(Val));
     break;
   case R_PPC64_ADDR16_LO:
+  case R_PPC64_REL16_LO:
     write16(Loc, applyPPCLo(Val));
     break;
   case R_PPC64_ADDR16_LO_DS:
-  case R_PPC64_REL16_LO:
     write16(Loc, (read16(Loc) & 3) | (applyPPCLo(Val) & ~3));
     break;
   case R_PPC64_ADDR32:

Added: lld/trunk/test/ELF/ppc64_entry_point.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/ppc64_entry_point.s?rev=328103&view=auto
==============================================================================
--- lld/trunk/test/ELF/ppc64_entry_point.s (added)
+++ lld/trunk/test/ELF/ppc64_entry_point.s Wed Mar 21 08:04:04 2018
@@ -0,0 +1,33 @@
+# REQUIRES: ppc
+# RUN: llvm-mc -filetype=obj -triple=powerpc64le-unknown-linux %s -o %t
+# RUN: ld.lld %t -o %t2
+# RUN: llvm-objdump -d %t2 | FileCheck %s
+
+.text
+.abiversion 2
+.globl  _start
+.p2align        4
+.type   _start, at function
+
+_start:
+.Lfunc_begin0:
+.Lfunc_gep0:
+  lis   4, .Lfunc_gep0 at ha
+  addi  4, 4, .Lfunc_gep0 at l
+  # now r4 should contain the address of _start
+
+  lis   5, .TOC.-.Lfunc_gep0 at ha
+  addi  5, 5, .TOC.-.Lfunc_gep0 at l
+  # now r5 should contain the offset s.t. r4 + r5 = TOC base
+
+  # exit 55
+  li    0, 1
+  li    3, 55
+  sc
+.Lfunc_end0:
+    .size   _start, .Lfunc_end0-.Lfunc_begin0
+
+// CHECK: 10010000:       01 10 80 3c     lis 4, 4097
+// CHECK-NEXT: 10010004:       00 00 84 38     addi 4, 4, 0
+// CHECK-NEXT: 10010008:       02 00 a0 3c     lis 5, 2
+// CHECK-NEXT: 1001000c:       00 80 a5 38     addi 5, 5, -32768