RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-12-18 09:09:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MCELF: Count the section orders properly. Patch by Roman Divacky.

Browse Source 
llvm-svn: 111517
This commit is contained in:
Benjamin Kramer 2010-08-19 13:44:49 +00:00
parent 69cdd103c0
commit 574b1a27b1
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/MC/ELFObjectWriter.cpp
View File

@ -932,11 +932,16 @@ void ELFObjectWriterImpl::WriteObject(const MCAssembler &Asm,
// ... then all of the sections ...
DenseMap<const MCSection*, uint64_t> SectionOffsetMap;
DenseMap<const MCSection*, uint8_t> SectionIndexMap;
unsigned Index = 1;
for (MCAssembler::const_iterator it = Asm.begin(),
ie = Asm.end(); it != ie; ++it) {
// Remember the offset into the file for this section.
SectionOffsetMap[&it->getSection()] = FileOff;
SectionIndexMap[&it->getSection()] = Index++;
const MCSectionData &SD = *it;
FileOff += Layout.getSectionFileSize(&SD);
@ -968,15 +973,11 @@ void ELFObjectWriterImpl::WriteObject(const MCAssembler &Asm,
case ELF::SHT_RELA: {
const MCSection *SymtabSection;
const MCSection *InfoSection;
const MCSectionData *SymtabSD;
const MCSectionData *InfoSD;
SymtabSection = Asm.getContext().getELFSection(".symtab", ELF::SHT_SYMTAB, 0,
SectionKind::getReadOnly(),
false);
SymtabSD = &Asm.getSectionData(*SymtabSection);
// we have to count the empty section in too
sh_link = SymtabSD->getLayoutOrder() + 1;
sh_link = SectionIndexMap[SymtabSection];
// Remove ".rel" and ".rela" prefixes.
unsigned SecNameLen = (Section.getType() == ELF::SHT_REL) ? 4 : 5;
@ -986,8 +987,7 @@ void ELFObjectWriterImpl::WriteObject(const MCAssembler &Asm,
ELF::SHT_PROGBITS, 0,
SectionKind::getReadOnly(),
false);
InfoSD = &Asm.getSectionData(*InfoSection);
sh_info = InfoSD->getLayoutOrder() + 1;
sh_info = SectionIndexMap[InfoSection];
break;
}