From a2887d3d8e97d39339cfa802f374052798b79642 Mon Sep 17 00:00:00 2001 From: jjohnstn Date: Thu, 24 Jul 2003 16:42:53 +0000 Subject: [PATCH] 2003-07-24 Jeff Johnston * ia64-linux-nat.c (ia64_linux_stopped_by_watchpoint): Verify that we have a SIGTRAP before returning non-zero. --- gdb/ChangeLog | 5 +++++ gdb/ia64-linux-nat.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ac7e94397e..680bd8e561 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2003-07-24 Jeff Johnston + + * ia64-linux-nat.c (ia64_linux_stopped_by_watchpoint): Verify + that we have a SIGTRAP before returning non-zero. + 2003-07-23 Michal Ludvig Elena Zannoni diff --git a/gdb/ia64-linux-nat.c b/gdb/ia64-linux-nat.c index 7d4cc43072..dacb6720bd 100644 --- a/gdb/ia64-linux-nat.c +++ b/gdb/ia64-linux-nat.c @@ -634,7 +634,8 @@ ia64_linux_stopped_by_watchpoint (ptid_t ptid) errno = 0; ptrace (PTRACE_GETSIGINFO, tid, (PTRACE_ARG3_TYPE) 0, &siginfo); - if (errno != 0 || (siginfo.si_code & 0xffff) != 0x0004 /* TRAP_HWBKPT */) + if (errno != 0 || siginfo.si_signo != SIGTRAP || + (siginfo.si_code & 0xffff) != 0x0004 /* TRAP_HWBKPT */) return 0; psr = read_register_pid (IA64_PSR_REGNUM, ptid); -- 2.11.0