diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2010-09-24 21:19:03 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2010-09-24 21:19:03 +0000 |
| commit | a648918eb772d46cd8e14a2ab3489a80500260af (patch) | |
| tree | af578b81ed2b3505e84c2f2c59c4fd4b2a1bd682 | |
| parent | 433a5785cc8201a8a384f0a5648d3dbac87f9fbc (diff) | |
| download | external_llvm-a648918eb772d46cd8e14a2ab3489a80500260af.zip external_llvm-a648918eb772d46cd8e14a2ab3489a80500260af.tar.gz external_llvm-a648918eb772d46cd8e14a2ab3489a80500260af.tar.bz2 | |
Reapply 114678 and 114667. Reverting them did not fix the bot:
http://google1.osuosl.org:8011/builders/llvm-gcc-i386-linux-selfhost/builds/69
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@114761 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/MC/ELFObjectWriter.cpp | 7 | ||||
| -rw-r--r-- | test/MC/ELF/local-reloc.s | 32 |
2 files changed, 37 insertions, 2 deletions
diff --git a/lib/MC/ELFObjectWriter.cpp b/lib/MC/ELFObjectWriter.cpp index 1189b73..9eb9bca 100644 --- a/lib/MC/ELFObjectWriter.cpp +++ b/lib/MC/ELFObjectWriter.cpp @@ -515,9 +515,12 @@ void ELFObjectWriterImpl::RecordRelocation(const MCAssembler &Asm, } if (Base) { - if (F && (!Symbol->isInSection() || SD.isCommon()) && !SD.isExternal()) { + if (F && !SD.isExternal()) { Index = F->getParent()->getOrdinal() + LocalSymbolData.size() + 1; - Value += Layout.getSymbolAddress(&SD); + + MCSectionData *FSD = F->getParent(); + // Offset of the symbol in the section + Value += Layout.getSymbolAddress(&SD) - Layout.getSectionAddress(FSD); } else Index = getSymbolIndexInSymbolTable(Asm, Symbol); if (Base != &SD) diff --git a/test/MC/ELF/local-reloc.s b/test/MC/ELF/local-reloc.s new file mode 100644 index 0000000..e5a3d4c --- /dev/null +++ b/test/MC/ELF/local-reloc.s @@ -0,0 +1,32 @@ +// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | elf-dump --dump-section-data | FileCheck %s + +// Test that relocations with local symbols are represented as relocations +// with the section. They should be equivalent, but gas behaves like this. + + movl foo, %r14d +foo: + +// Section number 1 is .text +// CHECK: # Section 1 +// CHECK-next: (('sh_name', 1) # '.text' + + +// Relocation refers to symbol number 2 +// CHECK: ('_relocations', [ +// CHECK-NEXT: # Relocation 0 +// CHECK-NEXT: (('r_offset', +// CHECK-NEXT: ('r_sym', 2) +// CHECK-NEXT: ('r_type', +// CHECK-NEXT: ('r_addend', +// CHECK-NEXT: ), +// CHECK-NEXT: ]) + +// Symbol number 2 is section number 1 +// CHECK: # Symbol 2 +// CHECK-NEXT: (('st_name', 0) # '' +// CHECK-NEXT: ('st_bind', 0) +// CHECK-NEXT: ('st_type', 3) +// CHECK-NEXT: ('st_other', 0) +// CHECK-NEXT: ('st_shndx', 1) +// CHECK-NEXT: ('st_value', 0) +// CHECK-NEXT: ('st_size', 0) |