diff options
| -rw-r--r-- | lldb/source/Symbol/ClangASTContext.cpp | 11 | ||||
| -rw-r--r-- | lldb/source/Symbol/ClangASTType.cpp | 4 |
2 files changed, 10 insertions, 5 deletions
diff --git a/lldb/source/Symbol/ClangASTContext.cpp b/lldb/source/Symbol/ClangASTContext.cpp index e788d2e64c4..ce332767ea0 100644 --- a/lldb/source/Symbol/ClangASTContext.cpp +++ b/lldb/source/Symbol/ClangASTContext.cpp @@ -368,7 +368,7 @@ ClangASTContext::ClangASTContext (const char *target_triple) : { if (target_triple && target_triple[0]) - m_target_triple.assign (target_triple); + SetTargetTriple (target_triple); } //---------------------------------------------------------------------- @@ -413,13 +413,18 @@ ClangASTContext::SetTargetTriple (const char *target_triple) { Clear(); m_target_triple.assign(target_triple); + if (m_target_triple.find("armv7s") == 0) + m_target_triple.erase(5,1); + else if (m_target_triple.find("armv7f") == 0) + m_target_triple.erase(5,1); + else if (m_target_triple.find("armv7k") == 0) + m_target_triple.erase(5,1); } void ClangASTContext::SetArchitecture (const ArchSpec &arch) { - Clear(); - m_target_triple.assign(arch.GetTriple().str()); + SetTargetTriple(arch.GetTriple().str().c_str()); } bool diff --git a/lldb/source/Symbol/ClangASTType.cpp b/lldb/source/Symbol/ClangASTType.cpp index 3c80c263a31..51a38e21b4c 100644 --- a/lldb/source/Symbol/ClangASTType.cpp +++ b/lldb/source/Symbol/ClangASTType.cpp @@ -235,10 +235,10 @@ ClangASTType::GetMinimumLanguage (lldb::clang_type_t clang_type) case clang::BuiltinType::BoundMember: case clang::BuiltinType::UnknownAny: break; - case clang::Type::Typedef: - return GetMinimumLanguage(cast<clang::TypedefType>(qual_type)->getDecl()->getUnderlyingType().getAsOpaquePtr()); } break; + case clang::Type::Typedef: + return GetMinimumLanguage(cast<clang::TypedefType>(qual_type)->getDecl()->getUnderlyingType().getAsOpaquePtr()); } } return lldb::eLanguageTypeC; |
