replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

<rdar://problem/11451919> 

Fixed the test suite not working on i386 due to recent default arch detection changes.

llvm-svn: 156796
This commit is contained in:
Greg Clayton 2012-05-15 02:44:13 +00:00
parent 4116e93dc5
commit 8910c90cdc
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lldb/source/Host/common/Host.cpp
View File

@ -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);

7
lldb/source/Target/Target.cpp
View File

@ -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