From: Jeff Johnston Date: Wed, 13 Aug 2003 19:14:03 +0000 (+0000) Subject: 2003-08-13 Jeff Johnston X-Git-Tag: gdb_6_0-2003-10-04-release~114 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2b18a497674310d32b0a57984e9335f11cd2ef6;p=thirdparty%2Fbinutils-gdb.git 2003-08-13 Jeff Johnston From 2003-07-24 Jeff Johnston * 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 2c0bb67b348..0a6279cfc24 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2003-08-13 Jeff Johnston + + From 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-08-12 Andrew Cagney * 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 - +2003-08-10 Mark Kettenis 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 7d4cc43072a..dacb6720bd4 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);