diff --git a/lldb/source/Commands/CommandObjectProcess.cpp b/lldb/source/Commands/CommandObjectProcess.cpp
index 980f9d2..72aba1c 100644
--- a/lldb/source/Commands/CommandObjectProcess.cpp
+++ b/lldb/source/Commands/CommandObjectProcess.cpp
@@ -585,13 +585,13 @@
             // If there isn't a current target create one.
             TargetSP new_target_sp;
             FileSpec emptyFileSpec;
-            ArchSpec emptyArchSpec;
             Error error;
             
             error = m_interpreter.GetDebugger().GetTargetList().CreateTarget (m_interpreter.GetDebugger(), 
                                                                               emptyFileSpec,
-                                                                              emptyArchSpec, 
+                                                                              NULL, 
                                                                               false,
+                                                                              NULL, // No platform options
                                                                               new_target_sp);
             target = new_target_sp.get();
             if (target == NULL || error.Fail())
@@ -1041,12 +1041,12 @@
         {
             // If there isn't a current target create one.
             FileSpec emptyFileSpec;
-            ArchSpec emptyArchSpec;
             
             error = m_interpreter.GetDebugger().GetTargetList().CreateTarget (m_interpreter.GetDebugger(), 
                                                                               emptyFileSpec,
-                                                                              emptyArchSpec, 
+                                                                              NULL, 
                                                                               false,
+                                                                              NULL, // No platform options
                                                                               target_sp);
             if (!target_sp || error.Fail())
             {
