2012-07-31 Pedro Alves <palves@redhat.com>

	* server.c (process_point_options): Only skip tokens if we find
	one that is unrecognized.  Don't treat 'X' specially while
	skipping unrecognized tokens.

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 08a8d3a..4e40aa9 100644 (file)
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,9 @@
+2012-07-31  Pedro Alves  <palves@redhat.com>
+
+       * server.c (process_point_options): Only skip tokens if we find
+       one that is unrecognized.  Don't treat 'X' specially while
+       skipping unrecognized tokens.
+
 2012-07-30  Ulrich Weigand  <ulrich.weigand@linaro.org>
 
        * linux-arm-low.c (arm_linux_hw_point_initialize): Do not attempt

diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c
index 4e15b3c..547552f 100644 (file)
--- a/gdb/gdbserver/server.c
+++ b/gdb/gdbserver/server.c
@@ -2938,14 +2938,12 @@ process_point_options (CORE_ADDR point_addr, char **packet)
        }
       else
        {
-         /* Unrecognized token, just skip it.  */
          fprintf (stderr, "Unknown token %c, ignoring.\n",
                   *dataptr);
+         /* Skip tokens until we find one that we recognize.  */
+         while (*dataptr && *dataptr != ';')
+           dataptr++;
        }
-
-      /* Skip tokens until we find one that we recognize.  */
-      while (*dataptr && *dataptr != 'X' && *dataptr != ';')
-       dataptr++;
     }
   *packet = dataptr;
 }