[lld] r338213 - [ELF][HEXAGON] Add R_HEX_32_6_X and R_HEX_12_X

[Sid Manning via llvm-commits]

Author: sidneym
Date: Sun Jul 29 04:59:38 2018
New Revision: 338213

URL: http://llvm.org/viewvc/llvm-project?rev=338213&view=rev
Log:
[ELF][HEXAGON] Add R_HEX_32_6_X and R_HEX_12_X

And add a test.

Modified:
    lld/trunk/ELF/Arch/Hexagon.cpp
    lld/trunk/test/ELF/hexagon.s

Modified: lld/trunk/ELF/Arch/Hexagon.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Arch/Hexagon.cpp?rev=338213&r1=338212&r2=338213&view=diff
==============================================================================
--- lld/trunk/ELF/Arch/Hexagon.cpp (original)
+++ lld/trunk/ELF/Arch/Hexagon.cpp Sun Jul 29 04:59:38 2018
@@ -70,6 +70,12 @@ void Hexagon::relocateOne(uint8_t *Loc,
   switch (Type) {
   case R_HEX_NONE:
     break;
+  case R_HEX_12_X:
+    or32le(Loc, applyMask(0x000007e0, Val));
+    break;
+  case R_HEX_32_6_X:
+    or32le(Loc, applyMask(0x0fff3fff, Val >> 6));
+    break;
   case R_HEX_B15_PCREL:
     or32le(Loc, applyMask(0x00df20fe, Val >> 2));
     break;

Modified: lld/trunk/test/ELF/hexagon.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/hexagon.s?rev=338213&r1=338212&r2=338213&view=diff
==============================================================================
--- lld/trunk/test/ELF/hexagon.s (original)
+++ lld/trunk/test/ELF/hexagon.s Sun Jul 29 04:59:38 2018
@@ -4,6 +4,13 @@
 # RUN: ld.lld %t2 %t  -o %t3
 # RUN: llvm-objdump -d  %t3 | FileCheck %s
 
+# Note: 69632 == 0x11000
+# R_HEX_32_6_X
+# R_HEX_12_X
+if (p0) r0 = ##_start
+# CHECK: immext(#69632)
+# CHECK: if (p0) r0 = ##69632
+
 # R_HEX_B15_PCREL
 if (p0) jump:nt #_start
 # CHECK: if (p0) jump:nt 0x11000