diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp index 13afe1fa93c..c4d4fc64ce8 100644 --- a/lib/Linker/LinkModules.cpp +++ b/lib/Linker/LinkModules.cpp @@ -597,7 +597,8 @@ bool LinkModules(Module *Dest, const Module *Src, std::string *ErrorMsg) { // Add all of the appending globals already in the Dest module to // AppendingVars. for (Module::giterator I = Dest->gbegin(), E = Dest->gend(); I != E; ++I) - AppendingVars.insert(std::make_pair(I->getName(), I)); + if (I->hasAppendingLinkage()) + AppendingVars.insert(std::make_pair(I->getName(), I)); // Insert all of the globals in src into the Dest module... without linking // initializers (which could refer to functions not yet mapped over). diff --git a/lib/Transforms/Utils/Linker.cpp b/lib/Transforms/Utils/Linker.cpp index 13afe1fa93c..c4d4fc64ce8 100644 --- a/lib/Transforms/Utils/Linker.cpp +++ b/lib/Transforms/Utils/Linker.cpp @@ -597,7 +597,8 @@ bool LinkModules(Module *Dest, const Module *Src, std::string *ErrorMsg) { // Add all of the appending globals already in the Dest module to // AppendingVars. for (Module::giterator I = Dest->gbegin(), E = Dest->gend(); I != E; ++I) - AppendingVars.insert(std::make_pair(I->getName(), I)); + if (I->hasAppendingLinkage()) + AppendingVars.insert(std::make_pair(I->getName(), I)); // Insert all of the globals in src into the Dest module... without linking // initializers (which could refer to functions not yet mapped over). diff --git a/lib/VMCore/Linker.cpp b/lib/VMCore/Linker.cpp index 13afe1fa93c..c4d4fc64ce8 100644 --- a/lib/VMCore/Linker.cpp +++ b/lib/VMCore/Linker.cpp @@ -597,7 +597,8 @@ bool LinkModules(Module *Dest, const Module *Src, std::string *ErrorMsg) { // Add all of the appending globals already in the Dest module to // AppendingVars. for (Module::giterator I = Dest->gbegin(), E = Dest->gend(); I != E; ++I) - AppendingVars.insert(std::make_pair(I->getName(), I)); + if (I->hasAppendingLinkage()) + AppendingVars.insert(std::make_pair(I->getName(), I)); // Insert all of the globals in src into the Dest module... without linking // initializers (which could refer to functions not yet mapped over).