diff options
author | Greg Clayton <gclayton@apple.com> | 2010-12-08 04:55:11 +0000 |
---|---|---|
committer | Greg Clayton <gclayton@apple.com> | 2010-12-08 04:55:11 +0000 |
commit | bc5cad6c6bcaaf95405337c9e57e96b66d736663 (patch) | |
tree | ddab831a3a320536cab6762ebb21b1736f0f61e3 | |
parent | b8812a1c15dad4efcba6c05f2d4dc8c37174b55d (diff) | |
download | bcm5719-llvm-bc5cad6c6bcaaf95405337c9e57e96b66d736663.tar.gz bcm5719-llvm-bc5cad6c6bcaaf95405337c9e57e96b66d736663.zip |
Fixed up the error message for when a file is not supported.
llvm-svn: 121235
-rw-r--r-- | lldb/source/Target/TargetList.cpp | 36 |
1 files changed, 23 insertions, 13 deletions
diff --git a/lldb/source/Target/TargetList.cpp b/lldb/source/Target/TargetList.cpp index bb99a44bc5d..442b36623eb 100644 --- a/lldb/source/Target/TargetList.cpp +++ b/lldb/source/Target/TargetList.cpp @@ -78,23 +78,33 @@ TargetList::CreateTarget if (!Host::ResolveExecutableInBundle (resolved_file)) resolved_file = file; - error = ModuleList::GetSharedModule(resolved_file, - arch, - uuid_ptr, - NULL, - 0, - exe_module_sp, - NULL, - NULL); + error = ModuleList::GetSharedModule (resolved_file, + arch, + uuid_ptr, + NULL, + 0, + exe_module_sp, + NULL, + NULL); if (exe_module_sp) { if (exe_module_sp->GetObjectFile() == NULL) { - error.SetErrorStringWithFormat("%s%s%s: doesn't contain architecture %s", - file.GetDirectory().AsCString(), - file.GetDirectory() ? "/" : "", - file.GetFilename().AsCString(), - arch.AsCString()); + if (arch.IsValid()) + { + error.SetErrorStringWithFormat("\"%s%s%s\" doesn't contain architecture %s", + file.GetDirectory().AsCString(), + file.GetDirectory() ? "/" : "", + file.GetFilename().AsCString(), + arch.AsCString()); + } + else + { + error.SetErrorStringWithFormat("unsupported file type \"%s%s%s\"", + file.GetDirectory().AsCString(), + file.GetDirectory() ? "/" : "", + file.GetFilename().AsCString()); + } return error; } target_sp.reset(new Target(debugger)); |