[llvm-commits] [llvm] r114742 - in /llvm/trunk: lib/MC/ELFObjectWriter.cpp test/MC/ELF/local-reloc.s
Rafael Espindola
rafael.espindola at gmail.com
Fri Sep 24 11:48:09 PDT 2010
Author: rafael
Date: Fri Sep 24 13:48:08 2010
New Revision: 114742
URL: http://llvm.org/viewvc/llvm-project?rev=114742&view=rev
Log:
Revert 114678 and 114667 to see if
http://google1.osuosl.org:8011/builders/llvm-gcc-i386-linux-selfhost
gets happy.
Removed:
llvm/trunk/test/MC/ELF/local-reloc.s
Modified:
llvm/trunk/lib/MC/ELFObjectWriter.cpp
Modified: llvm/trunk/lib/MC/ELFObjectWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/ELFObjectWriter.cpp?rev=114742&r1=114741&r2=114742&view=diff
==============================================================================
--- llvm/trunk/lib/MC/ELFObjectWriter.cpp (original)
+++ llvm/trunk/lib/MC/ELFObjectWriter.cpp Fri Sep 24 13:48:08 2010
@@ -515,12 +515,9 @@
}
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)
Removed: llvm/trunk/test/MC/ELF/local-reloc.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ELF/local-reloc.s?rev=114741&view=auto
==============================================================================
--- llvm/trunk/test/MC/ELF/local-reloc.s (original)
+++ llvm/trunk/test/MC/ELF/local-reloc.s (removed)
@@ -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)
More information about the llvm-commits
mailing list