RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2025-01-29 14:42:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reapply 114678 and 114667. Reverting them did not fix the bot:

Browse Source 
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
This commit is contained in:
Rafael Espindola 2010-09-24 21:19:03 +00:00
parent 433a5785cc
commit a648918eb7
2 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/MC/ELFObjectWriter.cpp
View File

@ -515,9 +515,12 @@ void ELFObjectWriterImpl::RecordRelocation(const MCAssembler &Asm,
} }
if (Base) { if (Base) {
if (F && (!Symbol->isInSection() || SD.isCommon()) && !SD.isExternal()) { if (F && !SD.isExternal()) {
Index = F->getParent()->getOrdinal() + LocalSymbolData.size() + 1; 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 } else
Index = getSymbolIndexInSymbolTable(Asm, Symbol); Index = getSymbolIndexInSymbolTable(Asm, Symbol);
if (Base != &SD) if (Base != &SD)

32
test/MC/ELF/local-reloc.s Normal file
View File

@ -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)