aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog6
-rw-r--r--gdb/linux-nat.c5
2 files changed, 10 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f70aa8a..59eb04a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2017-10-05 Pedro Alves <palves@redhat.com>
+
+ * linux-nat.c (linux_child_follow_fork): When following the parent
+ and detaching the child, consult the parent thread's architecture
+ instead of the child's.
+
2017-10-05 Ulrich Weigand <uweigand@de.ibm.com>
* ax.h: Do not include "doublest.h".
diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
index 0f340ee..6080415 100644
--- a/gdb/linux-nat.c
+++ b/gdb/linux-nat.c
@@ -510,8 +510,11 @@ linux_child_follow_fork (struct target_ops *ops, int follow_child,
To work around this, single step the child process
once before detaching to clear the flags. */
+ /* Note that we consult the parent's architecture instead of
+ the child's because there's no inferior for the child at
+ this point. */
if (!gdbarch_software_single_step_p (target_thread_architecture
- (child_lp->ptid)))
+ (parent_ptid)))
{
linux_disable_event_reporting (child_pid);
if (ptrace (PTRACE_SINGLESTEP, child_pid, 0, 0) < 0)