Index: infrun.c
===================================================================
RCS file: /cvs/src/src/gdb/infrun.c,v
retrieving revision 1.66
diff -c -3 -p -r1.66 infrun.c
*** infrun.c	17 Aug 2002 00:16:54 -0000	1.66
--- infrun.c	17 Aug 2002 00:49:19 -0000
*************** handle_inferior_event (struct execution_
*** 1408,1413 ****
--- 1408,1414 ----
  {
    CORE_ADDR tmp;
    int stepped_after_stopped_by_watchpoint;
+   int sw_single_step_trap_p = 0;
  
    /* Cache the last pid/waitstatus. */
    target_last_wait_ptid = ecs->ptid;
*************** handle_inferior_event (struct execution_
*** 1888,1893 ****
--- 1889,1906 ----
  	}
        else if (SOFTWARE_SINGLE_STEP_P () && singlestep_breakpoints_inserted_p)
          {
+           /* Readjust the stop_pc as it is off by DECR_PC_AFTER_BREAK
+              compared to the value it would have if the system stepping
+              capability was used. This allows the rest of the code in
+              this function to use this address without having to worry
+              whether software single step is in use or not.  */
+           if (DECR_PC_AFTER_BREAK)
+             {
+               stop_pc -= DECR_PC_AFTER_BREAK;
+               write_pc_pid (stop_pc, ecs->ptid);
+             }
+ 
+           sw_single_step_trap_p = 1;
            ecs->random_signal = 0;
          }
      }
*************** handle_inferior_event (struct execution_
*** 2111,2124 ****
                (&stop_pc,
                 /* Pass TRUE if our reason for stopping is something other
                    than hitting a breakpoint.  We do this by checking that
                    1) stepping is going on and 2) we didn't hit a breakpoint
                    in a signal handler without an intervening stop in
                    sigtramp, which is detected by a new stack pointer value
                    below any usual function calling stack adjustments.  */
!                (currently_stepping (ecs)
!                 && prev_pc != stop_pc - DECR_PC_AFTER_BREAK
!                 && !(step_range_end
!                      && INNER_THAN (read_sp (), (step_sp - 16)))));
  	  /* Following in case break condition called a
  	     function.  */
  	  stop_print_frame = 1;
--- 2124,2139 ----
                (&stop_pc,
                 /* Pass TRUE if our reason for stopping is something other
                    than hitting a breakpoint.  We do this by checking that
+                   either we detected earlier a software single step trap or
                    1) stepping is going on and 2) we didn't hit a breakpoint
                    in a signal handler without an intervening stop in
                    sigtramp, which is detected by a new stack pointer value
                    below any usual function calling stack adjustments.  */
!                sw_single_step_trap_p
!                || (currently_stepping (ecs)
!                    && prev_pc != stop_pc - DECR_PC_AFTER_BREAK
!                    && !(step_range_end
!                         && INNER_THAN (read_sp (), (step_sp - 16)))));
  	  /* Following in case break condition called a
  	     function.  */
  	  stop_print_frame = 1;
Index: breakpoint.c
===================================================================
RCS file: /cvs/src/src/gdb/breakpoint.c,v
retrieving revision 1.79
diff -c -3 -p -r1.79 breakpoint.c
*** breakpoint.c	16 Aug 2002 15:37:54 -0000	1.79
--- breakpoint.c	17 Aug 2002 00:49:20 -0000
*************** bpstat_stop_status (CORE_ADDR *pc, int n
*** 2429,2436 ****
       trace/singlestep trap event, we would not want to subtract
       DECR_PC_AFTER_BREAK from the PC. */
  
!   bp_addr = *pc - (not_a_sw_breakpoint && !SOFTWARE_SINGLE_STEP_P () ? 
!                    0 : DECR_PC_AFTER_BREAK);
  
    ALL_BREAKPOINTS_SAFE (b, temp)
    {
--- 2429,2435 ----
       trace/singlestep trap event, we would not want to subtract
       DECR_PC_AFTER_BREAK from the PC. */
  
!   bp_addr = *pc - (not_a_sw_breakpoint ? 0 : DECR_PC_AFTER_BREAK);
  
    ALL_BREAKPOINTS_SAFE (b, temp)
    {
Index: alpha-osf1-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/alpha-osf1-tdep.c,v
retrieving revision 1.5
diff -c -3 -p -r1.5 alpha-osf1-tdep.c
*** alpha-osf1-tdep.c	21 May 2002 15:36:02 -0000	1.5
--- alpha-osf1-tdep.c	17 Aug 2002 00:49:20 -0000
*************** alpha_osf1_init_abi (struct gdbarch_info
*** 58,63 ****
--- 58,67 ----
    struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
  
    set_gdbarch_pc_in_sigtramp (gdbarch, alpha_osf1_pc_in_sigtramp);
+   /* The next/step support via procfs on OSF1 is broken when running
+      on multi-processor machines. We need to use software single stepping
+      instead.  */
+   set_gdbarch_software_single_step (gdbarch, alpha_software_single_step);
  
    tdep->skip_sigtramp_frame = alpha_osf1_skip_sigtramp_frame;
    tdep->sigcontext_addr = alpha_osf1_sigcontext_addr;