mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-08-15 06:29:05 +00:00
Revert 114678 and 114667 to see if
http://google1.osuosl.org:8011/builders/llvm-gcc-i386-linux-selfhost gets happy. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@114742 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -515,12 +515,9 @@ void ELFObjectWriterImpl::RecordRelocation(const MCAssembler &Asm,
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (Base) {
|
if (Base) {
|
||||||
if (F && !SD.isExternal()) {
|
if (F && (!Symbol->isInSection() || SD.isCommon()) && !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)
|
||||||
|
@@ -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)
|
|
Reference in New Issue
Block a user