[Lldb-commits] [lldb] r136551 - in /lldb/trunk/source/Symbol: ClangASTContext.cpp ClangASTType.cpp

[Greg Clayton]

Author: gclayton
Date: Fri Jul 29 20:26:02 2011
New Revision: 136551

URL: http://llvm.org/viewvc/llvm-project?rev=136551&view=rev
Log:
Fixed a compile error.


Modified:
    lldb/trunk/source/Symbol/ClangASTContext.cpp
    lldb/trunk/source/Symbol/ClangASTType.cpp

Modified: lldb/trunk/source/Symbol/ClangASTContext.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/ClangASTContext.cpp?rev=136551&r1=136550&r2=136551&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/ClangASTContext.cpp (original)
+++ lldb/trunk/source/Symbol/ClangASTContext.cpp Fri Jul 29 20:26:02 2011
@@ -368,7 +368,7 @@
 
 {
     if (target_triple && target_triple[0])
-        m_target_triple.assign (target_triple);
+        SetTargetTriple (target_triple);
 }
 
 //----------------------------------------------------------------------
@@ -413,13 +413,18 @@
 {
     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

Modified: lldb/trunk/source/Symbol/ClangASTType.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/ClangASTType.cpp?rev=136551&r1=136550&r2=136551&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/ClangASTType.cpp (original)
+++ lldb/trunk/source/Symbol/ClangASTType.cpp Fri Jul 29 20:26:02 2011
@@ -235,10 +235,10 @@
                 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;