Nigel
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

random cleanups. 

llvm-svn: 47334
This commit is contained in:
Chris Lattner 2008-02-19 18:49:08 +00:00
parent fe0b5740ce
commit 90c2df5bd0
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
llvm/lib/Linker/LinkModules.cpp
View File

@ -965,7 +965,7 @@ Linker::LinkModules(Module *Dest, Module *Src, std::string *ErrorMsg) {
}
}
// COpy the target triple from the source to dest if the dest's is empty
// Copy the target triple from the source to dest if the dest's is empty.
if (Dest->getTargetTriple().empty() && !Src->getTargetTriple().empty())
Dest->setTargetTriple(Src->getTargetTriple());
@ -976,7 +976,7 @@ Linker::LinkModules(Module *Dest, Module *Src, std::string *ErrorMsg) {
Dest->getTargetTriple() != Src->getTargetTriple())
cerr << "WARNING: Linking two modules of different target triples!\n";
// Append the module inline asm string
// Append the module inline asm string.
if (!Src->getModuleInlineAsm().empty()) {
if (Dest->getModuleInlineAsm().empty())
Dest->setModuleInlineAsm(Src->getModuleInlineAsm());
@ -988,12 +988,9 @@ Linker::LinkModules(Module *Dest, Module *Src, std::string *ErrorMsg) {
// Update the destination module's dependent libraries list with the libraries
// from the source module. There's no opportunity for duplicates here as the
// Module ensures that duplicate insertions are discarded.
Module::lib_iterator SI = Src->lib_begin();
Module::lib_iterator SE = Src->lib_end();
while ( SI != SE ) {
for (Module::lib_iterator SI = Src->lib_begin(), SE = Src->lib_end();
SI != SE; ++SI)
Dest->addLibrary(*SI);
++SI;
}
// LinkTypes - Go through the symbol table of the Src module and see if any
// types are named in the src module that are not named in the Dst module.