2003-07-24 Jeff Johnston <jjohnstn@redhat.com>

        * ia64-linux-nat.c (ia64_linux_stopped_by_watchpoint): Verify
        that we have a SIGTRAP before returning non-zero.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ac7e94397ea5edb3e92d12a7cdf223cc907acdc4..680bd8e56177a547399816f2d700fece8b44e458 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+       * ia64-linux-nat.c (ia64_linux_stopped_by_watchpoint): Verify
+       that we have a SIGTRAP before returning non-zero.
+
 2003-07-23  Michal Ludvig  <mludvig@suse.cz>
            Elena Zannoni  <ezannoni@redhat.com>
 

diff --git a/gdb/ia64-linux-nat.c b/gdb/ia64-linux-nat.c
index 7d4cc43072aefb142ff236328ff294d9e7ce8a71..dacb6720bd4694675e0b0ac83190af4935bc57d3 100644 (file)
--- 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);