From 711b0b6698ff6350b7c61710491c76c749945d4a Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Tue, 22 Mar 2022 12:05:43 -0700 Subject: [PATCH] Remove USE_SIGTRAP_SIGINFO condition for FreeBSD/x86 debug regs support. For BSD x86 targets, stopped_by_hw_breakpoint doesn't check siginfo_t but inspects the DR6 register directly via PT_GETDBREGS. --- gdb/amd64-fbsd-nat.c | 4 ++-- gdb/i386-fbsd-nat.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gdb/amd64-fbsd-nat.c b/gdb/amd64-fbsd-nat.c index 98a1af03a66..368f4c10786 100644 --- a/gdb/amd64-fbsd-nat.c +++ b/gdb/amd64-fbsd-nat.c @@ -46,7 +46,7 @@ public: const struct target_desc *read_description () override; -#if defined(HAVE_PT_GETDBREGS) && defined(USE_SIGTRAP_SIGINFO) +#if defined(HAVE_PT_GETDBREGS) bool supports_stopped_by_hw_breakpoint () override; #endif }; @@ -348,7 +348,7 @@ amd64_fbsd_nat_target::read_description () return i386_target_description (X86_XSTATE_SSE_MASK, true); } -#if defined(HAVE_PT_GETDBREGS) && defined(USE_SIGTRAP_SIGINFO) +#if defined(HAVE_PT_GETDBREGS) /* Implement the supports_stopped_by_hw_breakpoints method. */ bool diff --git a/gdb/i386-fbsd-nat.c b/gdb/i386-fbsd-nat.c index a6ced66250c..023f24bab37 100644 --- a/gdb/i386-fbsd-nat.c +++ b/gdb/i386-fbsd-nat.c @@ -46,7 +46,7 @@ public: void resume (ptid_t, int, enum gdb_signal) override; -#if defined(HAVE_PT_GETDBREGS) && defined(USE_SIGTRAP_SIGINFO) +#if defined(HAVE_PT_GETDBREGS) bool supports_stopped_by_hw_breakpoint () override; #endif }; @@ -361,7 +361,7 @@ i386_fbsd_nat_target::read_description () return i386_target_description (X86_XSTATE_X87_MASK, true); } -#if defined(HAVE_PT_GETDBREGS) && defined(USE_SIGTRAP_SIGINFO) +#if defined(HAVE_PT_GETDBREGS) /* Implement the supports_stopped_by_hw_breakpoints method. */ bool -- 2.30.2