This commit was manufactured by cvs2svn to create tag 'cygwin-cygwin-1_7_17-release

1_7_17-release'.

Sprout from cygwin-64bit-branch 2012-08-10 09:37:33 UTC cvs2svn 'This commit was manufactured by cvs2svn to create branch 'cygwin-64bit-'
Cherrypick from cygwin-64bit-branch 2012-10-09 12:05:52 UTC cvs2svn 'This commit was manufactured by cvs2svn to create branch 'cygwin-64bit-':
    newlib/libc/posix/wordexp2.h
Cherrypick from master 2012-10-20 15:31:50 UTC Corinna Vinschen <corinna@vinschen.de> '	* new-features.sgml (ov-new1.7.17): Add section.':
    ChangeLog
    Makefile.def
    Makefile.in
    Makefile.tpl
    compile
    config.guess
    config.sub
    config/ChangeLog
    config/cloog.m4
    config/isl.m4
    config/mt-sde
    configure
    include/ChangeLog
    include/demangle.h
    include/dis-asm.h
    include/dwarf2.def
    include/elf/ChangeLog
    include/elf/aarch64.h
    include/elf/arm.h
    include/elf/common.h
    include/elf/tilegx.h
    include/mach-o/ChangeLog
    include/mach-o/codesign.h
    include/mach-o/external.h
    include/mach-o/loader.h
    include/mach-o/reloc.h
    include/mach-o/x86-64.h
    include/objalloc.h
    include/opcode/ChangeLog
    include/opcode/aarch64.h
    include/opcode/arm.h
    include/opcode/hppa.h
    include/opcode/ia64.h
    include/opcode/mips.h
    include/opcode/moxie.h
    include/opcode/s390.h
    include/opcode/sparc.h
    include/plugin-api.h
    libtool.m4
    ltoptions.m4
    ltversion.m4
    lt~obsolete.m4
    newlib/ChangeLog
    newlib/HOWTO
    newlib/README
    newlib/configure.host
    newlib/doc/makedoc.c
    newlib/libc/include/_ansi.h
    newlib/libc/include/assert.h
    newlib/libc/include/machine/_default_types.h
    newlib/libc/include/machine/ieeefp.h
    newlib/libc/include/machine/setjmp.h
    newlib/libc/include/machine/time.h
    newlib/libc/include/math.h
    newlib/libc/include/stdint.h
    newlib/libc/include/sys/config.h
    newlib/libc/include/sys/features.h
    newlib/libc/include/tgmath.h
    newlib/libc/machine/configure
    newlib/libc/machine/configure.in
    newlib/libc/machine/rl78/Makefile.am
    newlib/libc/machine/rl78/Makefile.in
    newlib/libc/machine/rl78/aclocal.m4
    newlib/libc/machine/rl78/configure
    newlib/libc/machine/rl78/configure.in
    newlib/libc/machine/rl78/setjmp.S
    newlib/libc/posix/engine.c
    newlib/libc/posix/wordexp.c
    newlib/libc/posix/wordfree.c
    newlib/libc/search/hash_buf.c
    newlib/libc/stdio/fgets.c
    newlib/libc/stdio/flags.c
    newlib/libc/stdio/vfprintf.c
    newlib/libc/stdlib/btowc.c
    newlib/libc/stdlib/getopt.c
    newlib/libc/string/strcasestr.c
    newlib/libc/sys/sysnecv850/sbrk.c
    newlib/libc/time/strftime.c
    newlib/libm/machine/configure
    newlib/libm/machine/configure.in
    newlib/testsuite/newlib.stdio/stdio.exp
    newlib/testsuite/newlib.stdio/swprintf.c
    winsup/cygwin/ChangeLog
    winsup/cygwin/DevNotes
    winsup/cygwin/child_info.h
    winsup/cygwin/cygheap.cc
    winsup/cygwin/cygthread.cc
    winsup/cygwin/cygtls.cc
    winsup/cygwin/cygtls.h
    winsup/cygwin/cygwait.cc
    winsup/cygwin/cygwait.h
    winsup/cygwin/dll_init.cc
    winsup/cygwin/errno.cc
    winsup/cygwin/exceptions.cc
    winsup/cygwin/fhandler.cc
    winsup/cygwin/fhandler.h
    winsup/cygwin/fhandler_clipboard.cc
    winsup/cygwin/fhandler_console.cc
    winsup/cygwin/fhandler_floppy.cc
    winsup/cygwin/fhandler_process.cc
    winsup/cygwin/fhandler_raw.cc
    winsup/cygwin/fhandler_socket.cc
    winsup/cygwin/fhandler_tape.cc
    winsup/cygwin/fhandler_termios.cc
    winsup/cygwin/fhandler_tty.cc
    winsup/cygwin/flock.cc
    winsup/cygwin/gendef
    winsup/cygwin/glob.cc
    winsup/cygwin/globals.cc
    winsup/cygwin/gmon.c
    winsup/cygwin/hookapi.cc
    winsup/cygwin/include/cygwin/fs.h
    winsup/cygwin/include/cygwin/in.h
    winsup/cygwin/include/limits.h
    winsup/cygwin/miscfuncs.cc
    winsup/cygwin/mount.cc
    winsup/cygwin/mount.h
    winsup/cygwin/net.cc
    winsup/cygwin/path.cc
    winsup/cygwin/pinfo.cc
    winsup/cygwin/posix_ipc.cc
    winsup/cygwin/pseudo-reloc.cc
    winsup/cygwin/release/1.7.10
    winsup/cygwin/release/1.7.11
    winsup/cygwin/release/1.7.12
    winsup/cygwin/release/1.7.13
    winsup/cygwin/release/1.7.14
    winsup/cygwin/release/1.7.15
    winsup/cygwin/release/1.7.16
    winsup/cygwin/release/1.7.17
    winsup/cygwin/sec_helper.cc
    winsup/cygwin/signal.cc
    winsup/cygwin/sigproc.h
    winsup/cygwin/smallprint.cc
    winsup/cygwin/spawn.cc
    winsup/cygwin/syscalls.cc
    winsup/cygwin/thread.cc
    winsup/cygwin/thread.h
    winsup/cygwin/tty.h
    winsup/cygwin/wait.cc
    winsup/doc/ChangeLog
    winsup/doc/faq-what.xml
    winsup/doc/new-features.sgml
    winsup/utils/ChangeLog
    winsup/utils/Makefile.in
    winsup/utils/cygcheck.cc
    winsup/w32api/ChangeLog
    winsup/w32api/include/winbase.h
    winsup/w32api/lib/kernel32.def

1 files changed, 50 insertions, 42 deletions

diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc
index 649574fc2..aa3032816 100644
--- a/winsup/cygwin/exceptions.cc
+++ b/winsup/cygwin/exceptions.cc
@@ -37,8 +37,6 @@ details. */
 
 char debugger_command[2 * NT_MAX_PATH + 20];
 
-extern "C" void sigdelayed ();
-
 static BOOL WINAPI ctrl_c_handler (DWORD);
 
 /* This is set to indicate that we have already exited.  */
@@ -710,7 +708,7 @@ handle_sigsuspend (sigset_t tempmask)
   sigproc_printf ("oldmask %p, newmask %p", oldmask, tempmask);
 
   pthread_testcancel ();
-  cancelable_wait (NULL, cw_infinite, cw_cancel | cw_cancel_self | cw_sig_eintr);
+  cygwait (NULL, cw_infinite, cw_cancel | cw_cancel_self | cw_sig_eintr);
 
   set_sig_errno (EINTR);	// Per POSIX
 
@@ -741,10 +739,11 @@ sig_handle_tty_stop (int sig)
       sigproc_printf ("process %d stopped by signal %d", myself->pid, sig);
       /* FIXME! This does nothing to suspend anything other than the main
 	 thread. */
-      DWORD res = cancelable_wait (NULL, cw_infinite, cw_sig_eintr);
+      DWORD res = cygwait (NULL, cw_infinite, cw_sig_eintr);
       switch (res)
 	{
 	case WAIT_SIGNALED:
+	  _my_tls.sig = 0;
 	  myself->stopsig = SIGCONT;
 	  myself->alert_parent (SIGCONT);
 	  break;
@@ -758,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;
@@ -772,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;
@@ -781,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;
@@ -796,13 +795,18 @@ _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 && signal_arrived)
-    SetEvent (signal_arrived);
+  if (incyg)
+    {
+      if (!signal_arrived)
+	create_signal_arrived ();
+      SetEvent (signal_arrived);
+    }
 
   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
@@ -812,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;
@@ -823,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;
     }
 
@@ -836,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;
@@ -844,30 +846,34 @@ setup_handler (int sig, void *handler, struct sigaction& siga, _cygtls *tls)
 
 	  DWORD res;
 	  HANDLE hth = (HANDLE) *tls;
-
-	  /* Suspend the thread which will receive the signal.
-	     If one of these conditions is not true we loop.
-	     If the thread is already suspended (which can occur when a program
-	     has called SuspendThread on itself) then just queue the signal. */
-
-	  sigproc_printf ("suspending thread, tls %p, _main_tls %p", tls, _main_tls);
-	  res = SuspendThread (hth);
-	  /* Just set pending if thread is already suspended */
-	  if (res)
+	  if (!hth)
+	    sigproc_printf ("thread handle NULL, not set up yet?");
+	  else
 	    {
+	      /* Suspend the thread which will receive the signal.
+		 If one of these conditions is not true we loop.
+		 If the thread is already suspended (which can occur when a program
+		 has called SuspendThread on itself) then just queue the signal. */
+
+	      sigproc_printf ("suspending thread, tls %p, _main_tls %p", tls, _main_tls);
+	      res = SuspendThread (hth);
+	      /* Just set pending if thread is already suspended */
+	      if (res)
+		{
+		  ResumeThread (hth);
+		  goto out;
+		}
+	      cx.ContextFlags = CONTEXT_CONTROL | CONTEXT_INTEGER;
+	      if (!GetThreadContext (hth, &cx))
+		sigproc_printf ("couldn't get context of thread, %E");
+	      else
+		interrupted = tls->interrupt_now (&cx, si, handler, siga);
+
+	      tls->unlock ();
 	      ResumeThread (hth);
-	      goto out;
+	      if (interrupted)
+		goto out;
 	    }
-	  cx.ContextFlags = CONTEXT_CONTROL | CONTEXT_INTEGER;
-	  if (!GetThreadContext (hth, &cx))
-	    sigproc_printf ("couldn't get context of thread, %E");
-	  else
-	    interrupted = tls->interrupt_now (&cx, sig, handler, siga);
-
-	  tls->unlock ();
-	  ResumeThread (hth);
-	  if (interrupted)
-	    goto out;
 
 	  sigproc_printf ("couldn't interrupt.  trying again.");
 	  yield ();
@@ -878,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;
 }
 
@@ -1227,16 +1233,18 @@ 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;
     }
 
 done:
   if (continue_now)
-    SetEvent (tls->signal_arrived);
+    {
+      tls->sig = SIGCONT;
+      SetEvent (tls->signal_arrived);
+    }
   sigproc_printf ("returning %d", rc);
   return rc;