[lld] r295052 - [ELF] - Do sign extend for addends of R_386_8, R_386_16 relocations

George Rimar via llvm-commits llvm-commits at lists.llvm.org
Tue Feb 14 05:22:04 PST 2017


Author: grimar
Date: Tue Feb 14 07:22:03 2017
New Revision: 295052

URL: http://llvm.org/viewvc/llvm-project?rev=295052&view=rev
Log:
[ELF] - Do sign extend for addends of R_386_8, R_386_16 relocations

Patch makes addends for addends of R_386_8, R_386_16 relocations
be sign extended.

The same we did earlier for PC ones,
currenly LLD fails to link linux kernel, 
reporting relocation out of range because of this.

Differential revision: https://reviews.llvm.org/D29714

Added:
    lld/trunk/test/ELF/i386-reloc8-reloc16-addend.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=295052&r1=295051&r2=295052&view=diff
==============================================================================
--- lld/trunk/ELF/Target.cpp (original)
+++ lld/trunk/ELF/Target.cpp Tue Feb 14 07:22:03 2017
@@ -491,11 +491,9 @@ int64_t X86TargetInfo::getImplicitAddend
   default:
     return 0;
   case R_386_8:
-    return *Buf;
   case R_386_PC8:
     return SignExtend64<8>(*Buf);
   case R_386_16:
-    return read16le(Buf);
   case R_386_PC16:
     return SignExtend64<16>(read16le(Buf));
   case R_386_32:

Added: lld/trunk/test/ELF/i386-reloc8-reloc16-addend.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/i386-reloc8-reloc16-addend.s?rev=295052&view=auto
==============================================================================
--- lld/trunk/test/ELF/i386-reloc8-reloc16-addend.s (added)
+++ lld/trunk/test/ELF/i386-reloc8-reloc16-addend.s Tue Feb 14 07:22:03 2017
@@ -0,0 +1,17 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=i386-pc-linux-gnu %s -o %t1.o
+
+# RUN: ld.lld -Ttext=0x0 %t1.o -o %t.out
+# RUN: llvm-objdump -s -t %t.out | FileCheck %s
+# CHECK:      Contents of section .text:
+# CHECK-NEXT:  0000 020100 
+## 0x3 + addend(-1) = 0x02
+## 0x3 + addend(-2) = 0x0100
+# CHECK: SYMBOL TABLE:
+# CHECK: 00000003 .und
+
+.byte  und-1
+.short und-2
+
+.section .und, "ax"
+und:




More information about the llvm-commits mailing list