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

1_7_16-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 master 2012-07-20 09:45:34 UTC Corinna Vinschen <corinna@vinschen.de> 'Forced checkin to fix date':
    compile
    include/ChangeLog
    include/dis-asm.h
    include/elf/m68hc11.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/opcode/ChangeLog
    include/opcode/mips.h
    ltoptions.m4
    ltversion.m4
    lt~obsolete.m4
    newlib/ChangeLog
    newlib/libc/include/stdio.h
    newlib/libc/include/sys/signal.h
    newlib/libc/include/sys/stat.h
    newlib/libc/include/sys/time.h
    newlib/libc/include/sys/times.h
    newlib/libc/include/sys/wait.h
    newlib/libc/locale/lmessages.c
    newlib/libc/locale/lmonetary.c
    newlib/libc/locale/nl_langinfo.c
    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/collate.c
    newlib/libc/posix/engine.c
    newlib/libc/posix/glob.c
    newlib/libc/posix/popen.c
    newlib/libc/posix/readdir.c
    newlib/libc/posix/regcomp.c
    newlib/libc/posix/wordexp.c
    newlib/libc/reent/mkdirr.c
    newlib/libc/reent/renamer.c
    newlib/libc/search/hash.c
    newlib/libc/search/hash_bigkey.c
    newlib/libc/search/hash_page.c
    newlib/libc/stdio/asiprintf.c
    newlib/libc/stdio/asprintf.c
    newlib/libc/stdio/freopen.c
    newlib/libc/stdio/mktemp.c
    newlib/libc/stdio/vasiprintf.c
    newlib/libc/stdio/vasprintf.c
    newlib/libc/stdio/vfprintf.c
    newlib/libc/stdio/vfscanf.c
    newlib/libc/stdio/vfwprintf.c
    newlib/libc/stdlib/mbtowc_r.c
    newlib/libc/stdlib/mprec.h
    newlib/libc/stdlib/wctomb_r.c
    newlib/libc/string/strcasestr.c
    newlib/libc/sys/sysnecv850/crt0.S
    newlib/libc/time/strptime.c
    newlib/libm/common/sf_round.c
    newlib/libm/math/e_atan2.c
    newlib/libm/math/e_exp.c
    newlib/libm/math/e_pow.c
    newlib/libm/math/e_rem_pio2.c
    newlib/libm/math/ef_exp.c
    newlib/libm/math/ef_pow.c
    newlib/libm/math/er_lgamma.c
    newlib/libm/math/erf_lgamma.c
    newlib/testsuite/newlib.stdio/stdio.exp
    newlib/testsuite/newlib.stdio/swprintf.c
    winsup/ChangeLog
    winsup/Makefile.common
    winsup/cygwin/ChangeLog
    winsup/cygwin/DevNotes
    winsup/cygwin/Makefile.in
    winsup/cygwin/cygheap.cc
    winsup/cygwin/cygheap.h
    winsup/cygwin/cygserver_ipc.h
    winsup/cygwin/cygthread.cc
    winsup/cygwin/cygtls.cc
    winsup/cygwin/cygtls.h
    winsup/cygwin/cygwait.cc
    winsup/cygwin/cygwait.h
    winsup/cygwin/dcrt0.cc
    winsup/cygwin/exceptions.cc
    winsup/cygwin/fhandler.h
    winsup/cygwin/fhandler_console.cc
    winsup/cygwin/fhandler_socket.cc
    winsup/cygwin/fhandler_tape.cc
    winsup/cygwin/fhandler_termios.cc
    winsup/cygwin/fhandler_tty.cc
    winsup/cygwin/fhandler_windows.cc
    winsup/cygwin/flock.cc
    winsup/cygwin/gendef
    winsup/cygwin/gentls_offsets
    winsup/cygwin/include/cygwin/socket.h
    winsup/cygwin/include/cygwin/version.h
    winsup/cygwin/include/inttypes.h
    winsup/cygwin/include/stdint.h
    winsup/cygwin/include/sys/wait.h
    winsup/cygwin/lib/crt0.h
    winsup/cygwin/ntdll.h
    winsup/cygwin/path.cc
    winsup/cygwin/path.h
    winsup/cygwin/poll.cc
    winsup/cygwin/posix_ipc.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/security.h
    winsup/cygwin/select.cc
    winsup/cygwin/shared.cc
    winsup/cygwin/signal.cc
    winsup/cygwin/sigproc.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/tlsoffsets.h
    winsup/cygwin/wait.cc
    winsup/cygwin/wincap.cc
    winsup/cygwin/winlean.h
    winsup/cygwin/winsup.h
    winsup/doc/ChangeLog
    winsup/doc/faq-using.xml
    winsup/mingw/ChangeLog
    winsup/mingw/configure
    winsup/mingw/configure.in
    winsup/mingw/include/_mingw.h
    winsup/mingw/include/excpt.h
    winsup/mingw/include/inttypes.h
    winsup/mingw/include/limits.h
    winsup/mingw/include/process.h
    winsup/mingw/include/stdint.h
    winsup/mingw/include/stdio.h
    winsup/mingw/include/stdlib.h
    winsup/mingw/include/sys/param.h
    winsup/mingw/include/wchar.h
    winsup/mingw/mingwex/Makefile.in
    winsup/mingw/mingwex/gdtoa/gd_qnan.h
    winsup/mingw/mingwex/tsearch.c
    winsup/w32api/ChangeLog
    winsup/w32api/include/setupapi.h
    winsup/w32api/include/winbase.h
    winsup/w32api/include/windows.h
    winsup/w32api/include/winnt.h
    winsup/w32api/include/winuser.h
    winsup/w32api/include/winver.h
    winsup/w32api/include/wtsapi32.h
    winsup/w32api/lib/Makefile.in
    winsup/w32api/lib/kernel32.def
    winsup/w32api/lib/wtsapi32.def
Delete:
    winsup/mingw/mingwex/membarrier.c
    winsup/w32api/include/sdkddkver.h

1 files changed, 6 insertions, 8 deletions

diff --git a/winsup/cygwin/cygwait.cc b/winsup/cygwin/cygwait.cc
index ee7a705ef..f6eb0a3a7 100644
--- a/winsup/cygwin/cygwait.cc
+++ b/winsup/cygwin/cygwait.cc
@@ -21,8 +21,6 @@
 
 #define is_cw_sig_handle	(mask & (is_cw_sig | is_cw_sig_eintr))
 
-LARGE_INTEGER cw_nowait_storage;
-
 DWORD
 cancelable_wait (HANDLE object, PLARGE_INTEGER timeout, unsigned mask)
 {
@@ -38,13 +36,14 @@ cancelable_wait (HANDLE object, PLARGE_INTEGER timeout, unsigned mask)
   if (object)
     wait_objects[num++] = object;
 
-  set_signal_arrived thread_waiting (is_cw_sig_handle, wait_objects[num]);
-  debug_only_printf ("object %p, thread waiting %d, signal_arrived %p", object, (int) thread_waiting, _my_tls.signal_arrived);
   DWORD sig_n;
-  if (!thread_waiting)
+  if (!is_cw_sig_handle)
     sig_n = WAIT_TIMEOUT + 1;
   else
-    sig_n = WAIT_OBJECT_0 + num++;
+    {
+      sig_n = WAIT_OBJECT_0 + num++;
+      wait_objects[sig_n] = signal_arrived;
+    }
 
   DWORD cancel_n;
   if (!is_cw_cancel || !pthread::is_good_object (&thread) ||
@@ -72,7 +71,6 @@ cancelable_wait (HANDLE object, PLARGE_INTEGER timeout, unsigned mask)
   while (1)
     {
       res = WaitForMultipleObjects (num, wait_objects, FALSE, INFINITE);
-      debug_only_printf ("res %d", res);
       if (res == cancel_n)
 	res = WAIT_CANCELED;
       else if (res == timeout_n)
@@ -81,7 +79,7 @@ cancelable_wait (HANDLE object, PLARGE_INTEGER timeout, unsigned mask)
 	/* all set */;
       else if (is_cw_sig_eintr)
 	res = WAIT_SIGNALED;	/* caller will deal with signals */
-      else if (_my_tls.call_signal_handler ())
+      else if (_my_tls.call_signal_handler () || &_my_tls != _main_tls)
 	continue;
       break;
     }