Index: lld/trunk/ELF/Writer.cpp =================================================================== --- lld/trunk/ELF/Writer.cpp +++ lld/trunk/ELF/Writer.cpp @@ -254,11 +254,15 @@ uint32_t Type = RI.getType(EObj->isMips64EL()); uintX_t P = this->getVA() + C->getOutputSectionOff(); uintX_t SymVA = getSymVA(cast>(Body)); + uint8_t *Location = Base + Offset; switch (Type) { case llvm::ELF::R_X86_64_PC32: - support::endian::write32le(Base + Offset, + support::endian::write32le(Location, SymVA + (RI.r_addend - (P + Offset))); break; + case llvm::ELF::R_X86_64_32: + support::endian::write32le(Location, SymVA + RI.r_addend); + break; default: llvm::errs() << Twine("unrecognized reloc ") + Twine(Type) << '\n'; break; Index: lld/trunk/test/elf2/relocation.s =================================================================== --- lld/trunk/test/elf2/relocation.s +++ lld/trunk/test/elf2/relocation.s @@ -1,6 +1,6 @@ // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t // RUN: lld -flavor gnu2 %t -o %t2 -// RUN: llvm-objdump -d %t2 | FileCheck %s +// RUN: llvm-objdump -t -d %t2 | FileCheck %s // REQUIRES: x86 @@ -14,4 +14,16 @@ .global lulz lulz: +.global bar +.text +bar: + movl $bar, %edx // R_X86_64_32 + +// R_X86_64_32 +// CHECK: bar: +// CHECK: 1000: ba 00 10 00 00 movl $4096, %edx + // CHECK: e8 04 00 00 00 callq 4 + +// Also check that symbols match. +// CHECK: 0000000000001000 .text 00000000 bar