OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

The difference of getBss() and Out<ELFT>::Bss is subtle, so remove that function. 

llvm-svn: 263361
This commit is contained in:
Rui Ueyama 2016-03-13 04:11:53 +00:00
parent a969218f91
commit b30f73568f
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lld/ELF/Writer.cpp
View File

@ -85,7 +85,7 @@ private:
return !Symtab.getSharedFiles().empty() || Config->Shared;
}
OutputSection<ELFT> *getBss();
void ensureBss();
void addCommonSymbols(std::vector<DefinedCommon *> &Syms);
void addCopyRelSymbols(std::vector<SharedSymbol<ELFT> *> &Syms);
@ -691,14 +691,15 @@ static bool compareSections(OutputSectionBase<ELFT> *A,
return false;
}
template <class ELFT> OutputSection<ELFT> *Writer<ELFT>::getBss() {
if (!Out<ELFT>::Bss) {
Out<ELFT>::Bss =
new OutputSection<ELFT>(".bss", SHT_NOBITS, SHF_ALLOC | SHF_WRITE);
OwningSections.emplace_back(Out<ELFT>::Bss);
OutputSections.push_back(Out<ELFT>::Bss);
}
return Out<ELFT>::Bss;
// The .bss section does not exist if no input file has a .bss section.
// This function creates one if that's the case.
template <class ELFT> void Writer<ELFT>::ensureBss() {
if (Out<ELFT>::Bss)
return;
Out<ELFT>::Bss =
new OutputSection<ELFT>(".bss", SHT_NOBITS, SHF_ALLOC | SHF_WRITE);
OwningSections.emplace_back(Out<ELFT>::Bss);
OutputSections.push_back(Out<ELFT>::Bss);
}
// Until this function is called, common symbols do not belong to any section.
@ -714,7 +715,8 @@ void Writer<ELFT>::addCommonSymbols(std::vector<DefinedCommon *> &Syms) {
return A->Alignment > B->Alignment;
});
uintX_t Off = getBss()->getSize();
ensureBss();
uintX_t Off = Out<ELFT>::Bss->getSize();
for (DefinedCommon *C : Syms) {
Off = alignTo(Off, C->Alignment);
Out<ELFT>::Bss->updateAlign(C->Alignment);
@ -740,7 +742,8 @@ template <class ELFT>
void Writer<ELFT>::addCopyRelSymbols(std::vector<SharedSymbol<ELFT> *> &Syms) {
if (Syms.empty())
return;
uintX_t Off = getBss()->getSize();
ensureBss();
uintX_t Off = Out<ELFT>::Bss->getSize();
uintX_t MaxAlign = Out<ELFT>::Bss->getAlign();
for (SharedSymbol<ELFT> *SS : Syms) {
uintX_t Align = getAlignment(SS);