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 | cf1f985838cec4a4dbd235d5f9579ae3efe18792 (patch) | |
| tree | a1b9530029426bab3d844f659381004a2cec7806 /llvm/lib/MC | |
| parent | 2c84482abd2b5f6c83c0a353ca3bba10428cd4a9 (diff) | |
| download | bcm5719-llvm-cf1f985838cec4a4dbd235d5f9579ae3efe18792.tar.gz bcm5719-llvm-cf1f985838cec4a4dbd235d5f9579ae3efe18792.zip | |
Reapply 114678 and 114667. Reverting them did not fix the bot:
http://google1.osuosl.org:8011/builders/llvm-gcc-i386-linux-selfhost/builds/69
llvm-svn: 114761
Diffstat (limited to 'llvm/lib/MC')
| -rw-r--r-- | llvm/lib/MC/ELFObjectWriter.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/llvm/lib/MC/ELFObjectWriter.cpp b/llvm/lib/MC/ELFObjectWriter.cpp index 1189b73a08a..9eb9bcac46a 100644 --- a/llvm/lib/MC/ELFObjectWriter.cpp +++ b/llvm/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) |
