aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Prus <vladimir@codesourcery.com>2008-01-21 16:34:00 +0000
committerVladimir Prus <vladimir@codesourcery.com>2008-01-21 16:34:00 +0000
commit9d9cd7ac81a4f15f5f4f4ba8a8a3af3be67ed359 (patch)
tree0fb4d07d6eb6496c029a81bb6023b80d9d96b113
parentfbb3bb987c92182580d418b9bb824497912e891e (diff)
downloadgdb-9d9cd7ac81a4f15f5f4f4ba8a8a3af3be67ed359.zip
gdb-9d9cd7ac81a4f15f5f4f4ba8a8a3af3be67ed359.tar.gz
gdb-9d9cd7ac81a4f15f5f4f4ba8a8a3af3be67ed359.tar.bz2
* infrun.c (handle_inferior_event): If
we failed to remove breakpoints, error, don't try to increment PC by hand.
-rw-r--r--gdb/ChangeLog6
-rw-r--r--gdb/infrun.c19
2 files changed, 7 insertions, 18 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7610074..6121e91 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-21 Vladimir Prus <vladimir@codesourcery.com>
+
+ * infrun.c (handle_inferior_event): If
+ we failed to remove breakpoints, error,
+ don't try to increment PC by hand.
+
2008-01-18 Nick Hudson <nick.hudson@dsl.pipex.com>
Add NetBSD/hppa target and host support.
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 4dd49f6..d28d43f 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -1777,24 +1777,7 @@ handle_inferior_event (struct execution_control_state *ecs)
process until the child exits (well, okay, not
then either :-) or execs. */
if (remove_status != 0)
- {
- /* FIXME! This is obviously non-portable! */
- write_pc_pid (stop_pc + 4, ecs->ptid);
- /* We need to restart all the threads now,
- * unles we're running in scheduler-locked mode.
- * Use currently_stepping to determine whether to
- * step or continue.
- */
- /* FIXME MVS: is there any reason not to call resume()? */
- if (scheduler_mode == schedlock_on)
- target_resume (ecs->ptid,
- currently_stepping (ecs), TARGET_SIGNAL_0);
- else
- target_resume (RESUME_ALL,
- currently_stepping (ecs), TARGET_SIGNAL_0);
- prepare_to_wait (ecs);
- return;
- }
+ error (_("Cannot step over breakpoint hit in wrong thread"));
else
{ /* Single step */
if (!ptid_equal (inferior_ptid, ecs->ptid))