+2015-12-18  Antoine Tremblay  <antoine.tremblay@ericsson.com>
+
+       * server.c (handle_query): Call target_supports_software_single_step.
+
 2015-12-18  Antoine Tremblay  <antoine.tremblay@ericsson.com>
 
        * linux-low.c (single_step): New function.
 
          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+");