From 5515f729737520b465d57d18581ba91a83ca63e7 Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Wed, 16 Sep 2020 11:40:04 -0700 Subject: [PATCH] Assume that PT_LWPINFO is always defined on FreeBSD hosts. FreeBSD kernels have included support for this since 5.0 release. The most recent release without support is 4.11 which was released in January of 2005. gdb/ChangeLog: * fbsd-nat.c: Assume PT_LWPINFO is always defined. * fbsd-nat.h: Likewise. --- gdb/ChangeLog | 5 +++++ gdb/fbsd-nat.c | 4 ---- gdb/fbsd-nat.h | 2 -- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 85c733e203f..8cfe3491595 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2020-09-16 John Baldwin + + * fbsd-nat.c: Assume PT_LWPINFO is always defined. + * fbsd-nat.h: Likewise. + 2020-09-16 Tankut Baris Aktemur * breakpoint.c (commands_command_1): Make a copy of the 'arg' diff --git a/gdb/fbsd-nat.c b/gdb/fbsd-nat.c index a355ebe4382..fc7136a97c7 100644 --- a/gdb/fbsd-nat.c +++ b/gdb/fbsd-nat.c @@ -831,7 +831,6 @@ fbsd_nat_target::xfer_partial (enum target_object object, } } -#ifdef PT_LWPINFO static bool debug_fbsd_lwp; static bool debug_fbsd_nat; @@ -1667,7 +1666,6 @@ fbsd_nat_target::set_syscall_catchpoint (int pid, bool needed, return 0; } #endif -#endif bool fbsd_nat_target::supports_multi_process () @@ -1679,7 +1677,6 @@ void _initialize_fbsd_nat (); void _initialize_fbsd_nat () { -#ifdef PT_LWPINFO add_setshow_boolean_cmd ("fbsd-lwp", class_maintenance, &debug_fbsd_lwp, _("\ Set debugging of FreeBSD lwp module."), _("\ @@ -1696,5 +1693,4 @@ Enables printf debugging output."), NULL, &show_fbsd_nat_debug, &setdebuglist, &showdebuglist); -#endif } diff --git a/gdb/fbsd-nat.h b/gdb/fbsd-nat.h index 1b1e043dae7..ed3c1cdfc51 100644 --- a/gdb/fbsd-nat.h +++ b/gdb/fbsd-nat.h @@ -55,7 +55,6 @@ public: ULONGEST offset, ULONGEST len, ULONGEST *xfered_len) override; -#ifdef PT_LWPINFO bool thread_alive (ptid_t ptid) override; std::string pid_to_str (ptid_t) override; @@ -99,7 +98,6 @@ public: int set_syscall_catchpoint (int, bool, int, gdb::array_view) override; #endif -#endif /* PT_LWPINFO */ bool supports_multi_process () override; }; -- 2.30.2