diff options
| author | Benjamin Kramer <benny.kra@googlemail.com> | 2010-08-23 18:24:20 +0000 |
|---|---|---|
| committer | Benjamin Kramer <benny.kra@googlemail.com> | 2010-08-23 18:24:20 +0000 |
| commit | 30dc1ee78ae99e4d9e92cdb02f1cbd64827c0630 (patch) | |
| tree | ca87021eec86345670556621303c448eadbff6bb /lib | |
| parent | 250eb005d91e80b05a61345394bae9e9528151ac (diff) | |
| download | external_llvm-30dc1ee78ae99e4d9e92cdb02f1cbd64827c0630.zip external_llvm-30dc1ee78ae99e4d9e92cdb02f1cbd64827c0630.tar.gz external_llvm-30dc1ee78ae99e4d9e92cdb02f1cbd64827c0630.tar.bz2 | |
Use the proper relocation section + cleanup, from Roman Divacky.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@111819 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/MC/ELFObjectWriter.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/MC/ELFObjectWriter.cpp b/lib/MC/ELFObjectWriter.cpp index f4b68c4..573453f 100644 --- a/lib/MC/ELFObjectWriter.cpp +++ b/lib/MC/ELFObjectWriter.cpp @@ -511,7 +511,10 @@ void ELFObjectWriterImpl::RecordRelocation(const MCAssembler &Asm, const MCSymbolData *Base = Asm.getAtom(Layout, &SD); if (Base) { - Index = getSymbolIndexInSymbolTable(const_cast<MCAssembler &>(Asm), &Base->getSymbol()); + if (MCFragment *F = SD.getFragment()) + Index = F->getParent()->getOrdinal() + getNumOfLocalSymbols(Asm) + 1; + else + Index = getSymbolIndexInSymbolTable(const_cast<MCAssembler &>(Asm), Symbol); if (Base != &SD) Value += Layout.getSymbolAddress(&SD) - Layout.getSymbolAddress(Base); Addend = Value; @@ -521,8 +524,7 @@ void ELFObjectWriterImpl::RecordRelocation(const MCAssembler &Asm, if (F) { // Index of the section in .symtab against this symbol // is being relocated + 2 (empty section + abs. symbols). - Index = SD.getFragment()->getParent()->getOrdinal() + - getNumOfLocalSymbols(Asm) + 1; + Index = F->getParent()->getOrdinal() + getNumOfLocalSymbols(Asm) + 1; MCSectionData *FSD = F->getParent(); // Offset of the symbol in the section |