[lld] r294988 - Fix checks for R_386_8 and R_386_16.

[Rafael Espindola via llvm-commits]

Author: rafael
Date: Mon Feb 13 15:29:56 2017
New Revision: 294988

URL: http://llvm.org/viewvc/llvm-project?rev=294988&view=rev
Log:
Fix checks for R_386_8 and R_386_16.

Results created by these relocations are expected to be zero extended
at runtime.

Added:
    lld/trunk/test/ELF/Inputs/i386-reloc-16-error.s
    lld/trunk/test/ELF/Inputs/i386-reloc-16.s
    lld/trunk/test/ELF/Inputs/i386-reloc-8-error.s
    lld/trunk/test/ELF/Inputs/i386-reloc-8.s
    lld/trunk/test/ELF/i386-reloc-16.s
    lld/trunk/test/ELF/i386-reloc-8.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=294988&r1=294987&r2=294988&view=diff
==============================================================================
--- lld/trunk/ELF/Target.cpp (original)
+++ lld/trunk/ELF/Target.cpp Mon Feb 13 15:29:56 2017
@@ -517,11 +517,17 @@ void X86TargetInfo::relocateOne(uint8_t
   // we want to support them.
   switch (Type) {
   case R_386_8:
+    checkUInt<8>(Loc, Val, Type);
+    *Loc = Val;
+    break;
   case R_386_PC8:
     checkInt<8>(Loc, Val, Type);
     *Loc = Val;
     break;
   case R_386_16:
+    checkUInt<16>(Loc, Val, Type);
+    write16le(Loc, Val);
+    break;
   case R_386_PC16:
     checkInt<16>(Loc, Val, Type);
     write16le(Loc, Val);

Added: lld/trunk/test/ELF/Inputs/i386-reloc-16-error.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/Inputs/i386-reloc-16-error.s?rev=294988&view=auto
==============================================================================
--- lld/trunk/test/ELF/Inputs/i386-reloc-16-error.s (added)
+++ lld/trunk/test/ELF/Inputs/i386-reloc-16-error.s Mon Feb 13 15:29:56 2017
@@ -0,0 +1,3 @@
+.globl foo
+.hidden foo
+foo = 65536

Added: lld/trunk/test/ELF/Inputs/i386-reloc-16.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/Inputs/i386-reloc-16.s?rev=294988&view=auto
==============================================================================
--- lld/trunk/test/ELF/Inputs/i386-reloc-16.s (added)
+++ lld/trunk/test/ELF/Inputs/i386-reloc-16.s Mon Feb 13 15:29:56 2017
@@ -0,0 +1,3 @@
+.globl foo
+.hidden foo
+foo = 0xffff

Added: lld/trunk/test/ELF/Inputs/i386-reloc-8-error.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/Inputs/i386-reloc-8-error.s?rev=294988&view=auto
==============================================================================
--- lld/trunk/test/ELF/Inputs/i386-reloc-8-error.s (added)
+++ lld/trunk/test/ELF/Inputs/i386-reloc-8-error.s Mon Feb 13 15:29:56 2017
@@ -0,0 +1,3 @@
+.globl foo
+.hidden foo
+foo = 256

Added: lld/trunk/test/ELF/Inputs/i386-reloc-8.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/Inputs/i386-reloc-8.s?rev=294988&view=auto
==============================================================================
--- lld/trunk/test/ELF/Inputs/i386-reloc-8.s (added)
+++ lld/trunk/test/ELF/Inputs/i386-reloc-8.s Mon Feb 13 15:29:56 2017
@@ -0,0 +1,3 @@
+.globl foo
+.hidden foo
+foo = 0xff

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

Added: lld/trunk/test/ELF/i386-reloc-8.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/i386-reloc-8.s?rev=294988&view=auto
==============================================================================
--- lld/trunk/test/ELF/i386-reloc-8.s (added)
+++ lld/trunk/test/ELF/i386-reloc-8.s Mon Feb 13 15:29:56 2017
@@ -0,0 +1,14 @@
+// REQUIRES: x86
+
+// RUN: llvm-mc -filetype=obj -triple=i386-pc-linux %S/Inputs/i386-reloc-8.s -o %t1
+// RUN: llvm-mc -filetype=obj -triple=i386-pc-linux %S/Inputs/i386-reloc-8-error.s -o %t2
+// RUN: llvm-mc -filetype=obj -triple=i386-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_386_8 out of range
+
+.byte foo