intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-19 09:31:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

[ELF] - Linkerscript: Implemented SORT command.

Browse Source 
When the SORT keyword is used, the linker will sort the files or sections into ascending order by name before placing them in the output file.
It is used in FreeBSD script:
https://svnweb.freebsd.org/base/head/sys/conf/ldscript.amd64?revision=284870&view=markup#l139

This is PR28689.

Differential revision: https://reviews.llvm.org/D22749

llvm-svn: 277153
This commit is contained in:
George Rimar
2016-07-29 15:32:46 +00:00
parent b20c34edf3
commit 0702c4e86e
4 changed files with 108 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
lld/ELF/LinkerScript.cpp
View File

@@ -131,12 +131,19 @@ static void addSection(OutputSectionFactory<ELFT> &Factory,
Sec->addSection(C);
}
template <class ELFT>
static bool compareByName(InputSectionBase<ELFT> *A,
InputSectionBase<ELFT> *B) {
return A->getSectionName() < B->getSectionName();
}
template <class ELFT>
std::vector<OutputSectionBase<ELFT> *>
LinkerScript<ELFT>::createSections(OutputSectionFactory<ELFT> &Factory) {
std::vector<OutputSectionBase<ELFT> *> Ret;
for (auto &P : getSectionMap()) {
std::vector<InputSectionBase<ELFT> *> Sections;
StringRef OutputName = P.first;
const InputSectionDescription *I = P.second;
for (InputSectionBase<ELFT> *S : getInputSections(I)) {
@@ -145,8 +152,12 @@ LinkerScript<ELFT>::createSections(OutputSectionFactory<ELFT> &Factory) {
reportDiscarded(S);
continue;
}
addSection(Factory, Ret, S, OutputName);
Sections.push_back(S);
}
if (I->Sort)
std::stable_sort(Sections.begin(), Sections.end(), compareByName<ELFT>);
for (InputSectionBase<ELFT> *S : Sections)
addSection(Factory, Ret, S, OutputName);
}
// Add all other input sections, which are not listed in script.
@@ -444,6 +455,7 @@ private:
std::vector<uint8_t> readOutputSectionFiller();
std::vector<StringRef> readOutputSectionPhdrs();
std::unique_ptr<InputSectionDescription> readInputSectionDescription();
void readInputFilePattern(InputSectionDescription *InCmd, bool Keep);
void readInputSectionRules(InputSectionDescription *InCmd, bool Keep);
unsigned readPhdrType();
void readProvide(bool Hidden);
@@ -674,7 +686,17 @@ static int precedence(StringRef Op) {
.Default(-1);
}
void ScriptParser::readInputSectionRules(InputSectionDescription *InCmd, bool Keep) {
void ScriptParser::readInputFilePattern(InputSectionDescription *InCmd,
bool Keep) {
while (!Error && !skip(")")) {
if (Keep)
Opt.KeptSections.push_back(peek());
InCmd->SectionPatterns.push_back(next());
}
}
void ScriptParser::readInputSectionRules(InputSectionDescription *InCmd,
bool Keep) {
InCmd->FilePattern = next();
expect("(");
@@ -684,11 +706,15 @@ void ScriptParser::readInputSectionRules(InputSectionDescription *InCmd, bool Ke
InCmd->ExcludedFiles.push_back(next());
}
while (!Error && !skip(")")) {
if (Keep)
Opt.KeptSections.push_back(peek());
InCmd->SectionPatterns.push_back(next());
if (skip("SORT")) {
expect("(");
InCmd->Sort = true;
readInputFilePattern(InCmd, Keep);
expect(")");
return;
}
readInputFilePattern(InCmd, Keep);
}
std::unique_ptr<InputSectionDescription>