gdb/gdbserver/

	* server.c (gdbserver_usage): Mention --remote-debug.
	(main): Accept '--remote-debug' switch.

gdb/doc/
	* gdb.texinfo (Using the `gdbserver' Program): Document
	--remote-debug.

4 files changed, 21 insertions, 7 deletions

diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog
index 255ba7b..e708185 100644
--- a/gdb/doc/ChangeLog
+++ b/gdb/doc/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-26  Pedro Alves  <pedro@codesourcery.com>
+
+	* gdb.texinfo (Using the `gdbserver' Program): Document
+	--remote-debug.
+
 2009-01-23  Doug Evans  <dje@google.com>
 
 	* gdb.texinfo: Add nexti to list of commands that support
diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
index bb9161b..add576d 100644
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -13985,10 +13985,11 @@ You can terminate it by using @code{monitor exit}
 
 @subsubsection Other Command-Line Arguments for @code{gdbserver}
 
-You can include @option{--debug} on the @code{gdbserver} command line.
-@code{gdbserver} will display extra status information about the debugging
-process.  This option is intended for @code{gdbserver} development and
-for bug reports to the developers.
+The @option{--debug} option tells @code{gdbserver} to display extra
+status information about the debugging process.  The
+@option{--remote-debug} option tells @code{gdbserver} to display
+remote protocol debug output.  These options are intended for
+@code{gdbserver} development and for bug reports to the developers.
 
 The @option{--wrapper} option specifies a wrapper to launch programs
 for debugging.  The option should be followed by the name of the
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 530a2f1..3fda37e 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-26  Pedro Alves  <pedro@codesourcery.com>
+
+	* server.c (gdbserver_usage): Mention --remote-debug.
+	(main): Accept '--remote-debug' switch.
+
 2009-01-18  Doug Evans  <dje@google.com>
 
 	* regcache.c (new_register_cache): No need to check result of xcalloc.
diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c
index 2e97c92..c4e1672 100644
--- a/gdb/gdbserver/server.c
+++ b/gdb/gdbserver/server.c
@@ -1299,9 +1299,10 @@ gdbserver_usage (FILE *stream)
 	   "HOST:PORT to listen for a TCP connection.\n"
 	   "\n"
 	   "Options:\n"
-	   "  --debug\t\tEnable debugging output.\n"
-	   "  --version\t\tDisplay version information and exit.\n"
-	   "  --wrapper WRAPPER --\tRun WRAPPER to start new programs.\n");
+	   "  --debug               Enable general debugging output.\n"
+	   "  --remote-debug        Enable remote protocol debugging output.\n"
+	   "  --version             Display version information and exit.\n"
+	   "  --wrapper WRAPPER --  Run WRAPPER to start new programs.\n");
   if (REPORT_BUGS_TO[0] && stream == stdout)
     fprintf (stream, "Report bugs to \"%s\".\n", REPORT_BUGS_TO);
 }
@@ -1378,6 +1379,8 @@ main (int argc, char *argv[])
 	}
       else if (strcmp (*next_arg, "--debug") == 0)
 	debug_threads = 1;
+      else if (strcmp (*next_arg, "--remote-debug") == 0)
+	remote_debug = 1;
       else if (strcmp (*next_arg, "--disable-packet") == 0)
 	{
 	  gdbserver_show_disableable (stdout);