diff options
| -rw-r--r-- | lldb/source/Host/common/Host.cpp | 6 | ||||
| -rw-r--r-- | lldb/source/Target/Target.cpp | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/lldb/source/Host/common/Host.cpp b/lldb/source/Host/common/Host.cpp index 374777f6755..62a0b9e99ad 100644 --- a/lldb/source/Host/common/Host.cpp +++ b/lldb/source/Host/common/Host.cpp @@ -1231,10 +1231,12 @@ Host::GetDummyTarget (lldb_private::Debugger &debugger) if (!g_dummy_target_sp) { - ArchSpec default_arch(Target::GetDefaultArchitecture()); + ArchSpec arch(Target::GetDefaultArchitecture()); + if (!arch.IsValid()) + arch = Host::GetArchitecture (); Error err = debugger.GetTargetList().CreateTarget(debugger, FileSpec(), - default_arch.GetTriple().getTriple().c_str(), + arch.GetTriple().getTriple().c_str(), false, NULL, g_dummy_target_sp); diff --git a/lldb/source/Target/Target.cpp b/lldb/source/Target/Target.cpp index 031b2b1ff16..7255b04038b 100644 --- a/lldb/source/Target/Target.cpp +++ b/lldb/source/Target/Target.cpp @@ -1512,12 +1512,9 @@ ArchSpec Target::GetDefaultArchitecture () { lldb::UserSettingsControllerSP settings_controller_sp (GetSettingsController()); - ArchSpec default_arch; if (settings_controller_sp) - default_arch = static_cast<Target::SettingsController *>(settings_controller_sp.get())->GetArchitecture (); - if (!default_arch.IsValid()) - default_arch = Host::GetArchitecture (); - return default_arch; + return static_cast<Target::SettingsController *>(settings_controller_sp.get())->GetArchitecture (); + return ArchSpec(); } void |
