2012-04-13  Luis Machado  <lgustavo@codesourcery.com>

	* infrun.c (resume): Update PC address to the real PC after
	preparing to do displaced stepping.

Index: HEAD-git/gdb/infrun.c
===================================================================
--- HEAD-git.orig/gdb/infrun.c	2012-04-13 16:01:25.592842215 -0300
+++ HEAD-git/gdb/infrun.c	2012-04-13 16:22:53.652909294 -0300
@@ -1789,6 +1789,10 @@ a command like `return' or `jump' to con
 	  return;
 	}
 
+      /* Update pc to reflect the new address from which we will execute
+	 instructions due to displaced stepping.  */
+      pc = regcache_read_pc (get_thread_regcache (inferior_ptid));
+
       displaced = get_displaced_stepping_state (ptid_get_pid (inferior_ptid));
       step = gdbarch_displaced_step_hw_singlestep (gdbarch,
 						   displaced->step_closure);