commit edf396b419648f795a87874784248f0321ba36b6
author Kai Tietz <ktietz70@googlemail.com> Thu Aug 20 16:01:04 2009 +0000
committer Kai Tietz <ktietz70@googlemail.com> Thu Aug 20 16:01:04 2009 +0000
tree 4e8b4ca9b1479a827dade6bb4736bddf579af418
parent 94ac401445c968c785b08fae4adbd0802f61d7e5

Disable TLS cleanup MS compatible layer. Gnu TLS is pretty incompatible to it and
we need to to the thread based local allocation by hand, as it otherwise can happen,
that on startup and or shutdown TLS memory was already destroyed, or isn't setup.


git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@1179 4407c894-4637-0410-b4f5-ada5f102cad1

mingw-w64-crt/crt/tlssup.c

diff --git a/mingw-w64-crt/crt/tlssup.c b/mingw-w64-crt/crt/tlssup.c
index adc327a..475ccd8 100644
--- a/mingw-w64-crt/crt/tlssup.c
+++ b/mingw-w64-crt/crt/tlssup.c
@@ -15,7 +15,6 @@
 #include <crtdbg.h>
 
 extern BOOL __mingw_TLScallback (HANDLE hDllHandle, DWORD reason, LPVOID reserved);
-extern int _CRT_MT;
 
 #define FUNCS_PER_NODE 30
 
@@ -55,11 +54,15 @@
 #endif
 #endif
 
+#define DISABLE_MS_TLS 1
+
 static _CRTALLOC(".CRT$XDA") _PVFV __xd_a = 0;
 static _CRTALLOC(".CRT$XDZ") _PVFV __xd_z = 0;
 
+#if !defined (DISABLE_MS_TLS)
 static __CRT_THREAD TlsDtorNode *dtor_list;
 static __CRT_THREAD TlsDtorNode dtor_list_head;
+#endif
 
 BOOL WINAPI
 __dyn_tls_init (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved)
@@ -68,7 +71,7 @@
 
   if (dwReason != DLL_THREAD_ATTACH)
     {
-      if (dwReason == DLL_PROCESS_ATTACH && _CRT_MT == 2)
+      if (dwReason == DLL_PROCESS_ATTACH)
         __mingw_TLScallback (hDllHandle, dwReason, lpreserved);
       return TRUE;
     }
@@ -78,7 +81,6 @@
       if (*pfunc != NULL)
 	(*pfunc)();
     }
-
   return TRUE;
 }
 
@@ -88,6 +90,9 @@
 int __cdecl
 __tlregdtor (_PVFV func)
 {
+  if (!func)
+    return 0;
+#if !defined (DISABLE_MS_TLS)
   if (dtor_list == NULL)
     {
       dtor_list = &dtor_list_head;
@@ -105,14 +110,17 @@
       dtor_list->count = 0;
     }
   dtor_list->funcs[dtor_list->count++] = func;
+#endif
   return 0;
 }
 
 static BOOL WINAPI
 __dyn_tls_dtor (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved)
 {
+#if !defined (DISABLE_MS_TLS)
   TlsDtorNode *pnode, *pnext;
   int i;
+#endif
 
   if (dwReason != DLL_THREAD_DETACH && dwReason != DLL_PROCESS_DETACH)
     return TRUE;
@@ -121,6 +129,7 @@
      call the already destroyed TLS vars.
      TODO: The used local thread based variables have to be handled
      manually, so that we can control their lifetime here.  */
+#if !defined (DISABLE_MS_TLS)
   if (dwReason != DLL_PROCESS_DETACH)
     {
       for (pnode = dtor_list; pnode != NULL; pnode = pnext)
@@ -135,9 +144,8 @@
 	    free ((void *) pnode);
         }
     }
-  /* Don't call if we use libgcc_s version.  */
-  if (_CRT_MT == 2)
-    __mingw_TLScallback (hDllHandle, dwReason, lpreserved);
+#endif
+  __mingw_TLScallback (hDllHandle, dwReason, lpreserved);
   return TRUE;
 }