intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-20 10:58:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

[ELF] - Linkerscript: reimplement readSectionExcludes()

Browse Source 
It is not only a bit more straightforward now, but also next 2 issues are solved:

* It just crashed on ".foo : { *(EXCLUDE_FILE (*file1.o)) }" before.
* It accepted multiple EXCLUDE_FILEs in a row.

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

llvm-svn: 282060
This commit is contained in:
George Rimar
2016-09-21 08:53:21 +00:00
parent fda467b252
commit 601e989879
2 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lld/ELF/LinkerScript.cpp
View File

@@ -1072,30 +1072,24 @@ SortSectionPolicy ScriptParser::readSortKind() {
// * Include .foo.2 from every file but a.o
// * Include .foo.3 from every file but b.o
void ScriptParser::readSectionExcludes(InputSectionDescription *Cmd) {
Regex ExcludeFileRe;
std::vector<StringRef> V;
while (!Error) {
if (skip(")")) {
Cmd->SectionPatterns.push_back(
{std::move(ExcludeFileRe), compileGlobPatterns(V)});
return;
}
while (!Error && peek() != ")") {
Regex ExcludeFileRe;
if (skip("EXCLUDE_FILE")) {
if (!V.empty()) {
Cmd->SectionPatterns.push_back(
{std::move(ExcludeFileRe), compileGlobPatterns(V)});
V.clear();
}
expect("(");
ExcludeFileRe = readFilePatterns();
continue;
}
V.push_back(next());
std::vector<StringRef> V;
while (!Error && peek() != ")" && peek() != "EXCLUDE_FILE")
V.push_back(next());
if (!V.empty())
Cmd->SectionPatterns.push_back(
{std::move(ExcludeFileRe), compileGlobPatterns(V)});
else
setError("section pattern is expected");
}
expect(")");
}
InputSectionDescription *