[llvm-commits] CVS: llvm/lib/Linker/LinkModules.cpp
Chris Lattner
lattner at cs.uiuc.edu
Fri Dec 10 12:26:29 PST 2004
Changes in directory llvm/lib/Linker:
LinkModules.cpp updated: 1.99 -> 1.100
---
Log message:
Make sure to link the target-triple as well, so it ends up in the .llvm.bc file
---
Diffs of the changes: (+6 -1)
Index: llvm/lib/Linker/LinkModules.cpp
diff -u llvm/lib/Linker/LinkModules.cpp:1.99 llvm/lib/Linker/LinkModules.cpp:1.100
--- llvm/lib/Linker/LinkModules.cpp:1.99 Tue Dec 7 21:31:14 2004
+++ llvm/lib/Linker/LinkModules.cpp Fri Dec 10 14:26:15 2004
@@ -829,6 +829,8 @@
Dest->setEndianness(Src->getEndianness());
if (Dest->getPointerSize() == Module::AnyPointerSize)
Dest->setPointerSize(Src->getPointerSize());
+ if (Dest->getTargetTriple().empty())
+ Dest->setTargetTriple(Src->getTargetTriple());
if (Src->getEndianness() != Module::AnyEndianness &&
Dest->getEndianness() != Src->getEndianness())
@@ -836,7 +838,10 @@
if (Src->getPointerSize() != Module::AnyPointerSize &&
Dest->getPointerSize() != Src->getPointerSize())
std::cerr << "WARNING: Linking two modules of different pointer size!\n";
-
+ if (!Src->getTargetTriple().empty() &&
+ Dest->getTargetTriple() != Src->getTargetTriple())
+ std::cerr << "WARNING: Linking two modules of different target triples!\n";
+
// 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.
More information about the llvm-commits
mailing list