Allow for the possibility that the local labels won't be in the objdump output.

[deliverable/binutils-gdb.git] / gdb / breakpoint.c

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index aa3186a831927c2c1954408bbb5770ebd090b2f9..5eb1fa4d93b8165424df5a833fbfab55b5f751e0 100644 (file)
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -2088,8 +2088,8 @@ print_it_typical (bpstat bs)
        {
          mention (bs->breakpoint_at);
          if (interpreter_p && strcmp (interpreter_p, "mi") == 0)
-           ui_out_list_begin (uiout, "value");
-         ui_out_field_string (uiout, "reason", "access-watchpoint-trigger");
+           ui_out_field_string (uiout, "reason", "access-watchpoint-trigger");
+         ui_out_list_begin (uiout, "value");
          ui_out_text (uiout, "\nValue = ");
        }
       value_print (bs->breakpoint_at->val, stb->stream, 0,Val_pretty_default);
@@ -2395,7 +2395,7 @@ bpstat_stop_status (CORE_ADDR *pc, int not_a_breakpoint)
   char message[sizeof (message1) + 30 /* slop */ ];
 
   /* Get the address where the breakpoint would have been.  */
-  bp_addr = *pc - (not_a_breakpoint && !SOFTWARE_SINGLE_STEP_P ? 
+  bp_addr = *pc - (not_a_breakpoint && !SOFTWARE_SINGLE_STEP_P () ? 
                    0 : DECR_PC_AFTER_BREAK);
 
   ALL_BREAKPOINTS_SAFE (b, temp)