[llvm-commits] [llvm] r111183 - /llvm/trunk/lib/MC/ELFObjectWriter.cpp
Eli Friedman
eli.friedman at gmail.com
Mon Aug 16 14:17:09 PDT 2010
Author: efriedma
Date: Mon Aug 16 16:17:09 2010
New Revision: 111183
URL: http://llvm.org/viewvc/llvm-project?rev=111183&view=rev
Log:
Fixes for generation of ELF relocations. Patch by 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=111183&r1=111182&r2=111183&view=diff
==============================================================================
--- llvm/trunk/lib/MC/ELFObjectWriter.cpp (original)
+++ llvm/trunk/lib/MC/ELFObjectWriter.cpp Mon Aug 16 16:17:09 2010
@@ -451,9 +451,23 @@
}
// Write out a symbol table entry for each section.
- for (unsigned Index = 1; Index < Asm.size(); ++Index)
+ // leaving out the just added .symtab which is at
+ // the very end
+ unsigned Index = 1;
+ for (MCAssembler::const_iterator it = Asm.begin(),
+ ie = Asm.end(); it != ie; ++it, ++Index) {
+ const MCSectionData &SD = *it;
+ const MCSectionELF &Section =
+ static_cast<const MCSectionELF&>(SD.getSection());
+ // Leave out relocations so we don't have indexes within
+ // the relocations messed up
+ if (Section.getType() == ELF::SHT_RELA)
+ continue;
+ if (Index == Asm.size())
+ continue;
WriteSymbolEntry(F, 0, ELF::STT_SECTION, 0, 0, ELF::STV_DEFAULT, Index);
- LastLocalSymbolIndex += Asm.size() - 1;
+ LastLocalSymbolIndex++;
+ }
for (unsigned i = 0, e = ExternalSymbolData.size(); i != e; ++i) {
ELFSymbolData &MSD = ExternalSymbolData[i];
@@ -620,12 +634,10 @@
return i + /* empty symbol */ 1;
for (unsigned i = 0, e = External.size(); i != e; ++i)
if (&External[i].SymbolData->getSymbol() == S)
- return i + Local.size() + Asm.size() + /* empty symbol */ 1 +
- /* .rela.text + .rela.eh_frame */ + 2;
+ return i + Local.size() + Asm.size() + /* empty symbol */ 1;
for (unsigned i = 0, e = Undefined.size(); i != e; ++i)
if (&Undefined[i].SymbolData->getSymbol() == S)
- return i + Local.size() + External.size() + Asm.size() + /* empty symbol */ 1 +
- /* .rela.text + .rela.eh_frame */ + 2;
+ return i + Local.size() + External.size() + Asm.size() + /* empty symbol */ 1;
llvm_unreachable("Cannot find symbol which should exist!");
}
More information about the llvm-commits
mailing list