6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-28 19:31:58 +00:00
Code Issues Projects Releases Wiki Activity

Fix major problem with appending linkage changes

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@6185 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2003-05-14 12:11:51 +00:00
parent e0c60038eb
commit f41464618f
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Linker/LinkModules.cpp
View File

@ -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 // Add all of the appending globals already in the Dest module to
// AppendingVars. // AppendingVars.
for (Module::giterator I = Dest->gbegin(), E = Dest->gend(); I != E; ++I) 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 // Insert all of the globals in src into the Dest module... without linking
// initializers (which could refer to functions not yet mapped over). // initializers (which could refer to functions not yet mapped over).

3
lib/Transforms/Utils/Linker.cpp
View File

@ -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 // Add all of the appending globals already in the Dest module to
// AppendingVars. // AppendingVars.
for (Module::giterator I = Dest->gbegin(), E = Dest->gend(); I != E; ++I) 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 // Insert all of the globals in src into the Dest module... without linking
// initializers (which could refer to functions not yet mapped over). // initializers (which could refer to functions not yet mapped over).

3
lib/VMCore/Linker.cpp
View File

@ -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 // Add all of the appending globals already in the Dest module to
// AppendingVars. // AppendingVars.
for (Module::giterator I = Dest->gbegin(), E = Dest->gend(); I != E; ++I) 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 // Insert all of the globals in src into the Dest module... without linking
// initializers (which could refer to functions not yet mapped over). // initializers (which could refer to functions not yet mapped over).