From 1186f287dcd3023f3c90170b5b69123219cfd0a8 Mon Sep 17 00:00:00 2001 From: Kevin Buettner Date: Mon, 16 Apr 2001 21:26:46 +0000 Subject: [PATCH] Make hw watchpoints work with both the 2.4.2 kernel and the 2.4.3 kernel. --- gdb/ChangeLog | 6 ++++++ gdb/ia64-linux-nat.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index db36920d70..d6a5684609 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2001-03-31 Kevin Buettner + + * ia64-linux-nat.c (ia64_linux_stopped_by_watchpoint): Adjust + comparison against TRAP_HWBKPT constant yet again to account + for the various values used by different kernel versions. + 2001-04-16 Daniel Berlin * demangle.c (_initialize_demangler): Use xcalloc on the diff --git a/gdb/ia64-linux-nat.c b/gdb/ia64-linux-nat.c index 7fe28d1158..1a000eafc3 100644 --- a/gdb/ia64-linux-nat.c +++ b/gdb/ia64-linux-nat.c @@ -630,7 +630,7 @@ ia64_linux_stopped_by_watchpoint (int pid) errno = 0; ptrace (PTRACE_GETSIGINFO, tid, (PTRACE_ARG3_TYPE) 0, &siginfo); - if (errno != 0 || siginfo.si_code != 0x30004 /* TRAP_HWBKPT */) + if (errno != 0 || (siginfo.si_code & 0xffff) != 0x0004 /* TRAP_HWBKPT */) return 0; psr = read_register_pid (IA64_PSR_REGNUM, pid);