[PATCH 2/4] GDBServer: give more complete usage information

[Cleber Rosa <crosa@redhat.com>]

--attach/--multi are currently only mentioned on the usage info first lines,
the meaning of PROG is completely absent and COMM/PID text is unstructured.

The words and structure chosen may not be perfect but IMHO this is an improvement.

gdb/gdbserver/ChangeLog:
2015-03-20  Cleber Rosa  <crosa@redhat.com>

	* server.c (gdbserver_usage): Reorganized the usage message.
---
 gdb/gdbserver/server.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c
index 618e457..9dec972 100644
--- a/gdb/gdbserver/server.c
+++ b/gdb/gdbserver/server.c
@@ -2997,10 +2997,18 @@ gdbserver_usage (FILE *stream)
 	   "\tgdbserver [OPTIONS] --attach COMM PID\n"
 	   "\tgdbserver [OPTIONS] --multi COMM\n"
 	   "\n"
-	   "COMM may either be a tty device (for serial debugging), or \n"
-	   "HOST:PORT to listen for a TCP connection.\n"
+	   "Start mode options:\n"
+	   "  --attach              Attach to a given process\n"
+	   "  --multi               Start server without a specific program, and\n"
+	   "                        only quit when explicitly commanded\n"
 	   "\n"
-	   "Options:\n"
+	   "    COMM                tty device (for serial debugging) or HOST:PORT\n"
+	   "                        to listen for a TCP connection\n"
+	   "    PROG                Path to program executable\n"
+	   "    PID                 Process ID to attach to\n"
+	   "    ARGS                Arguments to be passed to debugged program\n"
+	   "\n"
+	   "Other options:\n"
 	   "  --debug               Enable general debugging output.\n"
 	   "  --debug-format=opt1[,opt2,...]\n"
 	   "                        Specify extra content in debugging output.\n"
-- 
1.9.3