1 files changed, 13 insertions, 15 deletions

diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc
index fe5010ee1..aa3032816 100644
--- a/winsup/cygwin/exceptions.cc
+++ b/winsup/cygwin/exceptions.cc
@@ -757,7 +757,7 @@ sig_handle_tty_stop (int sig)
 } /* end extern "C" */
 
 bool
-_cygtls::interrupt_now (CONTEXT *cx, int sig, void *handler,
+_cygtls::interrupt_now (CONTEXT *cx, siginfo_t& si, void *handler,
 			struct sigaction& siga)
 {
   bool interrupted;
@@ -771,7 +771,7 @@ _cygtls::interrupt_now (CONTEXT *cx, int sig, void *handler,
   else
     {
       push ((__stack_t) cx->Eip);
-      interrupt_setup (sig, handler, siga);
+      interrupt_setup (si, handler, siga);
       cx->Eip = pop ();
       SetThreadContext (*this, cx); /* Restart the thread in a new location */
       interrupted = true;
@@ -780,7 +780,7 @@ _cygtls::interrupt_now (CONTEXT *cx, int sig, void *handler,
 }
 
 void __stdcall
-_cygtls::interrupt_setup (int sig, void *handler, struct sigaction& siga)
+_cygtls::interrupt_setup (siginfo_t& si, void *handler, struct sigaction& siga)
 {
   push ((__stack_t) sigdelayed);
   deltamask = siga.sa_mask & ~SIG_NONMASKABLE;
@@ -795,7 +795,8 @@ _cygtls::interrupt_setup (int sig, void *handler, struct sigaction& siga)
       myself->process_state |= PID_STOPPED;
     }
 
-  this->sig = sig;			// Should always be last thing set to avoid a race
+  infodata = si;
+  this->sig = si.si_signo;		// Should always be last thing set to avoid a race
 
   if (incyg)
     {
@@ -805,7 +806,7 @@ _cygtls::interrupt_setup (int sig, void *handler, struct sigaction& siga)
     }
 
   proc_subproc (PROC_CLEARWAIT, 1);
-  sigproc_printf ("armed signal_arrived %p, signal %d", signal_arrived, sig);
+  sigproc_printf ("armed signal_arrived %p, signal %d", signal_arrived, si.si_signo);
 }
 
 extern "C" void __stdcall
@@ -815,10 +816,8 @@ set_sig_errno (int e)
   _my_tls.saved_errno = e;
 }
 
-static int setup_handler (int, void *, struct sigaction&, _cygtls *tls)
-  __attribute__((regparm(3)));
-static int
-setup_handler (int sig, void *handler, struct sigaction& siga, _cygtls *tls)
+int
+sigpacket::setup_handler (void *handler, struct sigaction& siga, _cygtls *tls)
 {
   CONTEXT cx;
   bool interrupted = false;
@@ -826,7 +825,7 @@ setup_handler (int sig, void *handler, struct sigaction& siga, _cygtls *tls)
   if (tls->sig)
     {
       sigproc_printf ("trying to send signal %d but signal %d already armed",
-		      sig, tls->sig);
+		      si.si_signo, tls->sig);
       goto out;
     }
 
@@ -839,7 +838,7 @@ setup_handler (int sig, void *handler, struct sigaction& siga, _cygtls *tls)
 	    {
 	      sigproc_printf ("controlled interrupt. stackptr %p, stack %p, stackptr[-1] %p",
 			      tls->stackptr, tls->stack, tls->stackptr[-1]);
-	      tls->interrupt_setup (sig, handler, siga);
+	      tls->interrupt_setup (si, handler, siga);
 	      interrupted = true;
 	      tls->unlock ();
 	      goto out;
@@ -868,7 +867,7 @@ setup_handler (int sig, void *handler, struct sigaction& siga, _cygtls *tls)
 	      if (!GetThreadContext (hth, &cx))
 		sigproc_printf ("couldn't get context of thread, %E");
 	      else
-		interrupted = tls->interrupt_now (&cx, sig, handler, siga);
+		interrupted = tls->interrupt_now (&cx, si, handler, siga);
 
 	      tls->unlock ();
 	      ResumeThread (hth);
@@ -885,7 +884,7 @@ setup_handler (int sig, void *handler, struct sigaction& siga, _cygtls *tls)
     }
 
 out:
-  sigproc_printf ("signal %d %sdelivered", sig, interrupted ? "" : "not ");
+  sigproc_printf ("signal %d %sdelivered", si.si_signo, interrupted ? "" : "not ");
   return interrupted;
 }
 
@@ -1234,10 +1233,9 @@ dosig:
       rc = -1;		/* No signals delivered if stopped */
   else
     {
-      tls->set_siginfo (this);
       /* Dispatch to the appropriate function. */
       sigproc_printf ("signal %d, signal handler %p", si.si_signo, handler);
-      rc = setup_handler (si.si_signo, handler, thissig, tls);
+      rc = setup_handler (handler, thissig, tls);
       continue_now = false;
     }