From b9771db784e287ec176dd2746a278eacdd973cf4 Mon Sep 17 00:00:00 2001 From: Kamil Rytarowski Date: Fri, 24 Apr 2020 18:10:07 +0200 Subject: [PATCH] Remove unused code block in inf_ptrace_target::wait Remove unused PT_GET_PROCESS_STATE block. It used to be used by OpenBSD, but it is now reimplemented independently in obsd-nat.c. gdb/ChangeLog: * inf-ptrace.c (inf_ptrace_target::wait): Remove `PT_GET_PROCESS_STATE' block. Change-Id: I9b872df8517b658c0dfe889fc1e4a7009bc5c076 --- gdb/ChangeLog | 5 +++++ gdb/inf-ptrace.c | 38 -------------------------------------- 2 files changed, 5 insertions(+), 38 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ccc0baafb1..ba0f680f97 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2020-04-25 Kamil Rytarowski + + * inf-ptrace.c (inf_ptrace_target::wait): Remove + `PT_GET_PROCESS_STATE' block. + 2020-04-24 Tom Tromey * symtab.h (symbol_get_demangled_name): Don't declare. diff --git a/gdb/inf-ptrace.c b/gdb/inf-ptrace.c index 4519a9ebef..a83ffcc879 100644 --- a/gdb/inf-ptrace.c +++ b/gdb/inf-ptrace.c @@ -353,44 +353,6 @@ inf_ptrace_target::wait (ptid_t ptid, struct target_waitstatus *ourstatus, } while (pid == -1); -#ifdef PT_GET_PROCESS_STATE - if (WIFSTOPPED (status)) - { - ptrace_state_t pe; - pid_t fpid; - - if (ptrace (PT_GET_PROCESS_STATE, pid, - (PTRACE_TYPE_ARG3)&pe, sizeof pe) == -1) - perror_with_name (("ptrace")); - - switch (pe.pe_report_event) - { - case PTRACE_FORK: - ourstatus->kind = TARGET_WAITKIND_FORKED; - ourstatus->value.related_pid = ptid_t (pe.pe_other_pid); - - /* Make sure the other end of the fork is stopped too. */ - fpid = waitpid (pe.pe_other_pid, &status, 0); - if (fpid == -1) - perror_with_name (("waitpid")); - - if (ptrace (PT_GET_PROCESS_STATE, fpid, - (PTRACE_TYPE_ARG3)&pe, sizeof pe) == -1) - perror_with_name (("ptrace")); - - gdb_assert (pe.pe_report_event == PTRACE_FORK); - gdb_assert (pe.pe_other_pid == pid); - if (fpid == inferior_ptid.pid ()) - { - ourstatus->value.related_pid = ptid_t (pe.pe_other_pid); - return ptid_t (fpid); - } - - return ptid_t (pid); - } - } -#endif - store_waitstatus (ourstatus, status); return ptid_t (pid); } -- 2.34.1