1 files changed, 7 insertions, 0 deletions
diff --git a/lldb/source/Interpreter/Options.cpp b/lldb/source/Interpreter/Options.cpp
index f5de1027643..0ab6bdffda9 100644
--- a/lldb/source/Interpreter/Options.cpp
+++ b/lldb/source/Interpreter/Options.cpp
@@ -372,8 +372,13 @@ Options::GenerateOptionUsage
     const uint32_t save_indent_level = strm.GetIndentLevel();
     const char *name;
 
+    StreamString arguments_str;
+
     if (cmd)
+    {
         name = cmd->GetCommandName();
+        cmd->GetFormattedCommandArguments (arguments_str);
+    }
     else
         name = "";
 
@@ -517,6 +522,8 @@ Options::GenerateOptionUsage
                 }
             }
         }
+        if (arguments_str.GetSize() > 0)
+            strm.Printf (" %s", arguments_str.GetData());
     }
     strm.Printf ("\n\n");