1 files changed, 15 insertions, 0 deletions
diff --git a/lldb/source/Interpreter/Options.cpp b/lldb/source/Interpreter/Options.cpp
index dbe65798be8..09b17a8eb25 100644
--- a/lldb/source/Interpreter/Options.cpp
+++ b/lldb/source/Interpreter/Options.cpp
@@ -555,9 +555,24 @@ Options::GenerateOptionUsage
                 }
             }
         }
+        
         if (arguments_str.GetSize() > 0)
+        {
+            if (cmd->WantsRawCommandString())
+                strm.Printf(" --");
+            
             strm.Printf (" %s", arguments_str.GetData());
+        }
     }
+    
+    if (cmd->WantsRawCommandString() &&
+        arguments_str.GetSize() > 0)
+    {        
+        strm.PutChar('\n');
+        strm.Indent(name);
+        strm.Printf(" %s", arguments_str.GetData());
+    }
+    
     strm.Printf ("\n\n");
 
     // Now print out all the detailed information about the various options:  long form, short form and help text: