[PATCH] D49567: Add R_HEX_B15_PCREL_X relocation

[Sid Manning via Phabricator via llvm-commits]

sidneym created this revision.
sidneym added reviewers: ruiu, kparzysz, shankare, bcain.
sidneym added a project: lld.
Herald added subscribers: MaskRay, arichardson, emaste.
Herald added a reviewer: espindola.

Add R_HEX_B15_PCREL_X relocation and update the testcase.


Repository:
  rLLD LLVM Linker

https://reviews.llvm.org/D49567

Files:
  ELF/Arch/Hexagon.cpp
  test/ELF/hexagon.s


Index: test/ELF/hexagon.s
===================================================================
--- test/ELF/hexagon.s
+++ test/ELF/hexagon.s
@@ -8,6 +8,11 @@
 if (p0) jump:nt #_start
 # CHECK: if (p0) jump:nt 0x11000
 
+# R_HEX_B32_PCREL_X
+# R_HEX_B15_PCREL_X
+if (p0) jump:nt ##_start
+# CHECK: if (p0) jump:nt 0x11000
+
 # R_HEX_B22_PCREL
 call #_start
 # CHECK: call 0x11000
Index: ELF/Arch/Hexagon.cpp
===================================================================
--- ELF/Arch/Hexagon.cpp
+++ ELF/Arch/Hexagon.cpp
@@ -54,6 +54,7 @@
                             const uint8_t *Loc) const {
   switch (Type) {
   case R_HEX_B15_PCREL:
+  case R_HEX_B15_PCREL_X:
   case R_HEX_B22_PCREL:
   case R_HEX_B22_PCREL_X:
   case R_HEX_B32_PCREL_X:
@@ -72,6 +73,9 @@
   case R_HEX_B15_PCREL:
     or32le(Loc, applyMask(0x00df20fe, Val >> 2));
     break;
+  case R_HEX_B15_PCREL_X:
+    or32le(Loc, applyMask(0x00df20fe, Val & 0x3f));
+    break;
   case R_HEX_B22_PCREL:
     or32le(Loc, applyMask(0x1ff3ffe, Val >> 2));
     break;


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D49567.156361.patch
Type: text/x-patch
Size: 1034 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180719/c33e10b1/attachment.bin>