[llvm] r237944 - writeSymbolTable now only needs a MCContext.
Rafael Espindola
rafael.espindola at gmail.com
Thu May 21 12:54:45 PDT 2015
Author: rafael
Date: Thu May 21 14:54:44 2015
New Revision: 237944
URL: http://llvm.org/viewvc/llvm-project?rev=237944&view=rev
Log:
writeSymbolTable now only needs a MCContext.
It used to use an MCAssembler just to record the alignment of the sections.
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=237944&r1=237943&r2=237944&view=diff
==============================================================================
--- llvm/trunk/lib/MC/ELFObjectWriter.cpp (original)
+++ llvm/trunk/lib/MC/ELFObjectWriter.cpp Thu May 21 14:54:44 2015
@@ -193,7 +193,7 @@ class ELFObjectWriter : public MCObjectW
typedef std::map<const MCSectionELF *, std::pair<uint64_t, uint64_t>>
SectionOffsetsTy;
- void WriteSymbolTable(MCAssembler &Asm, const MCAsmLayout &Layout,
+ void writeSymbolTable(MCContext &Ctx, const MCAsmLayout &Layout,
SectionOffsetsTy &SectionOffsets);
bool shouldRelocateWithSymbol(const MCAssembler &Asm,
@@ -538,19 +538,15 @@ void ELFObjectWriter::WriteSymbol(Symbol
MSD.SectionIndex, IsReserved);
}
-void ELFObjectWriter::WriteSymbolTable(MCAssembler &Asm,
+void ELFObjectWriter::writeSymbolTable(MCContext &Ctx,
const MCAsmLayout &Layout,
SectionOffsetsTy &SectionOffsets) {
-
- MCContext &Ctx = Asm.getContext();
-
unsigned EntrySize = is64Bit() ? ELF::SYMENTRY_SIZE64 : ELF::SYMENTRY_SIZE32;
// Symbol table
MCSectionELF *SymtabSection =
Ctx.getELFSection(".symtab", ELF::SHT_SYMTAB, 0, EntrySize, "");
- MCSectionData &SymtabSD = Asm.getOrCreateSectionData(*SymtabSection);
- SymtabSD.setAlignment(is64Bit() ? 8 : 4);
+ SymtabSection->setAlignment(is64Bit() ? 8 : 4);
SymbolTableIndex = addToSectionTable(SymtabSection);
// The string table must be emitted first because we need the index
@@ -558,7 +554,8 @@ void ELFObjectWriter::WriteSymbolTable(M
SymbolTableWriter Writer(*this, is64Bit());
- uint64_t Padding = OffsetToAlignment(OS.tell(), SymtabSD.getAlignment());
+ uint64_t Padding =
+ OffsetToAlignment(OS.tell(), SymtabSection->getAlignment());
WriteZeros(Padding);
uint64_t SecStart = OS.tell();
@@ -609,9 +606,7 @@ void ELFObjectWriter::WriteSymbolTable(M
MCSectionELF *SymtabShndxSection =
Ctx.getELFSection(".symtab_shndxr", ELF::SHT_SYMTAB_SHNDX, 0, 4, "");
addToSectionTable(SymtabShndxSection);
- MCSectionData *SymtabShndxSD =
- &Asm.getOrCreateSectionData(*SymtabShndxSection);
- SymtabShndxSD->setAlignment(4);
+ SymtabShndxSection->setAlignment(4);
for (uint32_t Index : ShndxIndexes)
write(Index);
SecEnd = OS.tell();
@@ -1412,7 +1407,7 @@ void ELFObjectWriter::WriteObject(MCAsse
ComputedSymtab = true;
}
- WriteSymbolTable(Asm, Layout, SectionOffsets);
+ writeSymbolTable(Ctx, Layout, SectionOffsets);
{
uint64_t SecStart = OS.tell();
More information about the llvm-commits
mailing list