2003-08-13 Jeff Johnston <jjohnstn@redhat.com>

        From 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 2c0bb67b348a4eb1db940a25368328911640dc15..0a6279cfc24b777fb778d99c864054c498e99bd6 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2003-08-13  Jeff Johnston  <jjohnstn@redhat.com>
+
+       From 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-08-12  Andrew Cagney  <cagney@redhat.com>
 
        * frame.c (deprecated_frame_xmalloc): Use XMALLOC, instead of
@@ -14,9 +20,7 @@
        directly.
 
        From Peter Schauer (Peter.Schauer@regent.e-technik.tu-muenchen.de):
-
-2003-08-10  Mark Kettenis  <kettenis@gnu.org>
-
+2003-08-10  Mark Kettenis  <kettenis@gnu.org> 
        From Peter Schauer (Peter.Schauer@regent.e-technik.tu-muenchen.de):
        * config/i386/nm-i386sol2.h
        (TARGET_REGION_SIZE_OK_FOR_HW_WATCHPOINT): Define to one.

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);