[llvm-commits] [llvm] r111819 - /llvm/trunk/lib/MC/ELFObjectWriter.cpp

[Benjamin Kramer]

Author: d0k
Date: Mon Aug 23 13:24:20 2010
New Revision: 111819

URL: http://llvm.org/viewvc/llvm-project?rev=111819&view=rev
Log:
Use the proper relocation section + cleanup, from Roman Divacky.

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=111819&r1=111818&r2=111819&view=diff
==============================================================================
--- llvm/trunk/lib/MC/ELFObjectWriter.cpp (original)
+++ llvm/trunk/lib/MC/ELFObjectWriter.cpp Mon Aug 23 13:24:20 2010
@@ -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