d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lld: Only lookup LMARegion once. NFC.

Browse Source 
This is similar to how we handle MemRegion.

Obtained from:	LLVM r323396 by Rafael Espindola
This commit is contained in:
emaste 2018-01-29 13:49:10 +00:00
parent 348dedc592
commit e22ffc5934
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
contrib/llvm/tools/lld/ELF/LinkerScript.cpp
View File

@ -661,13 +661,9 @@ void LinkerScript::assignOffsets(OutputSection *Sec) {
Ctx->LMAOffset = [=] { return Sec->LMAExpr().getValue() - D; };
}
if (!Sec->LMARegionName.empty()) {
if (MemoryRegion *MR = MemoryRegions.lookup(Sec->LMARegionName)) {
uint64_t Offset = MR->Origin - Dot;
Ctx->LMAOffset = [=] { return Offset; };
} else {
error("memory region '" + Sec->LMARegionName + "' not declared");
}
if (MemoryRegion *MR = Sec->LMARegion) {
uint64_t Offset = MR->Origin - Dot;
Ctx->LMAOffset = [=] { return Offset; };
}
// If neither AT nor AT> is specified for an allocatable section, the linker
@ -796,6 +792,12 @@ void LinkerScript::adjustSectionsAfterSorting() {
if (auto *Sec = dyn_cast<OutputSection>(Base)) {
if (!Sec->Live)
continue;
if (!Sec->LMARegionName.empty()) {
if (MemoryRegion *M = MemoryRegions.lookup(Sec->LMARegionName))
Sec->LMARegion = M;
else
error("memory region '" + Sec->LMARegionName + "' not declared");
}
Sec->MemRegion = findMemoryRegion(Sec);
// Handle align (e.g. ".foo : ALIGN(16) { ... }").
if (Sec->AlignExpr)

1
contrib/llvm/tools/lld/ELF/OutputSections.h
View File

@ -89,6 +89,7 @@ public:
// The following members are normally only used in linker scripts.
MemoryRegion *MemRegion = nullptr;
MemoryRegion *LMARegion = nullptr;
Expr AddrExpr;
Expr AlignExpr;
Expr LMAExpr;