* fork.cc (fork_parent): Save parent pid in a temporary variable since child

could conceivably exit before function returns, rendering the child's shared
memory area invalid.
* cygtls.h (_cygtls::incyg): Declare new field.
(_cygtls::in_exception): Define new function.
* exceptions.cc (setup_handler): Remove locked flag.  Use 'incyg' flag and
in_exception function to determine when we're in a cygwin function.
(_cygtls::call_signal_handler): Decrement incyg flag prior to calling a
handler.  Increment it on return.
* gendef (_sigfe): Increment incyg flag.  Use testl for zero testing rather
than orl, for consistency.
(_sigbe): Decrement incyg flag.  Use testl for zero testing rather than orl,
for consistency.
(_cygtls::pop): Use testl for zero testing rather than orl, for consistency.
(stabilize_sig_stack): Ditto.

1 files changed, 53 insertions, 49 deletions

diff --git a/winsup/cygwin/tlsoffsets.h b/winsup/cygwin/tlsoffsets.h
index 2ff27339b..96b06d7f2 100644
--- a/winsup/cygwin/tlsoffsets.h
+++ b/winsup/cygwin/tlsoffsets.h
@@ -1,101 +1,105 @@
 //;# autogenerated:  Do not edit.
 
-//; $tls::sizeof__cygtls = 3744;
-//; $tls::func = -3744;
+//; $tls::sizeof__cygtls = 3748;
+//; $tls::func = -3748;
 //; $tls::pfunc = 0;
-//; $tls::saved_errno = -3740;
+//; $tls::saved_errno = -3744;
 //; $tls::psaved_errno = 4;
-//; $tls::sa_flags = -3736;
+//; $tls::sa_flags = -3740;
 //; $tls::psa_flags = 8;
-//; $tls::oldmask = -3732;
+//; $tls::oldmask = -3736;
 //; $tls::poldmask = 12;
-//; $tls::newmask = -3728;
+//; $tls::newmask = -3732;
 //; $tls::pnewmask = 16;
-//; $tls::event = -3724;
+//; $tls::event = -3728;
 //; $tls::pevent = 20;
-//; $tls::errno_addr = -3720;
+//; $tls::errno_addr = -3724;
 //; $tls::perrno_addr = 24;
-//; $tls::initialized = -3716;
+//; $tls::initialized = -3720;
 //; $tls::pinitialized = 28;
-//; $tls::sigmask = -3712;
+//; $tls::sigmask = -3716;
 //; $tls::psigmask = 32;
-//; $tls::sigwait_mask = -3708;
+//; $tls::sigwait_mask = -3712;
 //; $tls::psigwait_mask = 36;
-//; $tls::sigwait_info = -3704;
+//; $tls::sigwait_info = -3708;
 //; $tls::psigwait_info = 40;
-//; $tls::threadkill = -3700;
+//; $tls::threadkill = -3704;
 //; $tls::pthreadkill = 44;
-//; $tls::infodata = -3696;
+//; $tls::infodata = -3700;
 //; $tls::pinfodata = 48;
-//; $tls::tid = -3548;
+//; $tls::tid = -3552;
 //; $tls::ptid = 196;
-//; $tls::local_clib = -3544;
+//; $tls::local_clib = -3548;
 //; $tls::plocal_clib = 200;
-//; $tls::locals = -2616;
+//; $tls::locals = -2620;
 //; $tls::plocals = 1128;
-//; $tls::prev = -1048;
+//; $tls::prev = -1052;
 //; $tls::pprev = 2696;
-//; $tls::next = -1044;
+//; $tls::next = -1048;
 //; $tls::pnext = 2700;
-//; $tls::stackptr = -1040;
+//; $tls::stackptr = -1044;
 //; $tls::pstackptr = 2704;
-//; $tls::sig = -1036;
+//; $tls::sig = -1040;
 //; $tls::psig = 2708;
-//; $tls::stacklock = -1032;
+//; $tls::stacklock = -1036;
 //; $tls::pstacklock = 2712;
-//; $tls::spinning = -1028;
+//; $tls::spinning = -1032;
 //; $tls::pspinning = 2716;
+//; $tls::incyg = -1028;
+//; $tls::pincyg = 2720;
 //; $tls::stack = -1024;
-//; $tls::pstack = 2720;
+//; $tls::pstack = 2724;
 //; $tls::padding = 0;
-//; $tls::ppadding = 3744;
+//; $tls::ppadding = 3748;
 //; __DATA__
 
-#define tls_func (-3744)
+#define tls_func (-3748)
 #define tls_pfunc (0)
-#define tls_saved_errno (-3740)
+#define tls_saved_errno (-3744)
 #define tls_psaved_errno (4)
-#define tls_sa_flags (-3736)
+#define tls_sa_flags (-3740)
 #define tls_psa_flags (8)
-#define tls_oldmask (-3732)
+#define tls_oldmask (-3736)
 #define tls_poldmask (12)
-#define tls_newmask (-3728)
+#define tls_newmask (-3732)
 #define tls_pnewmask (16)
-#define tls_event (-3724)
+#define tls_event (-3728)
 #define tls_pevent (20)
-#define tls_errno_addr (-3720)
+#define tls_errno_addr (-3724)
 #define tls_perrno_addr (24)
-#define tls_initialized (-3716)
+#define tls_initialized (-3720)
 #define tls_pinitialized (28)
-#define tls_sigmask (-3712)
+#define tls_sigmask (-3716)
 #define tls_psigmask (32)
-#define tls_sigwait_mask (-3708)
+#define tls_sigwait_mask (-3712)
 #define tls_psigwait_mask (36)
-#define tls_sigwait_info (-3704)
+#define tls_sigwait_info (-3708)
 #define tls_psigwait_info (40)
-#define tls_threadkill (-3700)
+#define tls_threadkill (-3704)
 #define tls_pthreadkill (44)
-#define tls_infodata (-3696)
+#define tls_infodata (-3700)
 #define tls_pinfodata (48)
-#define tls_tid (-3548)
+#define tls_tid (-3552)
 #define tls_ptid (196)
-#define tls_local_clib (-3544)
+#define tls_local_clib (-3548)
 #define tls_plocal_clib (200)
-#define tls_locals (-2616)
+#define tls_locals (-2620)
 #define tls_plocals (1128)
-#define tls_prev (-1048)
+#define tls_prev (-1052)
 #define tls_pprev (2696)
-#define tls_next (-1044)
+#define tls_next (-1048)
 #define tls_pnext (2700)
-#define tls_stackptr (-1040)
+#define tls_stackptr (-1044)
 #define tls_pstackptr (2704)
-#define tls_sig (-1036)
+#define tls_sig (-1040)
 #define tls_psig (2708)
-#define tls_stacklock (-1032)
+#define tls_stacklock (-1036)
 #define tls_pstacklock (2712)
-#define tls_spinning (-1028)
+#define tls_spinning (-1032)
 #define tls_pspinning (2716)
+#define tls_incyg (-1028)
+#define tls_pincyg (2720)
 #define tls_stack (-1024)
-#define tls_pstack (2720)
+#define tls_pstack (2724)
 #define tls_padding (0)
-#define tls_ppadding (3744)
+#define tls_ppadding (3748)