[PATCH 3/3] Set mcontext.cr2 to the faulting address

[Jon TURNEY]

	* exceptions.cc (call_signal_handler): Set mcontext.cr2 to the
	faulting address.

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
---
 winsup/cygwin/ChangeLog     | 5 +++++
 winsup/cygwin/exceptions.cc | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc
index 0223052..919122e 100644
--- a/winsup/cygwin/exceptions.cc
+++ b/winsup/cygwin/exceptions.cc
@@ -1521,6 +1521,10 @@ _cygtls::call_signal_handler ()
 
           context.uc_sigmask = context.uc_mcontext.oldmask = this_oldmask;
 
+          context.uc_mcontext.cr2 = (thissi.si_signo == SIGSEGV
+                                     || thissi.si_signo == SIGBUS)
+            ? (uintptr_t) thissi.si_addr : 0;
+
           thiscontext = &context;
         }
 
-- 
2.1.4