[PATCH] D28841: ELF: Add support for relocation type R_X86_64_8.

[Peter Collingbourne via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL292330: ELF: Add support for relocation type R_X86_64_8. (authored by pcc).

Changed prior to commit:
  https://reviews.llvm.org/D28841?vs=84789&id=84790#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D28841

Files:
  lld/trunk/ELF/Target.cpp
  lld/trunk/test/ELF/Inputs/x86-64-reloc-8-error.s
  lld/trunk/test/ELF/Inputs/x86-64-reloc-8.s
  lld/trunk/test/ELF/x86-64-reloc-8.s


Index: lld/trunk/test/ELF/x86-64-reloc-8.s
===================================================================
--- lld/trunk/test/ELF/x86-64-reloc-8.s
+++ lld/trunk/test/ELF/x86-64-reloc-8.s
@@ -0,0 +1,14 @@
+// REQUIRES: x86
+
+// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %S/Inputs/x86-64-reloc-8.s -o %t1
+// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %S/Inputs/x86-64-reloc-8-error.s -o %t2
+// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t
+// RUN: ld.lld -shared %t %t1 -o %t3
+
+// CHECK:      Contents of section .text:
+// CHECK-NEXT:   200000 42
+
+// RUN: not ld.lld -shared %t %t2 -o %t4 2>&1 | FileCheck --check-prefix=ERROR %s
+// ERROR: relocation R_X86_64_8 out of range
+
+.byte foo
Index: lld/trunk/test/ELF/Inputs/x86-64-reloc-8.s
===================================================================
--- lld/trunk/test/ELF/Inputs/x86-64-reloc-8.s
+++ lld/trunk/test/ELF/Inputs/x86-64-reloc-8.s
@@ -0,0 +1,3 @@
+.globl foo
+.hidden foo
+foo = 0x42
Index: lld/trunk/test/ELF/Inputs/x86-64-reloc-8-error.s
===================================================================
--- lld/trunk/test/ELF/Inputs/x86-64-reloc-8-error.s
+++ lld/trunk/test/ELF/Inputs/x86-64-reloc-8-error.s
@@ -0,0 +1,3 @@
+.globl foo
+.hidden foo
+foo = 256
Index: lld/trunk/ELF/Target.cpp
===================================================================
--- lld/trunk/ELF/Target.cpp
+++ lld/trunk/ELF/Target.cpp
@@ -631,6 +631,7 @@
 RelExpr X86_64TargetInfo<ELFT>::getRelExpr(uint32_t Type,
                                            const SymbolBody &S) const {
   switch (Type) {
+  case R_X86_64_8:
   case R_X86_64_32:
   case R_X86_64_32S:
   case R_X86_64_64:
@@ -857,6 +858,10 @@
 void X86_64TargetInfo<ELFT>::relocateOne(uint8_t *Loc, uint32_t Type,
                                          uint64_t Val) const {
   switch (Type) {
+  case R_X86_64_8:
+    checkUInt<8>(Loc, Val, Type);
+    *Loc = Val;
+    break;
   case R_X86_64_32:
     checkUInt<32>(Loc, Val, Type);
     write32le(Loc, Val);


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D28841.84790.patch
Type: text/x-patch
Size: 2033 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170118/519490aa/attachment.bin>