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, 15 insertions, 15 deletions

diff --git a/winsup/cygwin/thread.cc b/winsup/cygwin/thread.cc
index aefab24cd..eacf26741 100644
--- a/winsup/cygwin/thread.cc
+++ b/winsup/cygwin/thread.cc
@@ -575,17 +575,17 @@ pthread::cancel ()
       GetThreadContext (win32_obj_id, &context);
       /* The OS is not foolproof in terms of asynchronous thread cancellation
 	 and tends to hang infinitely if we change the instruction pointer.
-         So just don't cancel asynchronously if the thread is currently
+	 So just don't cancel asynchronously if the thread is currently
 	 executing Windows code.  Rely on deferred cancellation in this case. */
       if (!cygtls->inside_kernel (&context))
-        {
-          context.Eip = (DWORD) pthread::static_cancel_self;
-          SetThreadContext (win32_obj_id, &context);
-        }
+	{
+	  context.Eip = (DWORD) pthread::static_cancel_self;
+	  SetThreadContext (win32_obj_id, &context);
+	}
     }
   mutex.unlock ();
   /* See above.  For instance, a thread which waits for a semaphore in sem_wait
-     will call cancelable_wait which in turn calls WFMO.  While this WFMO call
+     will call cygwait which in turn calls WFMO.  While this WFMO call
      is cancelable by setting the thread's cancel_event object, the OS
      apparently refuses to set the thread's context and continues to wait for
      the WFMO conditions.  This is *not* reflected in the return value of
@@ -1228,7 +1228,7 @@ pthread_cond::wait (pthread_mutex_t mutex, PLARGE_INTEGER timeout)
   ++mutex->condwaits;
   mutex->unlock ();
 
-  rv = cancelable_wait (sem_wait, timeout, cw_cancel | cw_sig_eintr);
+  rv = cygwait (sem_wait, timeout, cw_cancel | cw_sig_eintr);
 
   mtx_out.lock ();
 
@@ -1744,7 +1744,7 @@ pthread_mutex::lock ()
 	   || !pthread::equal (owner, self))
     {
       /* FIXME: no cancel? */
-      cancelable_wait (win32_obj_id, cw_infinite, cw_sig);
+      cygwait (win32_obj_id, cw_infinite, cw_sig);
       set_owner (self);
     }
   else
@@ -1885,7 +1885,7 @@ pthread_spinlock::lock ()
 	  LARGE_INTEGER timeout;
 	  timeout.QuadPart = -10000LL;
 	  /* FIXME: no cancel? */
-	  cancelable_wait (win32_obj_id, &timeout, cw_sig);
+	  cygwait (win32_obj_id, &timeout, cw_sig);
 	}
     }
   while (result == -1);
@@ -2364,7 +2364,7 @@ pthread::join (pthread_t *thread, void **return_val)
       (*thread)->attr.joinable = PTHREAD_CREATE_DETACHED;
       (*thread)->mutex.unlock ();
 
-      switch (cancelable_wait ((*thread)->win32_obj_id, cw_infinite, cw_sig | cw_cancel))
+      switch (cygwait ((*thread)->win32_obj_id, cw_infinite, cw_sig | cw_cancel))
 	{
 	case WAIT_OBJECT_0:
 	  if (return_val)
@@ -3476,7 +3476,7 @@ semaphore::_timedwait (const struct timespec *abstime)
   timeout.QuadPart = abstime->tv_sec * NSPERSEC
 		     + (abstime->tv_nsec + 99) / 100 + FACTOR;
 
-  switch (cancelable_wait (win32_obj_id, &timeout, cw_cancel | cw_cancel_self | cw_sig_eintr))
+  switch (cygwait (win32_obj_id, &timeout, cw_cancel | cw_cancel_self | cw_sig_eintr))
     {
     case WAIT_OBJECT_0:
       currentvalue--;
@@ -3488,7 +3488,7 @@ semaphore::_timedwait (const struct timespec *abstime)
       set_errno (ETIMEDOUT);
       return -1;
     default:
-      pthread_printf ("cancelable_wait failed. %E");
+      pthread_printf ("cygwait failed. %E");
       __seterrno ();
       return -1;
     }
@@ -3498,7 +3498,7 @@ semaphore::_timedwait (const struct timespec *abstime)
 int
 semaphore::_wait ()
 {
-  switch (cancelable_wait (win32_obj_id, cw_infinite, cw_cancel | cw_cancel_self | cw_sig_eintr))
+  switch (cygwait (win32_obj_id, cw_infinite, cw_cancel | cw_cancel_self | cw_sig_eintr))
     {
     case WAIT_OBJECT_0:
       currentvalue--;
@@ -3507,7 +3507,7 @@ semaphore::_wait ()
       set_errno (EINTR);
       return -1;
     default:
-      pthread_printf ("cancelable_wait failed. %E");
+      pthread_printf ("cygwait failed. %E");
       break;
     }
   return 0;
@@ -3523,7 +3523,7 @@ semaphore::_fixup_after_fork ()
       this->win32_obj_id = ::CreateSemaphore (&sec_none_nih, currentvalue,
 					      LONG_MAX, NULL);
       if (!win32_obj_id)
-	api_fatal ("failed to create new win32 semaphore, error %d");
+	api_fatal ("failed to create new win32 semaphore, %E");
     }
 }