Use SIGTRAP si_code values for all FreeBSD architectures on 11.3 and later.

Message ID 20200722200122.67004-1-jhb@FreeBSD.org
State New
Headers show
Series
  • Use SIGTRAP si_code values for all FreeBSD architectures on 11.3 and later.
Related show

Commit Message

John Baldwin July 22, 2020, 8:01 p.m.
Fixes to set correct si_code values (such as TRAP_BRKPT) were made to
the remaining FreeBSD architectures (MIPS and sparc64) in the head
branch leading up to 12.0 and were merged back between the 11.2 and
11.3 releases.

gdb/ChangeLog:

	* fbsd-nat.h: Include <osreldate.h>.  Define USE_SIGTRAP_SIGINFO
	for all architectures on FreeBSD 11.3 and later.
---
 gdb/ChangeLog  |  5 +++++
 gdb/fbsd-nat.h | 12 +++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

-- 
2.25.1

Comments

Tom Tromey July 24, 2020, 8:06 p.m. | #1
>>>>> "John" == John Baldwin <jhb@FreeBSD.org> writes:


John> 	* fbsd-nat.h: Include <osreldate.h>.  Define USE_SIGTRAP_SIGINFO
John> 	for all architectures on FreeBSD 11.3 and later.

Looks fine to me.  Thank you.

Tom

Patch

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1cef37dea6..94b952ddf9 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@ 
+2020-07-22  John Baldwin  <jhb@FreeBSD.org>
+
+	* fbsd-nat.h: Include <osreldate.h>.  Define USE_SIGTRAP_SIGINFO
+	for all architectures on FreeBSD 11.3 and later.
+
 2020-07-22  Andrew Burgess  <andrew.burgess@embecosm.com>
 
 	* python/py-registers.c (gdbpy_register_object_data_init): Remove
diff --git a/gdb/fbsd-nat.h b/gdb/fbsd-nat.h
index b5a62b9212..1b1e043dae 100644
--- a/gdb/fbsd-nat.h
+++ b/gdb/fbsd-nat.h
@@ -21,11 +21,17 @@ 
 #define FBSD_NAT_H
 
 #include "inf-ptrace.h"
+#include <osreldate.h>
 #include <sys/proc.h>
 
-#ifdef TRAP_BRKPT
-/* MIPS does not set si_code for SIGTRAP.  sparc64 reports
-   non-standard values in si_code for SIGTRAP.  */
+/* FreeBSD kernels 11.3 and later report valid si_code values for
+   SIGTRAP on all architectures.  Older FreeBSD kernels that supported
+   TRAP_BRKPT did not report valid values for MIPS and sparc64.  Even
+   older kernels without TRAP_BRKPT support did not report valid
+   values on any architecture.  */
+#if (__FreeBSD_kernel_version >= 1102502) || (__FreeBSD_version >= 1102502)
+# define USE_SIGTRAP_SIGINFO
+#elif defined(TRAP_BRKPT)
 # if !defined(__mips__) && !defined(__sparc64__)
 #  define USE_SIGTRAP_SIGINFO
 # endif