diff mbox

[3/3] Fix non-stop regressions caused by "breakpoints always-inserted off" changes

Message ID 5437D66F.7060407@redhat.com
State New
Headers show

Commit Message

Pedro Alves Oct. 10, 2014, 12:51 p.m. UTC
On 10/08/2014 11:55 AM, Yao Qi wrote:
> Pedro Alves <palves@redhat.com> writes:
> 
> [ThunderBird puts this series into a wrong thread, so I don't see it
> until today]
> 
> The patch looks reasonable to me.

Thanks.

> 
>> -  /* Don't print a message if in the middle of doing a "step n"
>> -     operation for n > 1 */
>> +  /* Notify observers if we finished a "step"-like command, etc.  */
>>    if (target_has_execution
>>        && last.kind != TARGET_WAITKIND_SIGNALLED
>>        && last.kind != TARGET_WAITKIND_EXITED
>> -      && inferior_thread ()->step_multi
>>        && inferior_thread ()->control.stop_step)
>> -    goto done;
>> +    {
>> +      /* But not if if in the middle of doing a "step n" operation for
>                     ^^^^^
> Duplicated "if"?

Yep.  Fixed now.

---------
From 31cc0b807b2fde7d0110175418a6eea01a982489 Mon Sep 17 00:00:00 2001
From: Pedro Alves <palves@redhat.com>
Date: Fri, 10 Oct 2014 13:50:05 +0100
Subject: [PATCH] infrun.c:normal_stop: Fix typo in comment

gdb/
2014-10-10  Pedro Alves  <palves@redhat.com>

	* infrun.c (normal_stop): Fix typo in comment.
---
 gdb/ChangeLog | 4 ++++
 gdb/infrun.c  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
diff mbox

Patch

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index aeba430..8d5b1ee 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@ 
+2014-10-10  Pedro Alves  <palves@redhat.com>
+
+	* infrun.c (normal_stop): Fix typo in comment.
+
 2014-10-09  Sergio Durigan Junior  <sergiodj@redhat.com>
 
 	PR tdep/9390
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 4681175..5536350 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -6381,7 +6381,7 @@  normal_stop (void)
       && last.kind != TARGET_WAITKIND_EXITED
       && inferior_thread ()->control.stop_step)
     {
-      /* But not if if in the middle of doing a "step n" operation for
+      /* But not if in the middle of doing a "step n" operation for
 	 n > 1 */
       if (inferior_thread ()->step_multi)
 	goto done;