mirror of
https://github.com/RPCSX/llvm.git
synced 2024-11-29 06:30:39 +00:00
Fix major problem with appending linkage changes
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@6185 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
e0c60038eb
commit
f41464618f
@ -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).
|
||||
|
@ -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).
|
||||
|
@ -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).
|
||||
|
Loading…
Reference in New Issue
Block a user