summaryrefslogtreecommitdiffstats
path: root/winsup/cygwin/exceptions.cc
diff options
context:
space:
mode:
authorChristopher Faylor <me@cgf.cx>2002-09-30 04:26:52 +0000
committerChristopher Faylor <me@cgf.cx>2002-09-30 04:26:52 +0000
commite7733defb9f32df605532b6dfa028f96810a3447 (patch)
tree0695b95baaed754930f6b7c47c9f28959602b61a /winsup/cygwin/exceptions.cc
parentf789fbbf355ef6fcec036806fed6948b47d04320 (diff)
downloadcygnal-e7733defb9f32df605532b6dfa028f96810a3447.tar.gz
cygnal-e7733defb9f32df605532b6dfa028f96810a3447.tar.bz2
cygnal-e7733defb9f32df605532b6dfa028f96810a3447.zip
* exceptions.cc (unused_sig_wrapper): Accommodate newer compilers.
Diffstat (limited to 'winsup/cygwin/exceptions.cc')
-rw-r--r--winsup/cygwin/exceptions.cc13
1 files changed, 9 insertions, 4 deletions
diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc
index a1d7019fe..54c5d59e0 100644
--- a/winsup/cygwin/exceptions.cc
+++ b/winsup/cygwin/exceptions.cc
@@ -1178,7 +1178,13 @@ reset_signal_arrived ()
sigproc_printf ("reset signal_arrived");
}
-void unused_sig_wrapper ()
+static void unused_sig_wrapper () __attribute__((const, unused));
+
+#undef errno
+#define errno ((DWORD volatile) _impure_ptr) + (((char *) &_impure_ptr->_errno) - ((char *) _impure_ptr))
+
+static void
+unused_sig_wrapper ()
{
/* Signal cleanup stuff. Cleans up stack (too bad that we didn't
prototype signal handlers as __stdcall), calls _set_process_mask
@@ -1199,8 +1205,7 @@ _sigreturn: \n\
1: popl %%eax # saved errno \n\
testl %%eax,%%eax # Is it < 0 \n\
jl 2f # yup. ignore it \n\
- movl %1,%%ebx \n\
- movl %%eax,(%%ebx) \n\
+ movl %%eax,%1 \n\
2: popl %%eax \n\
popl %%ebx \n\
popl %%ecx \n\
@@ -1240,7 +1245,7 @@ _sigdelayed0: \n\
popl %%eax \n\
jmp *%%eax \n\
__no_sig_end: \n\
-" : "=m" (sigsave.sig) : "m" (&_impure_ptr->_errno),
+" : "=m" (sigsave.sig): "X" (errno),
"g" (sigsave.retaddr), "g" (sigsave.oldmask), "g" (sigsave.sig),
"g" (sigsave.func), "g" (sigsave.saved_errno), "g" (sigsave.newmask)
);