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

1_7_19-release'.

Sprout from cygwin-64bit-premerge-branch 2013-04-22 17:11:23 UTC cvs2svn 'This commit was manufactured by cvs2svn to create branch 'cygwin-64bit-'
Cherrypick from master 2013-06-05 07:57:39 UTC Corinna Vinschen <corinna@vinschen.de> '	* faq-programming.xml: Convert url to refer to new flat faq.html file.':
    COPYING.NEWLIB
    ChangeLog
    config.guess
    config.sub
    config/ChangeLog
    config/bootstrap-asan.mk
    config/dfp.m4
    config/picflag.m4
    include/ChangeLog
    include/elf/ChangeLog
    include/elf/aarch64.h
    include/elf/common.h
    include/elf/mips.h
    include/elf/msp430.h
    include/opcode/ChangeLog
    include/opcode/avr.h
    include/opcode/mips.h
    include/opcode/msp430.h
    newlib/ChangeLog
    newlib/MAINTAINERS
    newlib/configure
    newlib/configure.host
    newlib/configure.in
    newlib/libc/configure
    newlib/libc/configure.in
    newlib/libc/ctype/ctype_.c
    newlib/libc/ctype/isalnum.c
    newlib/libc/ctype/isalpha.c
    newlib/libc/ctype/isblank.c
    newlib/libc/ctype/iscntrl.c
    newlib/libc/ctype/isdigit.c
    newlib/libc/ctype/islower.c
    newlib/libc/ctype/isprint.c
    newlib/libc/ctype/ispunct.c
    newlib/libc/ctype/isxdigit.c
    newlib/libc/include/machine/ieeefp.h
    newlib/libc/include/machine/setjmp.h
    newlib/libc/include/reent.h
    newlib/libc/include/sys/cdefs.h
    newlib/libc/include/sys/config.h
    newlib/libc/include/sys/features.h
    newlib/libc/include/sys/reent.h
    newlib/libc/include/sys/stat.h
    newlib/libc/libc.texinfo
    newlib/libc/machine/arm/Makefile.am
    newlib/libc/machine/arm/Makefile.in
    newlib/libc/machine/arm/memcpy-armv7a.S
    newlib/libc/machine/arm/memcpy-armv7m.S
    newlib/libc/machine/arm/memcpy-stub.c
    newlib/libc/machine/arm/memcpy.S
    newlib/libc/machine/arm/strcmp.S
    newlib/libc/machine/configure
    newlib/libc/machine/configure.in
    newlib/libc/machine/powerpc/Makefile.am
    newlib/libc/machine/powerpc/Makefile.in
    newlib/libc/reent/reent.c
    newlib/libc/stdio/fgetc.c
    newlib/libc/stdio/fgetwc.c
    newlib/libc/stdio/fgetws.c
    newlib/libc/stdio/findfp.c
    newlib/libc/stdio/fputc.c
    newlib/libc/stdio/fputwc.c
    newlib/libc/stdio/fputws.c
    newlib/libc/stdio/getc.c
    newlib/libc/stdio/getchar.c
    newlib/libc/stdio/local.h
    newlib/libc/stdio/putc.c
    newlib/libc/stdio/putchar.c
    newlib/libc/stdio/scanf.c
    newlib/libc/stdio/setvbuf.c
    newlib/libc/stdio/ungetwc.c
    newlib/libc/stdio/vfscanf.c
    newlib/libc/stdio/vfwscanf.c
    newlib/libc/stdio/viprintf.c
    newlib/libc/stdio/viscanf.c
    newlib/libc/stdio/vprintf.c
    newlib/libc/stdio/vscanf.c
    newlib/libc/stdio/vwprintf.c
    newlib/libc/stdio/vwscanf.c
    newlib/libc/stdio/wscanf.c
    newlib/libc/stdlib/Makefile.am
    newlib/libc/stdlib/Makefile.in
    newlib/libc/stdlib/__atexit.c
    newlib/libc/stdlib/__call_atexit.c
    newlib/libc/stdlib/ecvtbuf.c
    newlib/libc/stdlib/mblen.c
    newlib/libc/stdlib/mbrlen.c
    newlib/libc/stdlib/mbrtowc.c
    newlib/libc/stdlib/mbtowc.c
    newlib/libc/stdlib/nano-mallocr.c
    newlib/libc/stdlib/rand.c
    newlib/libc/stdlib/strtod.c
    newlib/libc/stdlib/wcrtomb.c
    newlib/libc/stdlib/wctob.c
    newlib/libc/stdlib/wctomb.c
    newlib/libc/string/strtok.c
    newlib/libc/time/asctime.c
    newlib/libc/time/gmtime.c
    newlib/libc/time/lcltime.c
    newlib/libm/libm.texinfo
    winsup/cygserver/ChangeLog
    winsup/cygserver/ChangeLog.64bit
    winsup/cygserver/Makefile.in
    winsup/cygserver/bsd_helper.cc
    winsup/cygserver/bsd_helper.h
    winsup/cygserver/bsd_log.cc
    winsup/cygserver/bsd_log.h
    winsup/cygserver/bsd_mutex.cc
    winsup/cygserver/client.cc
    winsup/cygserver/cygserver.cc
    winsup/cygserver/msg.cc
    winsup/cygserver/process.h
    winsup/cygserver/sem.cc
    winsup/cygserver/shm.cc
    winsup/cygserver/sysv_shm.cc
    winsup/cygserver/threaded_queue.h
    winsup/cygwin/ChangeLog
    winsup/cygwin/ChangeLog.64bit
    winsup/cygwin/Makefile.in
    winsup/cygwin/aclocal.m4
    winsup/cygwin/advapi32.cc
    winsup/cygwin/autoload.cc
    winsup/cygwin/automode.c
    winsup/cygwin/binmode.c
    winsup/cygwin/child_info.h
    winsup/cygwin/common.din
    winsup/cygwin/configure
    winsup/cygwin/configure.ac
    winsup/cygwin/cpuid.h
    winsup/cygwin/cygerrno.h
    winsup/cygwin/cygheap.cc
    winsup/cygwin/cygheap.h
    winsup/cygwin/cygmagic
    winsup/cygwin/cygmalloc.h
    winsup/cygwin/cygserver.h
    winsup/cygwin/cygserver_ipc.h
    winsup/cygwin/cygthread.cc
    winsup/cygwin/cygtls.cc
    winsup/cygwin/cygtls.h
    winsup/cygwin/cygwin.sc.in
    winsup/cygwin/dcrt0.cc
    winsup/cygwin/debug.h
    winsup/cygwin/devices.cc
    winsup/cygwin/devices.h
    winsup/cygwin/devices.in
    winsup/cygwin/dir.cc
    winsup/cygwin/dlfcn.cc
    winsup/cygwin/dll_init.cc
    winsup/cygwin/dll_init.h
    winsup/cygwin/dtable.cc
    winsup/cygwin/environ.cc
    winsup/cygwin/environ.h
    winsup/cygwin/errno.cc
    winsup/cygwin/exception.h
    winsup/cygwin/exceptions.cc
    winsup/cygwin/external.cc
    winsup/cygwin/fcntl.cc
    winsup/cygwin/fenv.cc
    winsup/cygwin/fhandler.cc
    winsup/cygwin/fhandler.h
    winsup/cygwin/fhandler_clipboard.cc
    winsup/cygwin/fhandler_console.cc
    winsup/cygwin/fhandler_dev.cc
    winsup/cygwin/fhandler_disk_file.cc
    winsup/cygwin/fhandler_dsp.cc
    winsup/cygwin/fhandler_fifo.cc
    winsup/cygwin/fhandler_floppy.cc
    winsup/cygwin/fhandler_mailslot.cc
    winsup/cygwin/fhandler_mem.cc
    winsup/cygwin/fhandler_netdrive.cc
    winsup/cygwin/fhandler_proc.cc
    winsup/cygwin/fhandler_process.cc
    winsup/cygwin/fhandler_procnet.cc
    winsup/cygwin/fhandler_procsys.cc
    winsup/cygwin/fhandler_procsysvipc.cc
    winsup/cygwin/fhandler_random.cc
    winsup/cygwin/fhandler_raw.cc
    winsup/cygwin/fhandler_registry.cc
    winsup/cygwin/fhandler_serial.cc
    winsup/cygwin/fhandler_socket.cc
    winsup/cygwin/fhandler_tape.cc
    winsup/cygwin/fhandler_termios.cc
    winsup/cygwin/fhandler_tty.cc
    winsup/cygwin/fhandler_virtual.cc
    winsup/cygwin/fhandler_virtual.h
    winsup/cygwin/fhandler_windows.cc
    winsup/cygwin/fhandler_zero.cc
    winsup/cygwin/flock.cc
    winsup/cygwin/fork.cc
    winsup/cygwin/gendef
    winsup/cygwin/gentls_offsets
    winsup/cygwin/glob.cc
    winsup/cygwin/globals.cc
    winsup/cygwin/grp.cc
    winsup/cygwin/heap.cc
    winsup/cygwin/hookapi.cc
    winsup/cygwin/i686.din
    winsup/cygwin/include/a.out.h
    winsup/cygwin/include/asm/byteorder.h
    winsup/cygwin/include/bits/wordsize.h
    winsup/cygwin/include/cygwin/acl.h
    winsup/cygwin/include/cygwin/config.h
    winsup/cygwin/include/cygwin/cygwin_dll.h
    winsup/cygwin/include/cygwin/grp.h
    winsup/cygwin/include/cygwin/if.h
    winsup/cygwin/include/cygwin/ipc.h
    winsup/cygwin/include/cygwin/msg.h
    winsup/cygwin/include/cygwin/sem.h
    winsup/cygwin/include/cygwin/shm.h
    winsup/cygwin/include/cygwin/signal.h
    winsup/cygwin/include/cygwin/socket.h
    winsup/cygwin/include/cygwin/stat.h
    winsup/cygwin/include/cygwin/stdlib.h
    winsup/cygwin/include/cygwin/sysproto.h
    winsup/cygwin/include/cygwin/time.h
    winsup/cygwin/include/cygwin/types.h
    winsup/cygwin/include/cygwin/version.h
    winsup/cygwin/include/fcntl.h
    winsup/cygwin/include/fts.h
    winsup/cygwin/include/ftw.h
    winsup/cygwin/include/glob.h
    winsup/cygwin/include/inttypes.h
    winsup/cygwin/include/io.h
    winsup/cygwin/include/limits.h
    winsup/cygwin/include/mntent.h
    winsup/cygwin/include/stdint.h
    winsup/cygwin/include/sys/cygwin.h
    winsup/cygwin/include/sys/dirent.h
    winsup/cygwin/include/sys/resource.h
    winsup/cygwin/include/sys/socket.h
    winsup/cygwin/include/sys/strace.h
    winsup/cygwin/init.cc
    winsup/cygwin/ioctl.cc
    winsup/cygwin/ipc.cc
    winsup/cygwin/kernel32.cc
    winsup/cygwin/lc_msg.h
    winsup/cygwin/lib/_cygwin_crt0_common.cc
    winsup/cygwin/lib/crt0.h
    winsup/cygwin/lib/cygwin_attach_dll.c
    winsup/cygwin/lib/premain0.c
    winsup/cygwin/lib/premain1.c
    winsup/cygwin/lib/premain2.c
    winsup/cygwin/lib/premain3.c
    winsup/cygwin/libc/arc4random.cc
    winsup/cygwin/libc/base64.c
    winsup/cygwin/libc/bsdlib.cc
    winsup/cygwin/libc/fts.c
    winsup/cygwin/libc/ftw.c
    winsup/cygwin/libc/inet_network.c
    winsup/cygwin/libc/minires-os-if.c
    winsup/cygwin/libc/minires.c
    winsup/cygwin/libc/nftw.c
    winsup/cygwin/libc/rcmd.cc
    winsup/cygwin/libc/rexec.cc
    winsup/cygwin/libstdcxx_wrapper.cc
    winsup/cygwin/localtime.cc
    winsup/cygwin/malloc_wrapper.cc
    winsup/cygwin/miscfuncs.cc
    winsup/cygwin/mkimport
    winsup/cygwin/mktemp.cc
    winsup/cygwin/mmap.cc
    winsup/cygwin/mount.cc
    winsup/cygwin/mount.h
    winsup/cygwin/msg.cc
    winsup/cygwin/mtinfo.h
    winsup/cygwin/net.cc
    winsup/cygwin/netdb.cc
    winsup/cygwin/nfs.h
    winsup/cygwin/nlsfuncs.cc
    winsup/cygwin/ntdll.h
    winsup/cygwin/ntea.cc
    winsup/cygwin/passwd.cc
    winsup/cygwin/path.cc
    winsup/cygwin/path.h
    winsup/cygwin/perprocess.h
    winsup/cygwin/pinfo.cc
    winsup/cygwin/pinfo.h
    winsup/cygwin/pipe.cc
    winsup/cygwin/poll.cc
    winsup/cygwin/posix.sgml
    winsup/cygwin/posix_ipc.cc
    winsup/cygwin/profil.c
    winsup/cygwin/profil.h
    winsup/cygwin/pseudo-reloc.cc
    winsup/cygwin/pwdgrp.h
    winsup/cygwin/regex/engine.c
    winsup/cygwin/regex/regcomp.c
    winsup/cygwin/registry.cc
    winsup/cygwin/regparm.h
    winsup/cygwin/release/1.7.19
    winsup/cygwin/resource.cc
    winsup/cygwin/sched.cc
    winsup/cygwin/sec_acl.cc
    winsup/cygwin/sec_auth.cc
    winsup/cygwin/sec_helper.cc
    winsup/cygwin/security.cc
    winsup/cygwin/security.h
    winsup/cygwin/select.cc
    winsup/cygwin/select.h
    winsup/cygwin/sem.cc
    winsup/cygwin/shared.cc
    winsup/cygwin/shared_info.h
    winsup/cygwin/shm.cc
    winsup/cygwin/signal.cc
    winsup/cygwin/sigproc.cc
    winsup/cygwin/sigproc.h
    winsup/cygwin/smallprint.cc
    winsup/cygwin/spawn.cc
    winsup/cygwin/speclib
    winsup/cygwin/spinlock.h
    winsup/cygwin/strace.cc
    winsup/cygwin/strfuncs.cc
    winsup/cygwin/strsig.cc
    winsup/cygwin/sync.cc
    winsup/cygwin/sync.h
    winsup/cygwin/syscalls.cc
    winsup/cygwin/sysconf.cc
    winsup/cygwin/syslog.cc
    winsup/cygwin/termios.cc
    winsup/cygwin/textmode.c
    winsup/cygwin/textreadmode.c
    winsup/cygwin/thread.cc
    winsup/cygwin/thread.h
    winsup/cygwin/timer.cc
    winsup/cygwin/times.cc
    winsup/cygwin/tlsoffsets.h
    winsup/cygwin/tlsoffsets64.h
    winsup/cygwin/tty.cc
    winsup/cygwin/tty.h
    winsup/cygwin/uinfo.cc
    winsup/cygwin/wait.cc
    winsup/cygwin/winbase.h
    winsup/cygwin/wincap.cc
    winsup/cygwin/wincap.h
    winsup/cygwin/window.cc
    winsup/cygwin/winlean.h
    winsup/cygwin/winsup.h
    winsup/cygwin/wow64.cc
    winsup/cygwin/wow64.h
    winsup/cygwin/x86_64.din
    winsup/doc/.cvsignore
    winsup/doc/ChangeLog
    winsup/doc/Makefile.in
    winsup/doc/Wishlist
    winsup/doc/bodysnatcher.pl
    winsup/doc/configure
    winsup/doc/configure.ac
    winsup/doc/cygserver.xml
    winsup/doc/cygwin-api.in.xml
    winsup/doc/cygwin-ug-net.xml
    winsup/doc/cygwin.xsl
    winsup/doc/cygwinenv.xml
    winsup/doc/dll.xml
    winsup/doc/effectively.xml
    winsup/doc/faq-api.xml
    winsup/doc/faq-copyright.xml
    winsup/doc/faq-programming.xml
    winsup/doc/faq-resources.xml
    winsup/doc/faq-setup.xml
    winsup/doc/faq-using.xml
    winsup/doc/faq-what.xml
    winsup/doc/faq.xml
    winsup/doc/filemodes.xml
    winsup/doc/gcc.xml
    winsup/doc/gdb.xml
    winsup/doc/highlights.xml
    winsup/doc/legal.xml
    winsup/doc/new-features.xml
    winsup/doc/ntsec.xml
    winsup/doc/ov-ex-unix.xml
    winsup/doc/ov-ex-win.xml
    winsup/doc/overview.xml
    winsup/doc/pathnames.xml
    winsup/doc/programming.xml
    winsup/doc/setup-env.xml
    winsup/doc/setup-files.xml
    winsup/doc/setup-locale.xml
    winsup/doc/setup-maxmem.xml
    winsup/doc/setup-net.xml
    winsup/doc/specialnames.xml
    winsup/doc/textbinary.xml
    winsup/doc/ug-info.xml
    winsup/doc/using.xml
    winsup/doc/windres.xml
    winsup/doc/xidepend
    winsup/lsaauth/ChangeLog
    winsup/lsaauth/ChangeLog.64bit
    winsup/lsaauth/Makefile.in
    winsup/lsaauth/configure
    winsup/lsaauth/configure.ac
    winsup/utils/ChangeLog
    winsup/utils/ChangeLog.64bit
    winsup/utils/Makefile.in
    winsup/utils/aclocal.m4
    winsup/utils/configure
    winsup/utils/cygcheck.cc
    winsup/utils/dumper.cc
    winsup/utils/dumper.h
    winsup/utils/kill.cc
    winsup/utils/ldd.cc
    winsup/utils/locale.cc
    winsup/utils/mkgroup.c
    winsup/utils/mkpasswd.c
    winsup/utils/module_info.cc
    winsup/utils/mount.cc
    winsup/utils/parse_pe.cc
    winsup/utils/passwd.c
    winsup/utils/path.cc
    winsup/utils/ps.cc
    winsup/utils/regtool.cc
    winsup/utils/ssp.c
    winsup/utils/strace.cc
    winsup/utils/tzset.c
    winsup/utils/utils.xml
Delete:
    COPYING3
    COPYING3.LIB
    config.rpath
    configure.ac
    ltgcc.m4
    newlib/libc/machine/aarch64/Makefile.am
    newlib/libc/machine/aarch64/Makefile.in
    newlib/libc/machine/aarch64/aclocal.m4
    newlib/libc/machine/aarch64/configure
    newlib/libc/machine/aarch64/configure.in
    newlib/libc/machine/aarch64/memcmp-stub.c
    newlib/libc/machine/aarch64/memcmp.S
    newlib/libc/machine/aarch64/memcpy-stub.c
    newlib/libc/machine/aarch64/memcpy.S
    newlib/libc/machine/aarch64/memmove-stub.c
    newlib/libc/machine/aarch64/memmove.S
    newlib/libc/machine/aarch64/memset-stub.c
    newlib/libc/machine/aarch64/memset.S
    newlib/libc/machine/aarch64/setjmp.S
    newlib/libc/machine/aarch64/strcmp-stub.c
    newlib/libc/machine/aarch64/strcmp.S
    newlib/libc/machine/aarch64/strlen-stub.c
    newlib/libc/machine/aarch64/strlen.S
    newlib/libc/machine/aarch64/strncmp-stub.c
    newlib/libc/machine/aarch64/strncmp.S
    newlib/libc/machine/aarch64/strnlen-stub.c
    newlib/libc/machine/aarch64/strnlen.S
    newlib/libc/machine/epiphany/Makefile.am
    newlib/libc/machine/epiphany/Makefile.in
    newlib/libc/machine/epiphany/aclocal.m4
    newlib/libc/machine/epiphany/configure
    newlib/libc/machine/epiphany/configure.in
    newlib/libc/machine/epiphany/machine/stdlib.h
    newlib/libc/machine/epiphany/setjmp.S
    newlib/libc/machine/powerpc/times.c
    newlib/libc/sys/epiphany/Makefile.am
    newlib/libc/sys/epiphany/Makefile.in
    newlib/libc/sys/epiphany/aclocal.m4
    newlib/libc/sys/epiphany/configure
    newlib/libc/sys/epiphany/configure.in
    newlib/libc/sys/epiphany/e_printf.c
    newlib/libm/machine/aarch64/Makefile.am
    newlib/libm/machine/aarch64/Makefile.in
    newlib/libm/machine/aarch64/aclocal.m4
    newlib/libm/machine/aarch64/configure
    newlib/libm/machine/aarch64/configure.in
    newlib/libm/machine/aarch64/s_ceil.c
    newlib/libm/machine/aarch64/s_floor.c
    newlib/libm/machine/aarch64/s_fma.c
    newlib/libm/machine/aarch64/s_fmax.c
    newlib/libm/machine/aarch64/s_fmin.c
    newlib/libm/machine/aarch64/s_llrint.c
    newlib/libm/machine/aarch64/s_llround.c
    newlib/libm/machine/aarch64/s_lrint.c
    newlib/libm/machine/aarch64/s_lround.c
    newlib/libm/machine/aarch64/s_nearbyint.c
    newlib/libm/machine/aarch64/s_rint.c
    newlib/libm/machine/aarch64/s_round.c
    newlib/libm/machine/aarch64/s_trunc.c
    newlib/libm/machine/aarch64/sf_ceil.c
    newlib/libm/machine/aarch64/sf_floor.c
    newlib/libm/machine/aarch64/sf_fma.c
    newlib/libm/machine/aarch64/sf_fmax.c
    newlib/libm/machine/aarch64/sf_fmin.c
    newlib/libm/machine/aarch64/sf_llrint.c
    newlib/libm/machine/aarch64/sf_llround.c
    newlib/libm/machine/aarch64/sf_lrint.c
    newlib/libm/machine/aarch64/sf_lround.c
    newlib/libm/machine/aarch64/sf_nearbyint.c
    newlib/libm/machine/aarch64/sf_rint.c
    newlib/libm/machine/aarch64/sf_round.c
    newlib/libm/machine/aarch64/sf_trunc.c
    winsup/cygwin/cygwin.din
    winsup/cygwin/cygwin.sc
    winsup/doc/cygserver.sgml
    winsup/doc/cygwin-api.in.sgml
    winsup/doc/cygwin-ug-net.in.sgml
    winsup/doc/cygwin-ug.in.sgml
    winsup/doc/cygwin.dsl
    winsup/doc/cygwinenv.sgml
    winsup/doc/dll.sgml
    winsup/doc/effectively.sgml
    winsup/doc/faq-sections.xml
    winsup/doc/filemodes.sgml
    winsup/doc/gcc.sgml
    winsup/doc/gdb.sgml
    winsup/doc/legal.sgml
    winsup/doc/new-features.sgml
    winsup/doc/ntsec.sgml
    winsup/doc/overview.sgml
    winsup/doc/overview2.sgml
    winsup/doc/pathnames.sgml
    winsup/doc/programming.sgml
    winsup/doc/setup-net.sgml
    winsup/doc/setup.sgml
    winsup/doc/setup2.sgml
    winsup/doc/textbinary.sgml
    winsup/doc/using.sgml
    winsup/doc/windres.sgml
    winsup/utils/utils.sgml

1 files changed, 42 insertions, 27 deletions

diff --git a/winsup/cygwin/thread.cc b/winsup/cygwin/thread.cc
index 183b9b8d5..0d5ded675 100644
--- a/winsup/cygwin/thread.cc
+++ b/winsup/cygwin/thread.cc
@@ -38,7 +38,12 @@ extern "C" void __fp_lock_all ();
 extern "C" void __fp_unlock_all ();
 extern "C" int valid_sched_parameters(const struct sched_param *);
 extern "C" int sched_set_thread_priority(HANDLE thread, int priority);
+#if __GNUC__ == 4 && __GNUC_MINOR__ >= 7
+/* FIXME: Temporarily workaround gcc 4.7+ bug. */
+static verifyable_object_state
+#else
 static inline verifyable_object_state
+#endif
   verifyable_object_isvalid (void const * objectptr, thread_magic_t magic,
 			     void *static_ptr1 = NULL,
 			     void *static_ptr2 = NULL,
@@ -117,7 +122,12 @@ __cygwin_lock_unlock (_LOCK_T *lock)
   paranoid_printf ("threadcount %d.  unlocked", MT_INTERFACE->threadcount);
 }
 
+#if __GNUC__ == 4 && __GNUC_MINOR__ >= 7
+/* FIXME: Temporarily workaround gcc 4.7+ bug. */
+static verifyable_object_state
+#else
 static inline verifyable_object_state
+#endif
 verifyable_object_isvalid (void const *objectptr, thread_magic_t magic, void *static_ptr1,
 			   void *static_ptr2, void *static_ptr3)
 {
@@ -216,7 +226,7 @@ pthread_mutex::can_be_unlocked ()
    * Also check for the ANONYMOUS owner to cover NORMAL mutexes as well. */
   bool res = type == PTHREAD_MUTEX_NORMAL || no_owner ()
 	     || (recursion_counter == 1 && pthread::equal (owner, self));
-  pthread_printf ("recursion_counter %d res %d", recursion_counter, res);
+  pthread_printf ("recursion_counter %u res %d", recursion_counter, res);
   return res;
 }
 
@@ -579,7 +589,11 @@ pthread::cancel ()
 	 executing Windows code.  Rely on deferred cancellation in this case. */
       if (!cygtls->inside_kernel (&context))
 	{
+#ifdef __x86_64__
+	  context.Rip = (ULONG_PTR) pthread::static_cancel_self;
+#else
 	  context.Eip = (DWORD) pthread::static_cancel_self;
+#endif
 	  SetThreadContext (win32_obj_id, &context);
 	}
     }
@@ -1143,7 +1157,7 @@ pthread_cond::pthread_cond (pthread_condattr *attr) :
   /* Change the mutex type to NORMAL to speed up mutex operations */
   mtx_out.set_type (PTHREAD_MUTEX_NORMAL);
 
-  sem_wait = ::CreateSemaphore (&sec_none_nih, 0, LONG_MAX, NULL);
+  sem_wait = ::CreateSemaphore (&sec_none_nih, 0, INT32_MAX, NULL);
   if (!sem_wait)
     {
       pthread_printf ("CreateSemaphore failed. %E");
@@ -1165,7 +1179,7 @@ pthread_cond::~pthread_cond ()
 void
 pthread_cond::unblock (const bool all)
 {
-  unsigned long releaseable;
+  LONG releaseable;
 
   /*
    * Block outgoing threads (and avoid simultanous unblocks)
@@ -1175,7 +1189,7 @@ pthread_cond::unblock (const bool all)
   releaseable = waiting - pending;
   if (releaseable)
     {
-      unsigned long released;
+      LONG released;
 
       if (!pending)
 	{
@@ -1212,11 +1226,11 @@ pthread_cond::wait (pthread_mutex_t mutex, PLARGE_INTEGER timeout)
   DWORD rv;
 
   mtx_in.lock ();
-  if (InterlockedIncrement ((long *)&waiting) == 1)
+  if (InterlockedIncrement (&waiting) == 1)
     mtx_cond = mutex;
   else if (mtx_cond != mutex)
     {
-      InterlockedDecrement ((long *)&waiting);
+      InterlockedDecrement (&waiting);
       mtx_in.unlock ();
       return EINVAL;
     }
@@ -1247,7 +1261,7 @@ pthread_cond::wait (pthread_mutex_t mutex, PLARGE_INTEGER timeout)
 	rv = WAIT_OBJECT_0;
     }
 
-  InterlockedDecrement ((long *)&waiting);
+  InterlockedDecrement (&waiting);
 
   if (rv == WAIT_OBJECT_0 && --pending == 0)
     /*
@@ -1286,7 +1300,7 @@ pthread_cond::_fixup_after_fork ()
   mtx_in.unlock ();
   mtx_out.unlock ();
 
-  sem_wait = ::CreateSemaphore (&sec_none_nih, 0, LONG_MAX, NULL);
+  sem_wait = ::CreateSemaphore (&sec_none_nih, 0, INT32_MAX, NULL);
   if (!sem_wait)
     api_fatal ("pthread_cond::_fixup_after_fork () failed to recreate win32 semaphore");
 }
@@ -1383,7 +1397,7 @@ pthread_rwlock::rdlock ()
   reader = lookup_reader ();
   if (reader)
     {
-      if (reader->n < ULONG_MAX)
+      if (reader->n < UINT32_MAX)
 	++reader->n;
       else
 	errno = EAGAIN;
@@ -1429,7 +1443,7 @@ pthread_rwlock::tryrdlock ()
       RWLOCK_READER *reader = lookup_reader ();
       if (!reader)
 	reader = add_reader ();
-      if (reader && reader->n < ULONG_MAX)
+      if (reader && reader->n < UINT32_MAX)
 	++reader->n;
       else
 	result = EAGAIN;
@@ -1448,7 +1462,7 @@ pthread_rwlock::wrlock ()
 
   mtx.lock ();
 
-  if (writer ==  self || lookup_reader ())
+  if (writer == self || lookup_reader ())
     {
       result = EDEADLK;
       goto DONE;
@@ -1730,7 +1744,7 @@ pthread_mutex::lock ()
   pthread_t self = ::pthread_self ();
   int result = 0;
 
-  if (InterlockedIncrement ((long *) &lock_counter) == 1)
+  if (InterlockedIncrement (&lock_counter) == 1)
     set_owner (self);
   else if (type == PTHREAD_MUTEX_NORMAL /* potentially causes deadlock */
 	   || !pthread::equal (owner, self))
@@ -1741,14 +1755,14 @@ pthread_mutex::lock ()
     }
   else
     {
-      InterlockedDecrement ((long *) &lock_counter);
+      InterlockedDecrement (&lock_counter);
       if (type == PTHREAD_MUTEX_RECURSIVE)
 	result = lock_recursive ();
       else
 	result = EDEADLK;
     }
 
-  pthread_printf ("mutex %p, self %p, owner %p, lock_counter %d, recursion_counter %d",
+  pthread_printf ("mutex %p, self %p, owner %p, lock_counter %d, recursion_counter %u",
 		  this, self, owner, lock_counter, recursion_counter);
   return result;
 }
@@ -1772,12 +1786,12 @@ pthread_mutex::unlock ()
 #ifdef DEBUGGING
       tid = 0;		// thread-id
 #endif
-      if (InterlockedDecrement ((long *) &lock_counter))
+      if (InterlockedDecrement (&lock_counter))
 	::SetEvent (win32_obj_id); // Another thread is waiting
       res = 0;
     }
 
-  pthread_printf ("mutex %p, owner %p, self %p, lock_counter %d, recursion_counter %d, type %d, res %d",
+  pthread_printf ("mutex %p, owner %p, self %p, lock_counter %d, recursion_counter %u, type %d, res %d",
 		  this, owner, self, lock_counter, recursion_counter, type, res);
   return res;
 }
@@ -1788,7 +1802,7 @@ pthread_mutex::trylock ()
   pthread_t self = ::pthread_self ();
   int result = 0;
 
-  if (InterlockedCompareExchange ((long *) &lock_counter, 1, 0) == 0)
+  if (InterlockedCompareExchange (&lock_counter, 1, 0) == 0)
     set_owner (self);
   else if (type == PTHREAD_MUTEX_RECURSIVE && pthread::equal (owner, self))
     result = lock_recursive ();
@@ -1864,7 +1878,7 @@ pthread_spinlock::lock ()
 
   do
     {
-      if (InterlockedExchange ((long *) &lock_counter, 1) == 0)
+      if (InterlockedExchange (&lock_counter, 1) == 0)
 	{
 	  set_owner (self);
 	  result = 0;
@@ -1899,7 +1913,7 @@ pthread_spinlock::unlock ()
 #ifdef DEBUGGING
       tid = 0;		// thread-id
 #endif
-      InterlockedExchange ((long *) &lock_counter, 0);
+      InterlockedExchange (&lock_counter, 0);
       ::SetEvent (win32_obj_id);
       result = 0;
     }
@@ -2248,7 +2262,7 @@ pthread_attr_getstack (const pthread_attr_t *attr, void **addr, size_t *size)
   if (!pthread_attr::is_good_object (attr))
     return EINVAL;
   /* uses lowest address of stack on all platforms */
-  *addr = (void *)((int)(*attr)->stackaddr - (*attr)->stacksize);
+  *addr = (void *)((ptrdiff_t)(*attr)->stackaddr - (*attr)->stacksize);
   *size = (*attr)->stacksize;
   return 0;
 }
@@ -2481,7 +2495,7 @@ pthread_getattr_np (pthread_t thread, pthread_attr_t *attr)
   else
     {
       debug_printf ("NtQueryInformationThread(ThreadBasicInformation), "
-		    "status %p", status);
+		    "status %y", status);
       (*attr)->stackaddr = thread->attr.stackaddr;
       (*attr)->stacksize = thread->attr.stacksize;
     }
@@ -3030,7 +3044,8 @@ extern "C" int
 pthread_sigmask (int operation, const sigset_t *set, sigset_t *old_set)
 {
   int res = handle_sigprocmask (operation, set, old_set, _my_tls.sigmask);
-  syscall_printf ("%d = pthread_sigmask(%d, %p, %p)", operation, set, old_set);
+  syscall_printf ("%d = pthread_sigmask(%d, %p, %p)",
+		  res, operation, set, old_set);
   return res;
 }
 
@@ -3368,7 +3383,7 @@ semaphore::semaphore (int pshared, unsigned int value)
 {
   SECURITY_ATTRIBUTES sa = (pshared != PTHREAD_PROCESS_PRIVATE)
 			   ? sec_all : sec_none_nih;
-  this->win32_obj_id = ::CreateSemaphore (&sa, value, LONG_MAX, NULL);
+  this->win32_obj_id = ::CreateSemaphore (&sa, value, INT32_MAX, NULL);
   if (!this->win32_obj_id)
     magic = 0;
 
@@ -3389,7 +3404,7 @@ semaphore::semaphore (unsigned long long shash, LUID sluid, int sfd,
 
   __small_sprintf (name, "semaphore/%016X%08x%08x",
 		   hash, luid.HighPart, luid.LowPart);
-  this->win32_obj_id = ::CreateSemaphore (&sec_all, value, LONG_MAX, name);
+  this->win32_obj_id = ::CreateSemaphore (&sec_all, value, INT32_MAX, name);
   if (!this->win32_obj_id)
     magic = 0;
   if (GetLastError () == ERROR_ALREADY_EXISTS && (oflag & O_EXCL))
@@ -3420,7 +3435,7 @@ semaphore::_post ()
 int
 semaphore::_getvalue (int *sval)
 {
-  long val;
+  LONG val;
 
   switch (WaitForSingleObject (win32_obj_id, 0))
     {
@@ -3513,10 +3528,10 @@ semaphore::_fixup_after_fork ()
 {
   if (shared == PTHREAD_PROCESS_PRIVATE)
     {
-      pthread_printf ("sem %x", this);
+      pthread_printf ("sem %p", this);
       /* FIXME: duplicate code here and in the constructor. */
       this->win32_obj_id = ::CreateSemaphore (&sec_none_nih, currentvalue,
-					      LONG_MAX, NULL);
+					      INT32_MAX, NULL);
       if (!win32_obj_id)
 	api_fatal ("failed to create new win32 semaphore, %E");
     }