diff options
author | Chris Lattner <sabre@nondot.org> | 2010-12-30 02:49:45 +0000 |
---|---|---|
committer | Chris Lattner <sabre@nondot.org> | 2010-12-30 02:49:45 +0000 |
commit | e240995e41dfe208f29d7c61356e47e010f42af5 (patch) | |
tree | 341e4d04a7e96ac8f13fff4fcfe4406bdb7bc5aa /llvm/lib/Linker | |
parent | 1556522a345694e6cb08668473efc59ccc22ae11 (diff) | |
download | bcm5719-llvm-e240995e41dfe208f29d7c61356e47e010f42af5.tar.gz bcm5719-llvm-e240995e41dfe208f29d7c61356e47e010f42af5.zip |
include the module identifier when emitting this warning, PR8865.
llvm-svn: 122637
Diffstat (limited to 'llvm/lib/Linker')
-rw-r--r-- | llvm/lib/Linker/LinkModules.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/llvm/lib/Linker/LinkModules.cpp b/llvm/lib/Linker/LinkModules.cpp index 025aec99572..d99e0a06b67 100644 --- a/llvm/lib/Linker/LinkModules.cpp +++ b/llvm/lib/Linker/LinkModules.cpp @@ -1218,10 +1218,13 @@ Linker::LinkModules(Module *Dest, Module *Src, std::string *ErrorMsg) { Src->getDataLayout() != Dest->getDataLayout()) errs() << "WARNING: Linking two modules of different data layouts!\n"; if (!Src->getTargetTriple().empty() && - Dest->getTargetTriple() != Src->getTargetTriple()) - errs() << "WARNING: Linking two modules of different target triples: '" - << Src->getTargetTriple() << "' and '" << Dest->getTargetTriple() - << "'\n"; + Dest->getTargetTriple() != Src->getTargetTriple()) { + errs() << "WARNING: Linking two modules of different target triples: "; + if (!Src->getModuleIdentifier().empty()) + errs() << Src->getModuleIdentifier() << ": "; + errs() << "'" << Src->getTargetTriple() << "' and '" + << Dest->getTargetTriple() << "'\n"; + } // Append the module inline asm string. if (!Src->getModuleInlineAsm().empty()) { |