diff options
| author | Chris Lattner <sabre@nondot.org> | 2006-01-24 04:14:29 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2006-01-24 04:14:29 +0000 |
| commit | 8ebd2164eb16135baa2f56645c3c41abbd9ee389 (patch) | |
| tree | da5dac6bf4ab601f6234e6d8aca0174d946ba695 /llvm/lib/Linker/LinkModules.cpp | |
| parent | eef2fe72c0096ab06533d77cf95b05ae35c7909e (diff) | |
| download | bcm5719-llvm-8ebd2164eb16135baa2f56645c3c41abbd9ee389.tar.gz bcm5719-llvm-8ebd2164eb16135baa2f56645c3c41abbd9ee389.zip | |
Rename method
llvm-svn: 25571
Diffstat (limited to 'llvm/lib/Linker/LinkModules.cpp')
| -rw-r--r-- | llvm/lib/Linker/LinkModules.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/llvm/lib/Linker/LinkModules.cpp b/llvm/lib/Linker/LinkModules.cpp index 482a63abdc7..aeef9e65e02 100644 --- a/llvm/lib/Linker/LinkModules.cpp +++ b/llvm/lib/Linker/LinkModules.cpp @@ -833,11 +833,12 @@ Linker::LinkModules(Module *Dest, Module *Src, std::string *ErrorMsg) { Dest->getTargetTriple() != Src->getTargetTriple()) std::cerr << "WARNING: Linking two modules of different target triples!\n"; - if (!Src->getInlineAsm().empty()) { - if (Dest->getInlineAsm().empty()) - Dest->setInlineAsm(Src->getInlineAsm()); + if (!Src->getModuleInlineAsm().empty()) { + if (Dest->getModuleInlineAsm().empty()) + Dest->setModuleInlineAsm(Src->getModuleInlineAsm()); else - Dest->setInlineAsm(Dest->getInlineAsm()+"\n"+Src->getInlineAsm()); + Dest->setModuleInlineAsm(Dest->getModuleInlineAsm()+"\n"+ + Src->getModuleInlineAsm()); } // Update the destination module's dependent libraries list with the libraries |
