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
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 @@
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 @@
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