Restore RIP on return from a signal handler on amd64 - mirrors the

change in revision 5641 to restore EIP on x86.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@5652

diff --git a/coregrind/m_sigframe/sigframe-amd64-linux.c b/coregrind/m_sigframe/sigframe-amd64-linux.c
index 804e4d910ef8de1a56e534876fd47ef7415b6879..01933a650ba63f3455c052163eb981251b34dd3b 100644 (file)
--- a/coregrind/m_sigframe/sigframe-amd64-linux.c
+++ b/coregrind/m_sigframe/sigframe-amd64-linux.c
@@ -565,7 +565,7 @@ void restore_sigcontext( ThreadState *tst,
    tst->arch.vex.guest_R14     = sc->r14;
    tst->arch.vex.guest_R15     = sc->r15;
 //::    tst->arch.vex.guest_rflags  = sc->rflags;
-//::    tst->arch.vex.guest_RIP     = sc->rip;
+   tst->arch.vex.guest_RIP     = sc->rip;
 
 //::    tst->arch.vex.guest_CS      = sc->cs; 
 //::    tst->arch.vex.guest_FS      = sc->fs;