[lld] r294965 - Implement R_X86_64_16.

[Rafael Espindola via llvm-commits]

Author: rafael
Date: Mon Feb 13 10:21:34 2017
New Revision: 294965

URL: http://llvm.org/viewvc/llvm-project?rev=294965&view=rev
Log:
Implement R_X86_64_16.

It is used by qemu.

Added:
    lld/trunk/test/ELF/Inputs/x86-64-reloc-16-error.s
    lld/trunk/test/ELF/Inputs/x86-64-reloc-16.s
    lld/trunk/test/ELF/x86-64-reloc-16.s
Modified:
    lld/trunk/ELF/Target.cpp

Modified: lld/trunk/ELF/Target.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Target.cpp?rev=294965&r1=294964&r2=294965&view=diff
==============================================================================
--- lld/trunk/ELF/Target.cpp (original)
+++ lld/trunk/ELF/Target.cpp Mon Feb 13 10:21:34 2017
@@ -650,6 +650,7 @@ RelExpr X86_64TargetInfo<ELFT>::getRelEx
                                            const SymbolBody &S) const {
   switch (Type) {
   case R_X86_64_8:
+  case R_X86_64_16:
   case R_X86_64_32:
   case R_X86_64_32S:
   case R_X86_64_64:
@@ -879,6 +880,10 @@ void X86_64TargetInfo<ELFT>::relocateOne
     checkUInt<8>(Loc, Val, Type);
     *Loc = Val;
     break;
+  case R_X86_64_16:
+    checkUInt<16>(Loc, Val, Type);
+    write16le(Loc, Val);
+    break;
   case R_X86_64_32:
     checkUInt<32>(Loc, Val, Type);
     write32le(Loc, Val);

Added: lld/trunk/test/ELF/Inputs/x86-64-reloc-16-error.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/Inputs/x86-64-reloc-16-error.s?rev=294965&view=auto
==============================================================================
--- lld/trunk/test/ELF/Inputs/x86-64-reloc-16-error.s (added)
+++ lld/trunk/test/ELF/Inputs/x86-64-reloc-16-error.s Mon Feb 13 10:21:34 2017
@@ -0,0 +1,3 @@
+.globl foo
+.hidden foo
+foo = 65536

Added: lld/trunk/test/ELF/Inputs/x86-64-reloc-16.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/Inputs/x86-64-reloc-16.s?rev=294965&view=auto
==============================================================================
--- lld/trunk/test/ELF/Inputs/x86-64-reloc-16.s (added)
+++ lld/trunk/test/ELF/Inputs/x86-64-reloc-16.s Mon Feb 13 10:21:34 2017
@@ -0,0 +1,3 @@
+.globl foo
+.hidden foo
+foo = 0x42

Added: lld/trunk/test/ELF/x86-64-reloc-16.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/x86-64-reloc-16.s?rev=294965&view=auto
==============================================================================
--- lld/trunk/test/ELF/x86-64-reloc-16.s (added)
+++ lld/trunk/test/ELF/x86-64-reloc-16.s Mon Feb 13 10:21:34 2017
@@ -0,0 +1,14 @@
+// REQUIRES: x86
+
+// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %S/Inputs/x86-64-reloc-16.s -o %t1
+// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %S/Inputs/x86-64-reloc-16-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_16 out of range
+
+.short foo