Skip to content

Commit

Permalink
Support R_X86_64_PC8 and R_X86_64_PC16.
Browse files Browse the repository at this point in the history
They are defined by the x86-64 ELF ABI standard.

Differential Revision: https://reviews.llvm.org/D57799

llvm-svn: 353314
  • Loading branch information
rui314 committed Feb 6, 2019
1 parent 68bc5fb commit 33dbcbb
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 0 deletions.
4 changes: 4 additions & 0 deletions lld/ELF/Arch/X86_64.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@ RelExpr X86_64<ELFT>::getRelExpr(RelType Type, const Symbol &S,
return R_SIZE;
case R_X86_64_PLT32:
return R_PLT_PC;
case R_X86_64_PC8:
case R_X86_64_PC16:
case R_X86_64_PC32:
case R_X86_64_PC64:
return R_PC;
Expand Down Expand Up @@ -319,10 +321,12 @@ template <class ELFT>
void X86_64<ELFT>::relocateOne(uint8_t *Loc, RelType Type, uint64_t Val) const {
switch (Type) {
case R_X86_64_8:
case R_X86_64_PC8:
checkUInt(Loc, Val, 8, Type);
*Loc = Val;
break;
case R_X86_64_16:
case R_X86_64_PC16:
checkUInt(Loc, Val, 16, Type);
write16le(Loc, Val);
break;
Expand Down
21 changes: 21 additions & 0 deletions lld/test/ELF/x86-64-pcrel.s
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// REQUIRES: x86

// This is a test for R_X86_64_PC8 and R_X86_64_PC16.

// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t1.o
// RUN: echo '.globl foo; foo:' | llvm-mc -filetype=obj -triple=x86_64-pc-linux - -o %t2.o
// RUN: ld.lld -o %t.exe %t1.o %t2.o
// RUN: llvm-objdump -s %t.exe | FileCheck %s

// CHECK: Contents of section .text:
// CHECK: 2000cccc cccccccc cccccccc cccccccc
// CHECK: 20cccccc cccccccc cccccccc cccccccc

.globl _start
_start:

.word foo - _start
.fill 14,1,0xcc

.byte foo - _start
.fill 15,1,0xcc

0 comments on commit 33dbcbb

Please sign in to comment.