* exceptions.cc (_threadinfo::pop): Zero *contents* of popped stack location

rather than the actual stack pointer.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index ef86002a0d3a251d280fc64102ee7b992d212be8..eac4aa6df9735ce7d97e48a3926cd032a311d9f0 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-29  Christopher Faylor  <cgf@redhat.com>
+
+       * exceptions.cc (_threadinfo::pop): Zero *contents* of popped stack
+       location rather than the actual stack pointer.
+
 2003-11-29  Nicholas Wourms  <nwourms@netscape.net>
 
        * Makefile.in: (DLL_OFILES): Add flock.o.

diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in
index c445e86670f0c9b80672757741a59682390835b8..b7bcbe532e339e04b38ea3dcdeb79614d46b1792 100644 (file)
--- a/winsup/cygwin/Makefile.in
+++ b/winsup/cygwin/Makefile.in
@@ -54,7 +54,7 @@ CC_FOR_TARGET:=$(CC)
 CFLAGS=@CFLAGS@ -fmerge-constants -ftracer
 override CFLAGS+=-MMD ${$(*F)_CFLAGS}
 CXX=@CXX@
-CXXFLAGS=@CXXFLAGS@ -fmerge-constants
+CXXFLAGS=@CXXFLAGS@
 
 AR:=@AR@
 AR_FLAGS:=qv

diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc
index ef2bf2270766418b9288c37784a139d3c21bbb2a..6e5aa3059f787cc00d6bb746812143856bb90228 100644 (file)
--- a/winsup/cygwin/exceptions.cc
+++ b/winsup/cygwin/exceptions.cc
@@ -189,8 +189,8 @@ _threadinfo::pop ()
   assert (stackptr > stack);
 #endif
   __stack_t res = *--stackptr;
-#ifndef DEBUGGING
-  _my_tls.stackptr = 0;
+#ifdef DEBUGGING
+  *stackptr = 0;
   debug_printf ("popped %p, stack %p, stackptr %p", res, stack, stackptr);
 #endif
   return res;

diff --git a/winsup/cygwin/pinfo.h b/winsup/cygwin/pinfo.h
index a8ca9f92f43d346366ee72dfdb125987b15c1202..1fd222bf55ac24675a334a78c2bdf1436bbb10cd 100644 (file)
--- a/winsup/cygwin/pinfo.h
+++ b/winsup/cygwin/pinfo.h
@@ -26,8 +26,6 @@ enum picom
   PICOM_FIFO = 2
 };
 
-extern struct sigaction *global_sigs;
-
 class _pinfo
 {
 public:

diff --git a/winsup/cygwin/sigproc.h b/winsup/cygwin/sigproc.h
index 834a569b2355710287e4500ad82ebc503af60a1c..f55618b674526592ca05119067be0135a886c529 100644 (file)
--- a/winsup/cygwin/sigproc.h
+++ b/winsup/cygwin/sigproc.h
@@ -86,6 +86,8 @@ void __stdcall sigalloc ();
 
 extern char myself_nowait_dummy[];
 
+extern struct sigaction *global_sigs;
+
 #define WAIT_SIG_PRIORITY THREAD_PRIORITY_TIME_CRITICAL
 
 #define myself_nowait ((_pinfo *)myself_nowait_dummy)