[lld] r333294 - Fix a bug that we truncated GOTPLT entries to 32 bits.

Rui Ueyama via llvm-commits llvm-commits at lists.llvm.org
Fri May 25 11:26:14 PDT 2018


Author: ruiu
Date: Fri May 25 11:26:14 2018
New Revision: 333294

URL: http://llvm.org/viewvc/llvm-project?rev=333294&view=rev
Log:
Fix a bug that we truncated GOTPLT entries to 32 bits.

Added:
    lld/trunk/test/ELF/x86-64-plt-high-addr.s
Modified:
    lld/trunk/ELF/Arch/X86_64.cpp

Modified: lld/trunk/ELF/Arch/X86_64.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Arch/X86_64.cpp?rev=333294&r1=333293&r2=333294&view=diff
==============================================================================
--- lld/trunk/ELF/Arch/X86_64.cpp (original)
+++ lld/trunk/ELF/Arch/X86_64.cpp Fri May 25 11:26:14 2018
@@ -123,7 +123,7 @@ template <class ELFT> void X86_64<ELFT>:
 template <class ELFT>
 void X86_64<ELFT>::writeGotPlt(uint8_t *Buf, const Symbol &S) const {
   // See comments in X86::writeGotPlt.
-  write32le(Buf, S.getPltVA() + 6);
+  write64le(Buf, S.getPltVA() + 6);
 }
 
 template <class ELFT> void X86_64<ELFT>::writePltHeader(uint8_t *Buf) const {

Added: lld/trunk/test/ELF/x86-64-plt-high-addr.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/x86-64-plt-high-addr.s?rev=333294&view=auto
==============================================================================
--- lld/trunk/test/ELF/x86-64-plt-high-addr.s (added)
+++ lld/trunk/test/ELF/x86-64-plt-high-addr.s Fri May 25 11:26:14 2018
@@ -0,0 +1,16 @@
+// REQUIRES: x86
+
+// RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %p/Inputs/shared.s -o %t1.o
+// RUN: ld.lld -o %t.so -shared %t1.o
+
+// RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t2.o
+// RUN: ld.lld -o %t.exe %t2.o %t.so -image-base=0xcafe00000000
+// RUN: llvm-objdump -s -j .got.plt %t.exe | FileCheck %s
+
+// CHECK:      Contents of section .got.plt:
+// CHECK-NEXT: cafe00002000 00300000 feca0000 00000000 00000000
+// CHECK-NEXT: cafe00002010 00000000 00000000 26100000 feca0000
+
+.global _start
+_start:
+  jmp bar at PLT




More information about the llvm-commits mailing list