[llvm-commits] CVS: llvm/lib/Linker/LinkModules.cpp

[Chris Lattner]

Changes in directory llvm/lib/Linker:

LinkModules.cpp updated: 1.96 -> 1.97
---
Log message:

Fix linkage of mismatched weak globals.  This unbreaks 300.twolf


---
Diffs of the changes:  (+2 -0)

Index: llvm/lib/Linker/LinkModules.cpp
diff -u llvm/lib/Linker/LinkModules.cpp:1.96 llvm/lib/Linker/LinkModules.cpp:1.97
--- llvm/lib/Linker/LinkModules.cpp:1.96	Fri Dec  3 16:18:41 2004
+++ llvm/lib/Linker/LinkModules.cpp	Sat Dec  4 12:54:48 2004
@@ -531,6 +531,8 @@
           else
             DGV->setConstant(true);
         }
+        SGV->setLinkage(GlobalValue::ExternalLinkage);
+        SGV->setInitializer(0);
       }
 
       ValueMap.insert(std::make_pair(SGV,