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 | a648918eb772d46cd8e14a2ab3489a80500260af (patch) | |
| tree | af578b81ed2b3505e84c2f2c59c4fd4b2a1bd682 /lib/MC/ELFObjectWriter.cpp | |
| parent | 433a5785cc8201a8a384f0a5648d3dbac87f9fbc (diff) | |
| download | llvm-a648918eb772d46cd8e14a2ab3489a80500260af.tar.gz llvm-a648918eb772d46cd8e14a2ab3489a80500260af.tar.bz2 llvm-a648918eb772d46cd8e14a2ab3489a80500260af.tar.xz | |
Reapply 114678 and 114667. Reverting them did not fix the bot:
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
Diffstat (limited to 'lib/MC/ELFObjectWriter.cpp')
| -rw-r--r-- | lib/MC/ELFObjectWriter.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/MC/ELFObjectWriter.cpp b/lib/MC/ELFObjectWriter.cpp index 1189b73a08..9eb9bcac46 100644 --- a/lib/MC/ELFObjectWriter.cpp +++ b/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) |