[gdbserver] Rename supports_conditional_breakpoints to supports_hardware_single_step

[deliverable/binutils-gdb.git] / gdb / gdbserver / server.c

diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c
index 9aa8a3f799a0c6b5ad0b3584d8e6cbb68f2cef8e..1481c47dc417e2256835971efe67eb8cb7248430 100644 (file)
--- a/gdb/gdbserver/server.c
+++ b/gdb/gdbserver/server.c
@@ -2202,9 +2202,15 @@ handle_query (char *own_buf, int packet_len, int *new_packet_len_p)
          strcat (own_buf, ";tracenz+");
        }
 
-      /* Support target-side breakpoint conditions and commands.  */
-      if (target_supports_conditional_breakpoints ())
-       strcat (own_buf, ";ConditionalBreakpoints+");
+      if (target_supports_hardware_single_step ())
+       {
+         /* Support target-side breakpoint conditions and commands.
+            GDBserver needs to step over the breakpoint if the condition
+            is false.  GDBserver software single step is too simple, so
+            disable conditional breakpoints if the target doesn't have
+            hardware single step.  */
+         strcat (own_buf, ";ConditionalBreakpoints+");
+       }
       strcat (own_buf, ";BreakpointCommands+");
 
       if (target_supports_agent ())