summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog6
-rw-r--r--gdb/infrun.c6
2 files changed, 11 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 414595f8cd..39abfcf35d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@
2010-11-26 Jan Kratochvil <jan.kratochvil@redhat.com>
+ * infcall.c (struct inferior_thread_state) <siginfo_gdbarch>: Fix up
+ the comment.
+ (save_inferior_thread_state): Reset tp->stop_signal.
+
+2010-11-26 Jan Kratochvil <jan.kratochvil@redhat.com>
+
* infcall.c (call_function_by_hand): Remove variable
caller_state_cleanup.
diff --git a/gdb/infrun.c b/gdb/infrun.c
index bcd991e0ec..80086b18f9 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -6047,7 +6047,7 @@ struct inferior_thread_state
CORE_ADDR stop_pc;
struct regcache *registers;
- /* Format of SIGINFO or NULL if it is not present. */
+ /* Format of SIGINFO_DATA or NULL if it is not present. */
struct gdbarch *siginfo_gdbarch;
/* The inferior format depends on SIGINFO_GDBARCH and it has a length of
@@ -6094,6 +6094,10 @@ save_inferior_thread_state (void)
}
inf_state->stop_signal = tp->stop_signal;
+ /* run_inferior_call will not use the signal due to its `proceed' call with
+ TARGET_SIGNAL_0 anyway. */
+ tp->stop_signal = TARGET_SIGNAL_0;
+
inf_state->stop_pc = stop_pc;
inf_state->registers = regcache_dup (regcache);