diff options
Diffstat (limited to 'llvm/lib/Linker/LinkModules.cpp')
| -rw-r--r-- | llvm/lib/Linker/LinkModules.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/llvm/lib/Linker/LinkModules.cpp b/llvm/lib/Linker/LinkModules.cpp index d02d590ca10..14c6a10c339 100644 --- a/llvm/lib/Linker/LinkModules.cpp +++ b/llvm/lib/Linker/LinkModules.cpp @@ -721,8 +721,9 @@ bool ModuleLinker::getLinkageResult(GlobalValue *Dest, const GlobalValue *Src, } else if (Src->isWeakForLinker()) { assert(!Dest->hasExternalWeakLinkage()); assert(!Dest->hasAvailableExternallyLinkage()); - if (Dest->hasLinkOnceLinkage() && - (Src->hasWeakLinkage() || Src->hasCommonLinkage())) { + if ((Dest->hasLinkOnceLinkage() && Src->hasWeakLinkage()) || + ((Dest->hasLinkOnceLinkage() || Dest->hasWeakLinkage()) && + Src->hasCommonLinkage())) { LinkFromSrc = true; LT = Src->getLinkage(); } else { |
