Changes in directory llvm/lib/Linker:
LinkModules.cpp updated: 1.110 -> 1.111
---
Log message:
Rename method
---
Diffs of the changes: (+5 -4)
LinkModules.cpp | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
Index: llvm/lib/Linker/LinkModules.cpp
diff -u llvm/lib/Linker/LinkModules.cpp:1.110
llvm/lib/Linker/LinkModules.cpp:1.111
--- llvm/lib/Linker/LinkModules.cpp:1.110 Mon Jan 23 17:08:37 2006
+++ llvm/lib/Linker/LinkModules.cpp Mon Jan 23 22:14:29 2006
@@ -833,11 +833,12 @@
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
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
