gdb/gdbserver/

	* server.c (process_point_options): Stop at 'X' when parsing.

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index fab5e7c..b615712 100644 (file)
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-27  Yao Qi  <yao@codesourcery.com>
+
+       * server.c (process_point_options): Stop at 'X' when parsing.
+
 2012-07-19  Michael Eager  <eager@eagercon.com>
 
        * i386-low.c (Z_packet_to_hw_type): Add Z_PACKET_HW_BP, translate 

diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c
index 963d575..4e15b3c 100644 (file)
--- a/gdb/gdbserver/server.c
+++ b/gdb/gdbserver/server.c
@@ -2944,7 +2944,7 @@ process_point_options (CORE_ADDR point_addr, char **packet)
        }
 
       /* Skip tokens until we find one that we recognize.  */
-      while (*dataptr && *dataptr != ';')
+      while (*dataptr && *dataptr != 'X' && *dataptr != ';')
        dataptr++;
     }
   *packet = dataptr;