X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fgdbserver%2Fserver.c;h=b385afb79250975a9f9e430c8437cefd5bc7253a;hb=bd2b290956e9a1931cf593b0f2cc934867da1d45;hp=8f097e51f184e3202135f4f3dfa5b201c670b0d4;hpb=8020350c5277e056e89b0ea5e14a8d09408f7fb3;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c
index 8f097e51f1..b385afb792 100644
--- a/gdb/gdbserver/server.c
+++ b/gdb/gdbserver/server.c
@@ -2290,13 +2290,9 @@ handle_query (char *own_buf, int packet_len, int *new_packet_len_p)
 	  strcat (own_buf, ";tracenz+");
 	}
 
-      if (target_supports_hardware_single_step ())
+      if (target_supports_hardware_single_step ()
+	  || target_supports_software_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+");