gdb/
	* infrun.c (resume): Use displaced stepping regardless of supporting
	software single step.

---
 gdb/infrun.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/gdb/infrun.c b/gdb/infrun.c
index 7886cce..40e1d71 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -1733,8 +1733,7 @@ a command like `return' or `jump' to continue execution."));
      event, displaced stepping breaks the vfork child similarly as single
      step software breakpoint.  */
   if (use_displaced_stepping (gdbarch)
-      && (tp->control.trap_expected
-	  || (step && gdbarch_software_single_step_p (gdbarch)))
+      && (tp->control.trap_expected || step)
       && sig == TARGET_SIGNAL_0
       && !current_inferior ()->waiting_for_vfork_done)
     {
-- 
1.7.0.4