From: Ulrich Weigand <uweigand@de.ibm.com>
Date: Tue, 5 May 2009 13:09:00 +0000 (+0000)
Subject: 	* fork-child.c (startup_inferior): Move setting stop_pc ...
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f698437e4b9dd8235f06d0cd46382ec506c3e0be;p=binutils-gdb.git

	* fork-child.c (startup_inferior): Move setting stop_pc ...
	* infcmd.c (post_create_inferior): ... to here.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a42483fa27b..e5779080406 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-05  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* fork-child.c (startup_inferior): Move setting stop_pc ...
+	* infcmd.c (post_create_inferior): ... to here.
+
 2009-05-04  Pedro Alves  <pedro@codesourcery.com>
 
 	* go32-nat.c (go32_stop): Delete.
diff --git a/gdb/fork-child.c b/gdb/fork-child.c
index a1726bd5439..a6bf2a959c5 100644
--- a/gdb/fork-child.c
+++ b/gdb/fork-child.c
@@ -530,8 +530,6 @@ startup_inferior (int ntraps)
 
   /* Mark all threads non-executing.  */
   set_executing (pid_to_ptid (-1), 0);
-
-  stop_pc = read_pc ();
 }
 
 /* Implement the "unset exec-wrapper" command.  */
diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index 9cad3cb1865..a209848d2f6 100644
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -391,6 +391,9 @@ post_create_inferior (struct target_ops *target, int from_tty)
      don't need to.  */
   target_find_description ();
 
+  /* Now that we know the register layout, retrieve current PC.  */
+  stop_pc = read_pc ();
+
   /* If the solist is global across processes, there's no need to
      refetch it here.  */
   if (exec_bfd && !gdbarch_has_global_solist (target_gdbarch))