Fix VA computation for tbss.
llvm-svn: 282149
diff --git a/lld/ELF/LinkerScript.cpp b/lld/ELF/LinkerScript.cpp
index 7edfaca..922c23e 100644
--- a/lld/ELF/LinkerScript.cpp
+++ b/lld/ELF/LinkerScript.cpp
@@ -357,11 +357,14 @@
Body->Value = Cmd->Expression(Sec->getVA() + Off);
}
+template <class ELFT> static bool isTbss(OutputSectionBase<ELFT> *Sec) {
+ return (Sec->getFlags() & SHF_TLS) && Sec->getType() == SHT_NOBITS;
+}
+
template <class ELFT> void LinkerScript<ELFT>::output(InputSection<ELFT> *S) {
if (!AlreadyOutputIS.insert(S).second)
return;
- bool IsTbss =
- (CurOutSec->getFlags() & SHF_TLS) && CurOutSec->getType() == SHT_NOBITS;
+ bool IsTbss = isTbss(CurOutSec);
uintX_t Pos = IsTbss ? Dot + ThreadBssOffset : Dot;
Pos = alignTo(Pos, S->Alignment);
@@ -398,7 +401,7 @@
CurOutSec = Sec;
Dot = alignTo(Dot, CurOutSec->getAlignment());
- CurOutSec->setVA(Dot);
+ CurOutSec->setVA(isTbss(CurOutSec) ? Dot + ThreadBssOffset : Dot);
}
template <class ELFT> void LinkerScript<ELFT>::process(BaseCommand &Base) {