diff options
Diffstat (limited to 'lld/ELF/LinkerScript.cpp')
| -rw-r--r-- | lld/ELF/LinkerScript.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lld/ELF/LinkerScript.cpp b/lld/ELF/LinkerScript.cpp index 5d7f2d9e149..eb70331c902 100644 --- a/lld/ELF/LinkerScript.cpp +++ b/lld/ELF/LinkerScript.cpp @@ -186,8 +186,8 @@ void LinkerScript::addSymbol(SymbolAssignment *Cmd) { Defined New(nullptr, Cmd->Name, STB_GLOBAL, Visibility, STT_NOTYPE, SymValue, 0, Sec); - Symbol *Sym; - std::tie(Sym, std::ignore) = Symtab->insert(New); + Symbol *Sym = Symtab->insert(New); + Symtab->mergeProperties(Sym, New); replaceSymbol(Sym, &New); Cmd->Sym = cast<Defined>(Sym); } @@ -203,8 +203,8 @@ static void declareSymbol(SymbolAssignment *Cmd) { nullptr); // We can't calculate final value right now. - Symbol *Sym; - std::tie(Sym, std::ignore) = Symtab->insert(New); + Symbol *Sym = Symtab->insert(New); + Symtab->mergeProperties(Sym, New); replaceSymbol(Sym, &New); Cmd->Sym = cast<Defined>(Sym); |
