4 files changed, 9 insertions, 9 deletions
diff --git a/lldb/source/Commands/CommandObjectDisassemble.cpp b/lldb/source/Commands/CommandObjectDisassemble.cpp
index 63d893708a2..f949030479b 100644
--- a/lldb/source/Commands/CommandObjectDisassemble.cpp
+++ b/lldb/source/Commands/CommandObjectDisassemble.cpp
@@ -185,7 +185,7 @@ CommandObjectDisassemble::Execute
 
     if (disassembler == NULL)
     {
-        result.AppendErrorWithFormat ("Unable to find Disassembler plug-in for %s architecture.\n", arch.AsCString());
+        result.AppendErrorWithFormat ("Unable to find Disassembler plug-in for %s architecture.\n", arch.GetArchitectureName());
         result.SetStatus (eReturnStatusFailed);
         return false;
     }
diff --git a/lldb/source/Commands/CommandObjectFile.cpp b/lldb/source/Commands/CommandObjectFile.cpp
index 45dc2a968e6..50f33940a38 100644
--- a/lldb/source/Commands/CommandObjectFile.cpp
+++ b/lldb/source/Commands/CommandObjectFile.cpp
@@ -145,7 +145,7 @@ CommandObjectFile::Execute
         if (target_sp)
         {
             debugger.GetTargetList().SetSelectedTarget(target_sp.get());
-            result.AppendMessageWithFormat ("Current executable set to '%s' (%s).\n", file_path, target_sp->GetArchitecture().AsCString());
+            result.AppendMessageWithFormat ("Current executable set to '%s' (%s).\n", file_path, target_sp->GetArchitecture().GetArchitectureName());
             result.SetStatus (eReturnStatusSuccessFinishNoResult);
         }
         else
diff --git a/lldb/source/Commands/CommandObjectImage.cpp b/lldb/source/Commands/CommandObjectImage.cpp
index 771562a8f2c..0092b39a816 100644
--- a/lldb/source/Commands/CommandObjectImage.cpp
+++ b/lldb/source/Commands/CommandObjectImage.cpp
@@ -42,9 +42,9 @@ DumpModuleArchitecture (Stream &strm, Module *module, uint32_t width)
     if (module)
     {
         if (width)
-            strm.Printf("%-*s", width, module->GetArchitecture().AsCString());
+            strm.Printf("%-*s", width, module->GetArchitecture().GetArchitectureName());
         else
-            strm.PutCString(module->GetArchitecture().AsCString());
+            strm.PutCString(module->GetArchitecture().GetArchitectureName());
     }
 }
 
@@ -183,7 +183,7 @@ DumpModuleSections (CommandInterpreter &interpreter, Stream &strm, Module *modul
             {
                 strm.PutCString ("Sections for '");
                 strm << module->GetFileSpec();
-                strm.Printf ("' (%s):\n", module->GetArchitecture().AsCString());
+                strm.Printf ("' (%s):\n", module->GetArchitecture().GetArchitectureName());
                 strm.IndentMore();
                 section_list->Dump(&strm, interpreter.GetDebugger().GetExecutionContext().target, true, UINT32_MAX);
                 strm.IndentLess();
diff --git a/lldb/source/Commands/CommandObjectProcess.cpp b/lldb/source/Commands/CommandObjectProcess.cpp
index 22fd6c2406b..7e18e124d67 100644
--- a/lldb/source/Commands/CommandObjectProcess.cpp
+++ b/lldb/source/Commands/CommandObjectProcess.cpp
@@ -310,7 +310,7 @@ public:
                      
         if (error.Success())
         {
-            const char *archname = exe_module->GetArchitecture().AsCString();
+            const char *archname = exe_module->GetArchitecture().GetArchitectureName();
 
             result.AppendMessageWithFormat ("Process %i launched: '%s' (%s)\n", process->GetID(), filename, archname);
             result.SetDidChangeProcessState (true);
@@ -328,7 +328,7 @@ public:
                         if (synchronous_execution)
                         {
                             state = process->WaitForProcessToStop (NULL);
-                            if (!StateIsStoppedState(state));
+                            if (!StateIsStoppedState(state))
                             {
                                 result.AppendErrorWithFormat ("Process isn't stopped: %s", StateAsCString(state));
                             }                    
@@ -777,12 +777,12 @@ public:
             
             if (!old_arch_spec.IsValid())
             {
-                result.AppendMessageWithFormat ("Architecture set to: %s.\n", target->GetArchitecture().AsCString());
+                result.AppendMessageWithFormat ("Architecture set to: %s.\n", target->GetArchitecture().GetArchitectureName());
             }
             else if (old_arch_spec != target->GetArchitecture())
             {
                 result.AppendWarningWithFormat("Architecture changed from %s to %s.\n", 
-                                                old_arch_spec.AsCString(), target->GetArchitecture().AsCString());
+                                                old_arch_spec.GetArchitectureName(), target->GetArchitecture().GetArchitectureName());
             }
         }
         return result.Succeeded();