summaryrefslogtreecommitdiffstats
path: root/clang/lib
diff options
context:
space:
mode:
authorChad Rosier <mcrosier@apple.com>2013-03-27 00:14:35 +0000
committerChad Rosier <mcrosier@apple.com>2013-03-27 00:14:35 +0000
commitecafbe60384fa51f6a5188fd0bfaeb2a56273771 (patch)
tree757abc0c64fe4557e6b617e3719b2cc15ca344bf /clang/lib
parent46ebe53eadbc8a0aaf83315179ea1712f5674309 (diff)
downloadbcm5719-llvm-ecafbe60384fa51f6a5188fd0bfaeb2a56273771.tar.gz
bcm5719-llvm-ecafbe60384fa51f6a5188fd0bfaeb2a56273771.zip
If we're unable to create the TargetMachine, then just quit producing the
backend output; there's no need to report a fatal error. This reverts r178042. Part of rdar://13295753 and rdar://13401547 llvm-svn: 178102
Diffstat (limited to 'clang/lib')
-rw-r--r--clang/lib/CodeGen/BackendUtil.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/BackendUtil.cpp b/clang/lib/CodeGen/BackendUtil.cpp
index 1d7395915b9..019570ce231 100644
--- a/clang/lib/CodeGen/BackendUtil.cpp
+++ b/clang/lib/CodeGen/BackendUtil.cpp
@@ -329,7 +329,7 @@ TargetMachine *EmitAssemblyHelper::CreateTargetMachine(bool MustCreateTM) {
const llvm::Target *TheTarget = TargetRegistry::lookupTarget(Triple, Error);
if (!TheTarget) {
if (MustCreateTM)
- llvm::report_fatal_error ("Unable to create target: " + Error);
+ Diags.Report(diag::err_fe_unable_to_create_target) << Error;
return 0;
}
@@ -527,6 +527,7 @@ void EmitAssemblyHelper::EmitAssembly(BackendAction Action, raw_ostream *OS) {
Action != Backend_EmitBC &&
Action != Backend_EmitLL);
TargetMachine *TM = CreateTargetMachine(UsesCodeGen);
+ if (UsesCodeGen && !TM) return;
CreatePasses(TM);
switch (Action) {
OpenPOWER on IntegriCloud