diff options
| author | Chris Lattner <sabre@nondot.org> | 2003-05-14 12:11:51 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2003-05-14 12:11:51 +0000 |
| commit | 58ea8ff469557192e946c42153d1a3e490657264 (patch) | |
| tree | d781bf3ac95bd23bde55ee2cee850ae8422dd98a /llvm/lib/Transforms/Utils/Linker.cpp | |
| parent | 69f6af16044af34a55235dd5e8c06ba57c282c77 (diff) | |
| download | bcm5719-llvm-58ea8ff469557192e946c42153d1a3e490657264.tar.gz bcm5719-llvm-58ea8ff469557192e946c42153d1a3e490657264.zip | |
Fix major problem with appending linkage changes
llvm-svn: 6185
Diffstat (limited to 'llvm/lib/Transforms/Utils/Linker.cpp')
| -rw-r--r-- | llvm/lib/Transforms/Utils/Linker.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/llvm/lib/Transforms/Utils/Linker.cpp b/llvm/lib/Transforms/Utils/Linker.cpp index 13afe1fa93c..c4d4fc64ce8 100644 --- a/llvm/lib/Transforms/Utils/Linker.cpp +++ b/llvm/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). |
