* cygtls.h (CYGTLS_PADSIZE): Reset to a size that XP SP1 seems to like.

* tlsoffsets.h: Regenerate.

3 files changed, 69 insertions, 63 deletions

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index c5934ea5c..21ab4f0da 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-04  Christopher Faylor  <cgf@timesys.com>
+
+	* cygtls.h (CYGTLS_PADSIZE): Reset to a size that XP SP1 seems to like.
+	* tlsoffsets.h: Regenerate.
+
 2006-06-03  Christopher Faylor  <cgf@timesys.com>
 
 	* cygthread.cc (cygthread::terminate_thread): In debugging output, use
diff --git a/winsup/cygwin/cygtls.h b/winsup/cygwin/cygtls.h
index 5cccf4898..97800a701 100644
--- a/winsup/cygwin/cygtls.h
+++ b/winsup/cygwin/cygtls.h
@@ -238,7 +238,8 @@ struct _cygtls
 };
 #pragma pack(pop)
 
-const int CYGTLS_PADSIZE = 4 * sizeof (_cygtls);
+const int CYGTLS_PADSIZE = 12700;	/* FIXME: Find some way to autogenerate
+					   this value */
 /*gentls_offsets*/
 
 extern char *_tlsbase __asm__ ("%fs:4");
diff --git a/winsup/cygwin/tlsoffsets.h b/winsup/cygwin/tlsoffsets.h
index 36c81a3c3..3ee482280 100644
--- a/winsup/cygwin/tlsoffsets.h
+++ b/winsup/cygwin/tlsoffsets.h
@@ -1,129 +1,129 @@
 //;# autogenerated:  Do not edit.
 
 //; $tls::sizeof__cygtls = 4212;
-//; $tls::func = -16848;
+//; $tls::func = -12700;
 //; $tls::pfunc = 0;
-//; $tls::el = -16844;
+//; $tls::el = -12696;
 //; $tls::pel = 4;
-//; $tls::saved_errno = -16836;
+//; $tls::saved_errno = -12688;
 //; $tls::psaved_errno = 12;
-//; $tls::sa_flags = -16832;
+//; $tls::sa_flags = -12684;
 //; $tls::psa_flags = 16;
-//; $tls::oldmask = -16828;
+//; $tls::oldmask = -12680;
 //; $tls::poldmask = 20;
-//; $tls::deltamask = -16824;
+//; $tls::deltamask = -12676;
 //; $tls::pdeltamask = 24;
-//; $tls::event = -16820;
+//; $tls::event = -12672;
 //; $tls::pevent = 28;
-//; $tls::errno_addr = -16816;
+//; $tls::errno_addr = -12668;
 //; $tls::perrno_addr = 32;
-//; $tls::sigmask = -16812;
+//; $tls::sigmask = -12664;
 //; $tls::psigmask = 36;
-//; $tls::sigwait_mask = -16808;
+//; $tls::sigwait_mask = -12660;
 //; $tls::psigwait_mask = 40;
-//; $tls::sigwait_info = -16804;
+//; $tls::sigwait_info = -12656;
 //; $tls::psigwait_info = 44;
-//; $tls::thread_context = -16800;
+//; $tls::thread_context = -12652;
 //; $tls::pthread_context = 48;
-//; $tls::thread_id = -16588;
+//; $tls::thread_id = -12440;
 //; $tls::pthread_id = 260;
-//; $tls::threadkill = -16584;
+//; $tls::threadkill = -12436;
 //; $tls::pthreadkill = 264;
-//; $tls::infodata = -16580;
+//; $tls::infodata = -12432;
 //; $tls::pinfodata = 268;
-//; $tls::tid = -16432;
+//; $tls::tid = -12284;
 //; $tls::ptid = 416;
-//; $tls::local_clib = -16428;
+//; $tls::local_clib = -12280;
 //; $tls::plocal_clib = 420;
-//; $tls::__dontuse = -16428;
+//; $tls::__dontuse = -12280;
 //; $tls::p__dontuse = 420;
-//; $tls::locals = -15364;
+//; $tls::locals = -11216;
 //; $tls::plocals = 1484;
-//; $tls::_ctinfo = -13732;
+//; $tls::_ctinfo = -9584;
 //; $tls::p_ctinfo = 3116;
-//; $tls::andreas = -13728;
+//; $tls::andreas = -9580;
 //; $tls::pandreas = 3120;
-//; $tls::wq = -13720;
+//; $tls::wq = -9572;
 //; $tls::pwq = 3128;
-//; $tls::prev = -13692;
+//; $tls::prev = -9544;
 //; $tls::pprev = 3156;
-//; $tls::next = -13688;
+//; $tls::next = -9540;
 //; $tls::pnext = 3160;
-//; $tls::sig = -13684;
+//; $tls::sig = -9536;
 //; $tls::psig = 3164;
-//; $tls::incyg = -13680;
+//; $tls::incyg = -9532;
 //; $tls::pincyg = 3168;
-//; $tls::spinning = -13676;
+//; $tls::spinning = -9528;
 //; $tls::pspinning = 3172;
-//; $tls::stacklock = -13672;
+//; $tls::stacklock = -9524;
 //; $tls::pstacklock = 3176;
-//; $tls::stackptr = -13668;
+//; $tls::stackptr = -9520;
 //; $tls::pstackptr = 3180;
-//; $tls::stack = -13664;
+//; $tls::stack = -9516;
 //; $tls::pstack = 3184;
-//; $tls::initialized = -12640;
+//; $tls::initialized = -8492;
 //; $tls::pinitialized = 4208;
 //; __DATA__
 
-#define tls_func (-16848)
+#define tls_func (-12700)
 #define tls_pfunc (0)
-#define tls_el (-16844)
+#define tls_el (-12696)
 #define tls_pel (4)
-#define tls_saved_errno (-16836)
+#define tls_saved_errno (-12688)
 #define tls_psaved_errno (12)
-#define tls_sa_flags (-16832)
+#define tls_sa_flags (-12684)
 #define tls_psa_flags (16)
-#define tls_oldmask (-16828)
+#define tls_oldmask (-12680)
 #define tls_poldmask (20)
-#define tls_deltamask (-16824)
+#define tls_deltamask (-12676)
 #define tls_pdeltamask (24)
-#define tls_event (-16820)
+#define tls_event (-12672)
 #define tls_pevent (28)
-#define tls_errno_addr (-16816)
+#define tls_errno_addr (-12668)
 #define tls_perrno_addr (32)
-#define tls_sigmask (-16812)
+#define tls_sigmask (-12664)
 #define tls_psigmask (36)
-#define tls_sigwait_mask (-16808)
+#define tls_sigwait_mask (-12660)
 #define tls_psigwait_mask (40)
-#define tls_sigwait_info (-16804)
+#define tls_sigwait_info (-12656)
 #define tls_psigwait_info (44)
-#define tls_thread_context (-16800)
+#define tls_thread_context (-12652)
 #define tls_pthread_context (48)
-#define tls_thread_id (-16588)
+#define tls_thread_id (-12440)
 #define tls_pthread_id (260)
-#define tls_threadkill (-16584)
+#define tls_threadkill (-12436)
 #define tls_pthreadkill (264)
-#define tls_infodata (-16580)
+#define tls_infodata (-12432)
 #define tls_pinfodata (268)
-#define tls_tid (-16432)
+#define tls_tid (-12284)
 #define tls_ptid (416)
-#define tls_local_clib (-16428)
+#define tls_local_clib (-12280)
 #define tls_plocal_clib (420)
-#define tls___dontuse (-16428)
+#define tls___dontuse (-12280)
 #define tls_p__dontuse (420)
-#define tls_locals (-15364)
+#define tls_locals (-11216)
 #define tls_plocals (1484)
-#define tls__ctinfo (-13732)
+#define tls__ctinfo (-9584)
 #define tls_p_ctinfo (3116)
-#define tls_andreas (-13728)
+#define tls_andreas (-9580)
 #define tls_pandreas (3120)
-#define tls_wq (-13720)
+#define tls_wq (-9572)
 #define tls_pwq (3128)
-#define tls_prev (-13692)
+#define tls_prev (-9544)
 #define tls_pprev (3156)
-#define tls_next (-13688)
+#define tls_next (-9540)
 #define tls_pnext (3160)
-#define tls_sig (-13684)
+#define tls_sig (-9536)
 #define tls_psig (3164)
-#define tls_incyg (-13680)
+#define tls_incyg (-9532)
 #define tls_pincyg (3168)
-#define tls_spinning (-13676)
+#define tls_spinning (-9528)
 #define tls_pspinning (3172)
-#define tls_stacklock (-13672)
+#define tls_stacklock (-9524)
 #define tls_pstacklock (3176)
-#define tls_stackptr (-13668)
+#define tls_stackptr (-9520)
 #define tls_pstackptr (3180)
-#define tls_stack (-13664)
+#define tls_stack (-9516)
 #define tls_pstack (3184)
-#define tls_initialized (-12640)
+#define tls_initialized (-8492)
 #define tls_pinitialized (4208)