From: Andrew Burgess <andrew.burgess@embecosm.com>
Date: Wed, 23 May 2018 13:24:28 +0000 (+0100)
Subject: gdb: Fix an infrun debug log message
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=defd21729f1ceb51999afcb342310835f8ab2faf;p=binutils-gdb.git

gdb: Fix an infrun debug log message

Run the test gdb.threads/multiple-successive-infcall.exp by hand, if
you turn on 'debug infrun 1', you'll see that the debug line fixed in
this commit is printed and contains the wrong $pc value.  Fixed in
this commit.

gdb/ChangeLog:

	* infrun.c (do_target_wait): Change old version of $pc printed.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4179665c2ed..e05561a1e57 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2018-06-12  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+	* infrun.c (do_target_wait): Change old version of $pc printed.
+
 2018-06-11  Simon Marchi  <simon.marchi@ericsson.com>
 
 	* dwarf2read.c (read_index_from_section): Rename to...
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 94a88c13d79..655681ff360 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -3533,7 +3533,7 @@ do_target_wait (ptid_t ptid, struct target_waitstatus *status, int options)
 	    fprintf_unfiltered (gdb_stdlog,
 				"infrun: PC of %s changed.  was=%s, now=%s\n",
 				target_pid_to_str (tp->ptid),
-				paddress (gdbarch, tp->prev_pc),
+				paddress (gdbarch, tp->suspend.stop_pc),
 				paddress (gdbarch, pc));
 	  discard = 1;
 	}