diff options
| author | Jason Molenda <jmolenda@apple.com> | 2013-09-11 21:25:46 +0000 |
|---|---|---|
| committer | Jason Molenda <jmolenda@apple.com> | 2013-09-11 21:25:46 +0000 |
| commit | b019cd92b5d42bebeb42b5d43ccab3744e6079d6 (patch) | |
| tree | a21a0f9bc45f606d39deb0e2f33762c6968ec039 | |
| parent | 71780ec4fdaf36005cdca07c20bc0c179f56b2e6 (diff) | |
| download | bcm5719-llvm-b019cd92b5d42bebeb42b5d43ccab3744e6079d6.tar.gz bcm5719-llvm-b019cd92b5d42bebeb42b5d43ccab3744e6079d6.zip | |
When target module add/SBTarget::AddModule()'ing, if an architecture isn't specifically
requested, use the Target's architecture to pick the correct slice of a universal file.
<rdar://problem/14813869>
llvm-svn: 190550
| -rw-r--r-- | lldb/source/API/SBTarget.cpp | 2 | ||||
| -rw-r--r-- | lldb/source/Commands/CommandObjectTarget.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/lldb/source/API/SBTarget.cpp b/lldb/source/API/SBTarget.cpp index f37c8f8a614..d3cd85c3dd7 100644 --- a/lldb/source/API/SBTarget.cpp +++ b/lldb/source/API/SBTarget.cpp @@ -1905,6 +1905,8 @@ SBTarget::AddModule (const char *path, if (triple) module_spec.GetArchitecture().SetTriple (triple, target_sp->GetPlatform ().get()); + else + module_spec.GetArchitecture() = target_sp->GetArchitecture(); if (symfile) module_spec.GetSymbolFileSpec ().SetFile(symfile, false); diff --git a/lldb/source/Commands/CommandObjectTarget.cpp b/lldb/source/Commands/CommandObjectTarget.cpp index e34583a7729..7f121ecc1c3 100644 --- a/lldb/source/Commands/CommandObjectTarget.cpp +++ b/lldb/source/Commands/CommandObjectTarget.cpp @@ -2763,6 +2763,8 @@ protected: module_spec.GetUUID() = m_uuid_option_group.GetOptionValue ().GetCurrentValue(); if (m_symbol_file.GetOptionValue().OptionWasSet()) module_spec.GetSymbolFileSpec() = m_symbol_file.GetOptionValue().GetCurrentValue(); + if (!module_spec.GetArchitecture().IsValid()) + module_spec.GetArchitecture() = target->GetArchitecture(); Error error; ModuleSP module_sp (target->GetSharedModule (module_spec, &error)); if (!module_sp) |
