diff options
| -rw-r--r-- | lld/ELF/OutputSections.cpp | 4 | ||||
| -rw-r--r-- | lld/ELF/Symbols.h | 4 | ||||
| -rw-r--r-- | lld/ELF/Writer.cpp | 7 |
3 files changed, 8 insertions, 7 deletions
diff --git a/lld/ELF/OutputSections.cpp b/lld/ELF/OutputSections.cpp index 190d5543f12..e3e3fef8be5 100644 --- a/lld/ELF/OutputSections.cpp +++ b/lld/ELF/OutputSections.cpp @@ -650,7 +650,7 @@ typename ELFFile<ELFT>::uintX_t lld::elf2::getSymVA(const SymbolBody &S) { return Out<ELFT>::Bss->getVA() + cast<DefinedCommon<ELFT>>(S).OffsetInBSS; case SymbolBody::SharedKind: { auto &SS = cast<SharedSymbol<ELFT>>(S); - if (SS.NeedsCopy) + if (SS.needsCopy()) return Out<ELFT>::Bss->getVA() + SS.OffsetInBSS; return 0; } @@ -1005,7 +1005,7 @@ void SymbolTableSection<ELFT>::writeGlobalSymbols(uint8_t *Buf) { OutSec = Out<ELFT>::Bss; break; case SymbolBody::SharedKind: { - if (cast<SharedSymbol<ELFT>>(Body)->NeedsCopy) + if (cast<SharedSymbol<ELFT>>(Body)->needsCopy()) OutSec = Out<ELFT>::Bss; break; } diff --git a/lld/ELF/Symbols.h b/lld/ELF/Symbols.h index 61ffdfab8f3..98533cf3cbe 100644 --- a/lld/ELF/Symbols.h +++ b/lld/ELF/Symbols.h @@ -284,8 +284,8 @@ public: SharedFile<ELFT> *File; // Can have offset if requires copy relocation. - uintX_t OffsetInBSS = 0; - bool NeedsCopy = false; + uintX_t OffsetInBSS = -1; + bool needsCopy() const { return OffsetInBSS != (uintX_t)-1; } }; // This class represents a symbol defined in an archive file. It is diff --git a/lld/ELF/Writer.cpp b/lld/ELF/Writer.cpp index 426fd8b7bd6..c01a354105e 100644 --- a/lld/ELF/Writer.cpp +++ b/lld/ELF/Writer.cpp @@ -201,9 +201,10 @@ void Writer<ELFT>::scanRelocs( bool NeedsPlt = false; if (Body) { if (auto *E = dyn_cast<SharedSymbol<ELFT>>(Body)) { - if (E->NeedsCopy) + if (E->needsCopy()) continue; - E->NeedsCopy = Target->relocNeedsCopy(Type, *Body); + if (Target->relocNeedsCopy(Type, *Body)) + E->OffsetInBSS = 0; } NeedsPlt = Target->relocNeedsPlt(Type, *Body); if (NeedsPlt) { @@ -535,7 +536,7 @@ template <class ELFT> void Writer<ELFT>::createSections() { if (auto *C = dyn_cast<DefinedCommon<ELFT>>(Body)) CommonSymbols.push_back(C); if (auto *SC = dyn_cast<SharedSymbol<ELFT>>(Body)) - if (SC->NeedsCopy) + if (SC->needsCopy()) SharedCopySymbols.push_back(SC); if (!includeInSymtab<ELFT>(*Body)) |
