Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions llvm/lib/LTO/LTOCodeGenerator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -376,11 +376,11 @@ bool LTOCodeGenerator::determineTarget() {
return true;

TripleStr = MergedModule->getTargetTriple().str();
llvm::Triple Triple(TripleStr);
if (TripleStr.empty()) {
TripleStr = sys::getDefaultTargetTriple();
MergedModule->setTargetTriple(Triple);
MergedModule->setTargetTriple(Triple(TripleStr));
}
llvm::Triple Triple(TripleStr);

// create target machine from info for merged modules
std::string ErrMsg;
Expand Down
12 changes: 12 additions & 0 deletions llvm/test/LTO/empty-triple.ll
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
; RUN: llvm-as < %s >%t1
; RUN: llvm-lto -exported-symbol=main -filetype=asm -o - %t1 2>&1 | FileCheck %s

; The test is to check the triple is set to default one when it's empty.
; Otherwise, an error will be raised by llvm-lto.

; CHECK-LABEL: main
; CHECK-NOT: error
define void @main() {
entry:
ret void
}