<rdar://problem/11451919>
Fixed the test suite not working on i386 due to recent default arch detection changes.
git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@156796 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/source/Target/Target.cpp b/source/Target/Target.cpp
index 031b2b1..7255b04 100644
--- a/source/Target/Target.cpp
+++ b/source/Target/Target.cpp
@@ -1512,12 +1512,9 @@
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