From abf009ef94d2f89b09767cce30bcf99224c1a0a9 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Tue, 12 Apr 2016 16:49:30 +0100 Subject: [PATCH] Don't call clear_quit_flag after check_quit_flag Obviously not necessary since check_quit_flag clears the flag as side effect. gdb/ChangeLog: 2016-04-12 Pedro Alves * remote-sim.c (gdb_os_poll_quit): Don't call clear_quit_flag. * remote.c (remote_wait_as): Don't call clear_quit_flag. --- gdb/ChangeLog | 5 +++++ gdb/remote-sim.c | 5 +---- gdb/remote.c | 5 +---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 5a1ae32f26d..f3dab72c2a5 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2016-04-12 Pedro Alves + + * remote-sim.c (gdb_os_poll_quit): Don't call clear_quit_flag. + * remote.c (remote_wait_as): Don't call clear_quit_flag. + 2016-04-12 Pedro Alves * python/python.c: Include "ser-event.h". diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c index 8489eb6a97e..11d36eb6591 100644 --- a/gdb/remote-sim.c +++ b/gdb/remote-sim.c @@ -955,10 +955,7 @@ gdb_os_poll_quit (host_callback *p) deprecated_ui_loop_hook (0); if (check_quit_flag ()) /* gdb's idea of quit */ - { - clear_quit_flag (); /* we've stolen it */ - return 1; - } + return 1; return 0; } diff --git a/gdb/remote.c b/gdb/remote.c index 5c407b6bb9c..443beacab92 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -6937,10 +6937,7 @@ remote_wait_as (ptid_t ptid, struct target_waitstatus *status, int options) /* If the user hit C-c before this packet, or between packets, pretend that it was hit right here. */ if (check_quit_flag ()) - { - clear_quit_flag (); - sync_remote_interrupt (SIGINT); - } + sync_remote_interrupt (SIGINT); } /* FIXME: cagney/1999-09-27: If we're in async mode we should -- 2.30.2