diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2010-09-24 18:48:08 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2010-09-24 18:48:08 +0000 |
| commit | 3843bb9d2c72ab559f916b955ea69b9df2e1c903 (patch) | |
| tree | 5d071b0403466f64460b9ceee88027b400f01cad | |
| parent | aa0f2b30163872d0d9114dd03da71a7f17f57d5b (diff) | |
| download | bcm5719-llvm-3843bb9d2c72ab559f916b955ea69b9df2e1c903.tar.gz bcm5719-llvm-3843bb9d2c72ab559f916b955ea69b9df2e1c903.zip | |
Revert 114678 and 114667 to see if
http://google1.osuosl.org:8011/builders/llvm-gcc-i386-linux-selfhost
gets happy.
llvm-svn: 114742
| -rw-r--r-- | llvm/lib/MC/ELFObjectWriter.cpp | 7 | ||||
| -rw-r--r-- | llvm/test/MC/ELF/local-reloc.s | 32 |
2 files changed, 2 insertions, 37 deletions
diff --git a/llvm/lib/MC/ELFObjectWriter.cpp b/llvm/lib/MC/ELFObjectWriter.cpp index 9eb9bcac46a..1189b73a08a 100644 --- a/llvm/lib/MC/ELFObjectWriter.cpp +++ b/llvm/lib/MC/ELFObjectWriter.cpp @@ -515,12 +515,9 @@ void ELFObjectWriterImpl::RecordRelocation(const MCAssembler &Asm, } if (Base) { - if (F && !SD.isExternal()) { + if (F && (!Symbol->isInSection() || SD.isCommon()) && !SD.isExternal()) { Index = F->getParent()->getOrdinal() + LocalSymbolData.size() + 1; - - MCSectionData *FSD = F->getParent(); - // Offset of the symbol in the section - Value += Layout.getSymbolAddress(&SD) - Layout.getSectionAddress(FSD); + Value += Layout.getSymbolAddress(&SD); } else Index = getSymbolIndexInSymbolTable(Asm, Symbol); if (Base != &SD) diff --git a/llvm/test/MC/ELF/local-reloc.s b/llvm/test/MC/ELF/local-reloc.s deleted file mode 100644 index e5a3d4cce50..00000000000 --- a/llvm/test/MC/ELF/local-reloc.s +++ /dev/null @@ -1,32 +0,0 @@ -// 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) |
