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, 466 insertions, 24 deletions

diff --git a/winsup/cygwin/gendef b/winsup/cygwin/gendef
index c393f2372..2bb790588 100755
--- a/winsup/cygwin/gendef
+++ b/winsup/cygwin/gendef
@@ -9,28 +9,32 @@
 # details.
 #
 use strict;
+use integer;
+use Getopt::Long;
+
 sub cleanup(@);
 
-my $in = shift;
-my $tls_offsets = shift;
-my $out = shift;
-my $sigfe = shift;
+my $cpu;
+my $output_def;
+my $tls_offsets;
+GetOptions('cpu=s'=>\$cpu, 'output-def=s'=>\$output_def, 'tlsoffsets=s'=>\$tls_offsets);
 
 $main::first = 0;
-if (!defined($in) || !defined($out) || !defined($sigfe)) {
-    die "usage: $0 deffile.in cygtls.h deffile.def sigfe.s\n";
+if (!defined($cpu) || !defined($output_def) || !defined($tls_offsets)) {
+    die "$0: missing required option\n";
 }
 
 require $tls_offsets;
 
-open(IN, $in) or die "$0: couldn't open \"$in\" - $!\n";
+my $is64bit = $cpu eq 'x86_64';
+my $sym_prefix = $is64bit ? '' : '_';
+
 my @top = ();
-while (<IN>) {
+while (<>) {
     push(@top, cleanup $_);
-    last if /^\s*exports$/i;
+    last if /^\s*exports$/oi;
 }
-my @in = cleanup <IN>;
-close(IN);
+my @in = cleanup <>;
 
 my %sigfe = ();
 my @data = ();
@@ -47,7 +51,7 @@ for (@in) {
 	    # nothing
 	} elsif (s/\s+SIGFE(_MAYBE)?$//) {
 	    my $func = (split(' '))[2];
-	    my $maybe = lc $1 . '_';
+	    my $maybe = (defined($1) ? lc $1 : '') . '_';
 	    $sigfe{$func} = '_sigfe' . $maybe . $func;
 	}
     } else {
@@ -73,12 +77,12 @@ for (@text) {
       if defined($func) && $sigfe{$func};
 }
 
-open(OUT, '>', $out) or die "$0: couldn't open \"$out\" - $!\n";
+open OUT, '>', $output_def or die "$0: couldn't open \"$output_def\" - $!\n";
 push @top, (map {$_ . " DATA\n"} @data), (map {$_ . "\n"} @text);
 print OUT @top;
 close OUT;
 
-open(SIGFE, '>', $sigfe) or die "$0: couldn't open sigfe file \"$sigfe\" - $!\n";
+open SIGFE, '>', 'sigfe.s' or die "$0: couldn't open 'sigfe.s' file for writing - $!\n";
 
 for my $k (sort keys %sigfe) {
     print SIGFE fefunc($k, $sigfe{$k});
@@ -86,20 +90,301 @@ for my $k (sort keys %sigfe) {
 close SIGFE;
 
 sub fefunc {
-    my $func = '_' . shift;
-    my $fe = '_' . shift;
-    my $sigfe_func = ($fe =~ /^(.*)$func/)[0];
+    my $func = $sym_prefix . shift;
+    my $fe = $sym_prefix . shift;
+    my $sigfe_func;
+    if ($is64bit) {
+	$sigfe_func = ($fe =~ /^(.*)_${func}$/)[0];
+    } else {
+	$sigfe_func = ($fe =~ /^(.*)${func}$/)[0];
+    }
     my $extra;
-    my $res = <<EOF;
+    my $res;
+    if ($is64bit) {
+	$res = <<EOF;
 	.extern	$func
 	.global	$fe
+	.seh_proc $fe
 $fe:
-	pushl	\$$func
+	leaq	$func(%rip),%r10
+	pushq	%r10
+	.seh_pushreg %r10
+	.seh_endprologue
 	jmp	$sigfe_func
+	.seh_endproc
+
+EOF
+    } else {
+	$res = <<EOF;
+        .extern $func
+        .global $fe
+$fe:
+        pushl   \$$func
+        jmp     $sigfe_func
 
 EOF
+    }
     if (!$main::first++) {
-	$res = <<EOF . longjmp () . $res;
+	if ($is64bit) {
+	  $res = <<EOF . longjmp () . $res;
+	.text
+
+	.seh_proc _sigfe_maybe
+_sigfe_maybe:					# stack is aligned on entry!
+	.seh_endprologue
+	movq	%gs:8,%r10			# location of bottom of stack
+	leaq	$tls::initialized(%r10),%r11	# where we will be looking
+	cmpq	%r11,%rsp			# stack loc > than tls
+	jge	0f				# yep.  we don't have a tls.
+	movl	$tls::initialized(%r10),%r11d
+	cmpl	\$0xc763173f,%r11d		# initialized?
+	je	1f
+0:	ret
+	.seh_endproc
+
+	.seh_proc _sigfe
+_sigfe:						# stack is aligned on entry!
+	.seh_endprologue
+	movq	%gs:8,%r10			# location of bottom of stack
+1:	movl	\$1,%r11d			# potential lock value
+	xchgl	%r11d,$tls::stacklock(%r10)	# see if we can grab it
+	movl	%r11d,$tls::spinning(%r10)	# flag if we are waiting for lock
+	testl	%r11d,%r11d			# it will be zero
+	jz	2f				#  if so
+	pause
+	jmp	1b				# loop
+2:	movq	\$8,%rax			# have the lock, now increment the
+	xaddq	%rax,$tls::stackptr(%r10)	#  stack pointer and get pointer
+	leaq	_sigbe(%rip),%r11		# new place to return to
+	xchgq	%r11,8(%rsp)			# exchange with real return value
+	movq	%r11,(%rax)			# store real return value on alt stack
+	incl	$tls::incyg(%r10)
+	decl	$tls::stacklock(%r10)		# remove lock
+	popq	%rax				# pop real function address from stack
+	jmp	*%rax				# and jmp to it
+	.seh_endproc
+
+	.seh_proc _sigfe
+_sigbe:						# return here after cygwin syscall
+						# stack is aligned on entry!
+	.seh_endprologue
+	movq	%gs:8,%r10			# address of bottom of tls
+1:	movl	\$1,%r11d			# potential lock value
+	xchgl	%r11d,$tls::stacklock(%r10)	# see if we can grab it
+	movl	%r11d,$tls::spinning(%r10)	# flag if we are waiting for lock
+	testl	%r11d,%r11d			# it will be zero
+	jz	2f				#  if so
+	pause
+	jmp	1b				#  and loop
+2:	movq	\$-8,%r11			# now decrement aux stack
+	xaddq	%r11,$tls::stackptr(%r10)	#  and get pointer
+	movq	-8(%r11),%r11			# get return address from signal stack
+	decl	$tls::incyg(%r10)
+	decl	$tls::stacklock(%r10)		# release lock
+	jmp	*%r11				# "return" to caller
+	.seh_endproc
+
+	.global	sigdelayed
+	.seh_proc sigdelayed
+sigdelayed:
+	pushq	%r10				# used for return address injection
+	.seh_pushreg %rbp
+	pushq	%rbp
+	.seh_pushreg %rbp
+	movq	%rsp,%rbp
+	# stack is aligned or unaligned on entry!
+	# make sure it is aligned from here on
+	# We could be called from an interrupted thread which doesn't know
+	# about his fate, so save and restore everything and the kitchen sink.
+	andq	\$0xfffffffffffffff0,%rsp
+	.seh_setframe %rbp,0
+	pushq	%r15
+	.seh_pushreg %r15
+	pushq	%r14
+	.seh_pushreg %r14
+	pushq	%r13
+	.seh_pushreg %r13
+	pushq	%r12
+	.seh_pushreg %r12
+	pushq	%r11
+	.seh_pushreg %r11
+	pushq	%r9
+	.seh_pushreg %r9
+	pushq	%r8
+	.seh_pushreg %r8
+	pushq	%rsi
+	.seh_pushreg %rsi
+	pushq	%rdi
+	.seh_pushreg %rdi
+	pushq	%rdx
+	.seh_pushreg %rdx
+	pushq	%rcx
+	.seh_pushreg %rcx
+	pushq	%rbx
+	.seh_pushreg %rbx
+	pushq	%rax
+	.seh_pushreg %rax
+	pushf
+	subq	\$0x120,%rsp
+	.seh_stackalloc 0x120
+	movdqa	%xmm15,0x110(%rsp)
+	movdqa	%xmm14,0x100(%rsp)
+	movdqa	%xmm13,0xf0(%rsp)
+	movdqa	%xmm12,0xe0(%rsp)
+	movdqa	%xmm11,0xd0(%rsp)
+	movdqa	%xmm10,0xc0(%rsp)
+	movdqa	%xmm9,0xb0(%rsp)
+	movdqa	%xmm8,0xa0(%rsp)
+	movdqa	%xmm7,0x90(%rsp)
+	movdqa	%xmm6,0x80(%rsp)
+	movdqa	%xmm5,0x70(%rsp)
+	movdqa	%xmm4,0x60(%rsp)
+	movdqa	%xmm3,0x50(%rsp)
+	movdqa	%xmm2,0x40(%rsp)
+	movdqa	%xmm1,0x30(%rsp)
+	movdqa	%xmm0,0x20(%rsp)
+	.seh_endprologue
+
+	movq	%gs:8,%r12			# get tls
+	movl	$tls::saved_errno(%r12),%r15d	# temporarily save saved_errno
+	movq	\$$tls::start_offset,%rcx	# point to beginning of tls block
+	addq	%r12,%rcx			#  and store as first arg to method
+	call	_ZN7_cygtls19call_signal_handlerEv	# call handler
+
+1:	movl	\$1,%r11d			# potential lock value
+	xchgl	%r11d,$tls::stacklock(%r12)	# see if we can grab it
+	movl	%r11d,$tls::spinning(%r12)	# flag if we are waiting for lock
+	testl	%r11d,%r11d			# it will be zero
+	jz	2f				#  if so
+	pause
+	jmp	1b				#  and loop
+2:	testl	%r15d,%r15d			# was saved_errno < 0
+	jl	3f				# yup.  ignore it
+	movq	$tls::errno_addr(%r12),%r11
+	movl	%r15d,(%r11)
+3:	movq	\$-8,%r11			# now decrement aux stack
+	xaddq	%r11,$tls::stackptr(%r12)	#  and get pointer
+	xorq	%r10,%r10
+	xchgq	%r10,-8(%r11)			# get return address from signal stack
+	xorl	%r11d,%r11d
+	movl	%r11d,$tls::incyg(%r12)
+	movl	%r11d,$tls::stacklock(%r12)	# unlock
+	movdqa	0x20(%rsp),%xmm0
+	movdqa	0x30(%rsp),%xmm1
+	movdqa	0x40(%rsp),%xmm2
+	movdqa	0x50(%rsp),%xmm3
+	movdqa	0x60(%rsp),%xmm4
+	movdqa	0x70(%rsp),%xmm5
+	movdqa	0x80(%rsp),%xmm6
+	movdqa	0x90(%rsp),%xmm7
+	movdqa	0xa0(%rsp),%xmm8
+	movdqa	0xb0(%rsp),%xmm9
+	movdqa	0xc0(%rsp),%xmm10
+	movdqa	0xd0(%rsp),%xmm11
+	movdqa	0xe0(%rsp),%xmm12
+	movdqa	0xf0(%rsp),%xmm13
+	movdqa	0x100(%rsp),%xmm14
+	movdqa	0x110(%rsp),%xmm15
+	addq	\$0x120,%rsp
+	popf
+	popq	%rax
+	popq	%rbx
+	popq	%rcx
+	popq	%rdx
+	popq	%rdi
+	popq	%rsi
+	popq	%r8
+	popq	%r9
+	popq	%r11
+	popq	%r12
+	popq	%r13
+	popq	%r14
+	popq	%r15
+	movq	%rbp,%rsp
+	popq	%rbp
+	xchgq	%r10,(%rsp)
+	ret
+	.seh_endproc
+
+# _cygtls::pop
+	.global _ZN7_cygtls3popEv
+	.seh_proc _ZN7_cygtls3popEv
+_ZN7_cygtls3popEv:
+	.seh_endprologue
+	movq	\$-8,%r11
+	xaddq	%r11,$tls::pstackptr(%rcx)
+	movq	-8(%r11),%rax
+	ret
+	.seh_endproc
+
+# _cygtls::lock
+	.global _ZN7_cygtls4lockEv
+	.seh_proc _ZN7_cygtls4lockEv
+_ZN7_cygtls4lockEv:
+	pushq	%r12
+	.seh_pushreg %r12
+	.seh_endprologue
+	movq	%rcx,%r12
+1:	movl	\$1,%r11d
+	xchgl	%r11d,$tls::pstacklock(%r12)
+	testl   %r11d,%r11d
+	jz	2f
+	pause
+	jmp	1b
+2:	popq	%r12
+	ret
+	.seh_endproc
+
+# _cygtls::unlock
+	.global _ZN7_cygtls6unlockEv
+	.seh_proc _ZN7_cygtls6unlockEv
+_ZN7_cygtls6unlockEv:
+	.seh_endprologue
+	decl	$tls::pstacklock(%rcx)
+	ret
+	.seh_endproc
+
+# _cygtls::locked
+	.global _ZN7_cygtls6lockedEv
+	.seh_proc _ZN7_cygtls6lockedEv
+_ZN7_cygtls6lockedEv:
+	.seh_endprologue
+	movl	$tls::pstacklock(%rcx),%eax
+	ret
+	.seh_endproc
+
+	.seh_proc stabilize_sig_stack
+stabilize_sig_stack:
+	pushq	%r12
+	.seh_pushreg %r12
+	subq	\$0x20,%rsp
+	.seh_stackalloc 32
+	.seh_endprologue
+	movq	%gs:8,%r12
+1:	movl	\$1,%r10d
+	xchgl	%r10d,$tls::stacklock(%r12)
+	movl	%r10d,$tls::spinning(%r12)		# flag if we are waiting for lock
+	testl	%r10d,%r10d
+	jz	2f
+	pause
+	jmp	1b
+2:	incl	$tls::incyg(%r12)
+	cmpl	\$0,$tls::sig(%r12)
+	jz	3f
+	decl	$tls::stacklock(%r12)			# unlock
+	movq	\$$tls::start_offset,%rcx		# point to beginning
+	addq	%r12,%rcx				#  of tls block
+	call	_ZN7_cygtls19call_signal_handlerEv
+	jmp	1b
+3:	decl	$tls::incyg(%r12)
+	addq	\$0x20,%rsp
+	movq	%r12,%r11				# return tls addr in r11
+	popq	%r12
+	ret
+	.seh_endproc
+EOF
+	} else {
+	  $res = <<EOF . longjmp () . $res;
 	.text
 
 __sigfe_maybe:
@@ -265,12 +550,170 @@ stabilize_sig_stack:
 3:	decl	$tls::incyg(%ebx)
 	ret
 EOF
+	}
     }
     return $res;
 }
 
 sub longjmp {
-    return <<EOF;
+    if ($is64bit) {
+	return <<EOF;
+
+	.globl  setjmp
+	.seh_proc setjmp
+setjmp:
+	.seh_endprologue
+	# We use the Windows jmp_buf layout.  Store ExceptionList in Frame.
+	# Store alternative stackptr in Spare.
+	movq	%gs:0,%r10
+	movq	%r10,(%rcx)
+	movq	%rbx,0x8(%rcx)
+	movq	%rsp,0x10(%rcx)
+	movq	%rbp,0x18(%rcx)
+	movq	%rsi,0x20(%rcx)
+	movq	%rdi,0x28(%rcx)
+	movq	%r12,0x30(%rcx)
+	movq	%r13,0x38(%rcx)
+	movq	%r14,0x40(%rcx)
+	movq	%r15,0x48(%rcx)
+	movq	(%rsp),%r10
+	movq	%r10,0x50(%rcx)
+	# jmp_buf is potentially unaligned!
+	movdqu	%xmm6,0x60(%rcx)
+	movdqu	%xmm7,0x70(%rcx)
+	movdqu	%xmm8,0x80(%rcx)
+	movdqu	%xmm9,0x90(%rcx)
+	movdqu	%xmm10,0xa0(%rcx)
+	movdqu	%xmm11,0xb0(%rcx)
+	movdqu	%xmm12,0xc0(%rcx)
+	movdqu	%xmm13,0xd0(%rcx)
+	movdqu	%xmm14,0xe0(%rcx)
+	movdqu	%xmm15,0xf0(%rcx)
+	pushq	%rcx
+	.seh_pushreg %rcx
+	call	stabilize_sig_stack		# returns tls in r11
+	popq	%rcx
+	movq	$tls::stackptr(%r11),%r10
+	movq	%r10,0x58(%rcx)
+	decl	$tls::stacklock(%r11)
+	movl	\$0,%eax
+	ret
+	.seh_endproc
+
+	.globl  __sjfault
+	.seh_proc __sjfault
+__sjfault:
+	.seh_endprologue
+	# Like setjmp, just w/o storing the alternate stackptr.
+	movq	%gs:0,%r10
+	movq	%r10,(%rcx)
+	movq	%rbx,0x8(%rcx)
+	movq	%rsp,0x10(%rcx)
+	movq	%rbp,0x18(%rcx)
+	movq	%rsi,0x20(%rcx)
+	movq	%rdi,0x28(%rcx)
+	movq	%r12,0x30(%rcx)
+	movq	%r13,0x38(%rcx)
+	movq	%r14,0x40(%rcx)
+	movq	%r15,0x48(%rcx)
+	movq	(%rsp),%r10
+	movq	%r10,0x50(%rcx)
+	# jmp_buf is potentially unaligned!
+	movdqu	%xmm6,0x60(%rcx)
+	movdqu	%xmm7,0x70(%rcx)
+	movdqu	%xmm8,0x80(%rcx)
+	movdqu	%xmm9,0x90(%rcx)
+	movdqu	%xmm10,0xa0(%rcx)
+	movdqu	%xmm11,0xb0(%rcx)
+	movdqu	%xmm12,0xc0(%rcx)
+	movdqu	%xmm13,0xd0(%rcx)
+	movdqu	%xmm14,0xe0(%rcx)
+	movdqu	%xmm15,0xf0(%rcx)
+	movl	\$0,%eax
+	ret
+	.seh_endproc
+
+	.globl  __ljfault
+	.seh_proc __ljfault
+__ljfault:
+	movq	(%rcx),%r10
+	movq	%r10,%gs:0
+	movq	0x8(%rcx),%rbx
+	movq	0x10(%rcx),%rsp
+	movq	0x18(%rcx),%rbp
+	movq	0x20(%rcx),%rsi
+	movq	0x28(%rcx),%rdi
+	movq	0x30(%rcx),%r12
+	movq	0x38(%rcx),%r13
+	movq	0x40(%rcx),%r14
+	movq	0x48(%rcx),%r15
+	movq	0x50(%rcx),%r10
+	movq	%r10,(%rsp)
+	# jmp_buf is potentially unaligned!
+	movdqu	0x60(%rcx),%xmm6
+	movdqu	0x70(%rcx),%xmm7
+	movdqu	0x80(%rcx),%xmm8
+	movdqu	0x90(%rcx),%xmm9
+	movdqu	0xa0(%rcx),%xmm10
+	movdqu	0xb0(%rcx),%xmm11
+	movdqu	0xc0(%rcx),%xmm12
+	movdqu	0xd0(%rcx),%xmm13
+	movdqu	0xe0(%rcx),%xmm14
+	movdqu	0xf0(%rcx),%xmm15
+	movl	%edx,%eax
+	testl	%eax,%eax
+	jne	0f
+	incl	%eax
+0:	ret
+	.seh_endproc
+
+	.globl  longjmp
+	.seh_proc longjmp
+longjmp:
+	pushq	%rcx
+	.seh_pushreg %rcx
+	.seh_endprologue
+	movl	%edx,%r12d			# save return value (r12 is overwritten anyway)
+	call	stabilize_sig_stack		# returns tls in r11
+	popq	%rcx
+	movl	%r12d,%eax			# restore return value
+	movq	0x58(%rcx),%r10			# get old signal stack
+	movq	%r10,$tls::stackptr(%r11)	# restore
+	decl	$tls::stacklock(%r11)		# relinquish lock
+	xorl	%r10d,%r10d
+	movl	%r10d,$tls::incyg(%r11)		# we're definitely not in cygwin anymore
+	movq	(%rcx),%r10
+	movq	%r10,%gs:0
+	movq	0x8(%rcx),%rbx
+	movq	0x10(%rcx),%rsp
+	movq	0x18(%rcx),%rbp
+	movq	0x20(%rcx),%rsi
+	movq	0x28(%rcx),%rdi
+	movq	0x30(%rcx),%r12
+	movq	0x38(%rcx),%r13
+	movq	0x40(%rcx),%r14
+	movq	0x48(%rcx),%r15
+	movq	0x50(%rcx),%r10
+	movq	%r10,(%rsp)
+	# jmp_buf is potentially unaligned!
+	movdqu	0x60(%rcx),%xmm6
+	movdqu	0x70(%rcx),%xmm7
+	movdqu	0x80(%rcx),%xmm8
+	movdqu	0x90(%rcx),%xmm9
+	movdqu	0xa0(%rcx),%xmm10
+	movdqu	0xb0(%rcx),%xmm11
+	movdqu	0xc0(%rcx),%xmm12
+	movdqu	0xd0(%rcx),%xmm13
+	movdqu	0xe0(%rcx),%xmm14
+	movdqu	0xf0(%rcx),%xmm15
+	testl	%eax,%eax
+	jne	0f
+	incl	%eax
+0:	ret
+	.seh_endproc
+EOF
+    } else {
+	return <<EOF;
 
 	.globl	_setjmp
 _setjmp:
@@ -424,10 +867,9 @@ _longjmp:
 	popfl
 	ret
 EOF
+    }
 }
 
 sub cleanup(@) {
-    map {s/\r//g; $_} @_;
-    map {s/#.*//g; $_} @_;
-    map {s/[ \t]+$//g; $_} @_;
+    grep {s/\r//og; s/#.*//og; s/\s+\n//sog; !/^$/o && $_} @_;
 }