[newlib-cygwin] Set mcontext.cr2 to the faulting address

[Jon TURNEY]

https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=0bb27f15ec3db37c704b345f67f51c31dd608b06

commit 0bb27f15ec3db37c704b345f67f51c31dd608b06
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date:   Sat Apr 4 16:12:27 2015 +0100

    Set mcontext.cr2 to the faulting address
    
    	* exceptions.cc (call_signal_handler): Set mcontext.cr2 to the
    	faulting address.
    
    Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>

Diff:
---
 winsup/cygwin/ChangeLog     | 5 +++++
 winsup/cygwin/exceptions.cc | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index ec70f1a..6e71e61 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-04  Jon TURNEY  <jon.turney@dronecode.org.uk>
+
+	* exceptions.cc (call_signal_handler): Set mcontext.cr2 to the
+	faulting address.
+
 2015-04-02  Jon TURNEY  <jon.turney@dronecode.org.uk>
 
 	* exceptions.cc (call_signal_handler): Only bother to construct
diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc
index 0c9ee14..4a6c21e 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;
 	}