[PATCH] D12436: [ELFv2] Implement R_X86_64_32 relocation
Davide Italiano via llvm-commits
llvm-commits at lists.llvm.org
Sat Aug 29 06:16:49 PDT 2015
This revision was automatically updated to reflect the committed changes.
Closed by commit rL246362: [ELFv2] Implement R_X86_64_32 relocation. (authored by davide).
Changed prior to commit:
http://reviews.llvm.org/D12436?vs=33435&id=33514#toc
Repository:
rL LLVM
http://reviews.llvm.org/D12436
Files:
lld/trunk/ELF/Writer.cpp
lld/trunk/test/elf2/relocation.s
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
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<ELFT>(cast<DefinedRegular<ELFT>>(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;
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D12436.33514.patch
Type: text/x-patch
Size: 1661 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20150829/45ddefa3/attachment.bin>
More information about the llvm-commits
mailing list