[PATCH] D48235: Add R_HEX_B32_PCREL_X and R_HEX_B22_PCREL_X relocations

[Sid Manning via Phabricator via llvm-commits]

sidneym updated this revision to Diff 156278.
sidneym added a comment.

Sorted relocation names


Repository:
  rLLD LLVM Linker

https://reviews.llvm.org/D48235

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


Index: test/ELF/hexagon.s
===================================================================
--- test/ELF/hexagon.s
+++ test/ELF/hexagon.s
@@ -7,3 +7,9 @@
 # R_HEX_B22_PCREL
 call #_start
 # CHECK: call 0x11000
+
+# R_HEX_B32_PCREL_X
+# R_HEX_B22_PCREL_X
+call ##_start
+# CHECK: immext(#4294967232)
+# CHECK: call 0x11000
Index: ELF/Arch/Hexagon.cpp
===================================================================
--- ELF/Arch/Hexagon.cpp
+++ ELF/Arch/Hexagon.cpp
@@ -54,6 +54,8 @@
                             const uint8_t *Loc) const {
   switch (Type) {
   case R_HEX_B22_PCREL:
+  case R_HEX_B22_PCREL_X:
+  case R_HEX_B32_PCREL_X:
     return R_PC;
   default:
     return R_ABS;
@@ -69,6 +71,12 @@
   case R_HEX_B22_PCREL:
     or32le(Loc, applyMask(0x1ff3ffe, Val >> 2));
     break;
+  case R_HEX_B22_PCREL_X:
+    or32le(Loc, applyMask(0x1ff3ffe, Val & 0x3f));
+    break;
+  case R_HEX_B32_PCREL_X:
+    or32le(Loc, applyMask(0x0fff3fff, Val >> 6));
+    break;
   default:
     error(getErrorLocation(Loc) + "unrecognized reloc " + toString(Type));
     break;


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