2011-08-19 Chris Sutcliffe <ir0nh34d@users.sourceforge.net>

        * tlssup.c: Remove mingwm10.dll fallback.

2 files changed, 4 insertions, 34 deletions

diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index 048846321..ca0b7a17b 100644
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,5 +1,9 @@
 2011-08-19  Chris Sutcliffe  <ir0nh34d@users.sourceforge.net>
 
+	* tlssup.c: Remove mingwm10.dll fallback.
+
+2011-08-19  Chris Sutcliffe  <ir0nh34d@users.sourceforge.net>
+
 	* include/sys/types.h (ssize_t): Defined as int as opposed to long.
 
 	Thanks to bvassche for the report.
diff --git a/winsup/mingw/tlssup.c b/winsup/mingw/tlssup.c
index 660d09800..2d301659b 100644
--- a/winsup/mingw/tlssup.c
+++ b/winsup/mingw/tlssup.c
@@ -78,16 +78,6 @@ static __CRT_THREAD TlsDtorNode dtor_list_head;
 
 extern int _CRT_MT;
 
-#ifndef _WIN64
-#define MINGWM10_DLL "mingwm10.dll"
-typedef int (*fMTRemoveKeyDtor)(DWORD key);
-typedef int (*fMTKeyDtor)(DWORD key, void (*dtor)(void *));
-fMTRemoveKeyDtor __mingw_gMTRemoveKeyDtor;
-fMTKeyDtor __mingw_gMTKeyDtor;
-int __mingw_usemthread_dll;
-static HANDLE __mingw_mthread_hdll;
-#endif
-
 BOOL WINAPI __dyn_tls_init (HANDLE, DWORD, LPVOID);
 
 BOOL WINAPI
@@ -96,30 +86,6 @@ __dyn_tls_init (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved)
   _PVFV *pfunc;
   int nfuncs, ifunc;
 
-#ifndef _WIN64
-  if (_winmajor < 4)
-  {
-    __mingw_usemthread_dll = 1;
-    __mingw_mthread_hdll = LoadLibrary (MINGWM10_DLL);
-    if (__mingw_mthread_hdll != NULL)
-    {
-      __mingw_gMTRemoveKeyDtor = (fMTRemoveKeyDtor) GetProcAddress (__mingw_mthread_hdll, "__mingwthr_remove_key_dtor");
-      __mingw_gMTKeyDtor = (fMTKeyDtor)  GetProcAddress (__mingw_mthread_hdll, "__mingwthr_key_dtor");
-    }
-    if (__mingw_mthread_hdll == NULL || !__mingw_gMTRemoveKeyDtor || !__mingw_gMTKeyDtor)
-      {
-  __mingw_gMTKeyDtor = NULL;
-  __mingw_gMTRemoveKeyDtor = NULL;
-  if (__mingw_mthread_hdll)
-    FreeLibrary (__mingw_mthread_hdll);
-  __mingw_mthread_hdll = NULL;
-  _CRT_MT = 0;
-  return TRUE;
-      }
-    _CRT_MT = 1;
-    return TRUE;
-  }
-#endif
   /* We don't let us trick here.  */
   if (_CRT_MT != 2)
    _CRT_MT = 2;