aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Tietz <kai.tietz@onevision.com>2009-06-26 13:39:36 +0000
committerKai Tietz <ktietz@gcc.gnu.org>2009-06-26 15:39:36 +0200
commitbae4cf874ea098e56b8dc9ab755eb1669b749aeb (patch)
tree8ad3f1cd9b7d3c9e85c0cabf92c3fe053f9a914b
parent46aaa417039ee45500f836e994e93a5cbb070bde (diff)
downloadgcc-bae4cf874ea098e56b8dc9ab755eb1669b749aeb.zip
gcc-bae4cf874ea098e56b8dc9ab755eb1669b749aeb.tar.gz
gcc-bae4cf874ea098e56b8dc9ab755eb1669b749aeb.tar.bz2
mingw-tls.c (__mingwthr_key_dtor): Remove for none shared libgcc.
2009-06-26 Kai Tietz <kai.tietz@onevision.com> * config/i386/mingw-tls.c (__mingwthr_key_dtor): Remove for none shared libgcc. (__mingwthr_remove_key_dtor): Likewise. From-SVN: r148971
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/config/i386/mingw-tls.c29
2 files changed, 7 insertions, 28 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c7c31b7..5e149cd 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2009-06-26 Kai Tietz <kai.tietz@onevision.com>
+
+ * config/i386/mingw-tls.c (__mingwthr_key_dtor): Remove for none
+ shared libgcc.
+ (__mingwthr_remove_key_dtor): Likewise.
+
2009-06-26 Richard Guenther <rguenther@suse.de>
* tree-ssa-structalias.c (do_ds_constraint): Simplify escape
diff --git a/gcc/config/i386/mingw-tls.c b/gcc/config/i386/mingw-tls.c
index 7a5c775..8495a96 100644
--- a/gcc/config/i386/mingw-tls.c
+++ b/gcc/config/i386/mingw-tls.c
@@ -36,38 +36,11 @@ typedef struct __mingwthr_key {
#if defined(_WIN32) && !defined(__CYGWIN__)
-/* Possibly we could define this here for none MT too and avoid use of
- mingwthrd.a at all, but well ... */
+/* Static functions for libgcc. */
#ifdef SHARED
__declspec(dllexport)
int _CRT_MT = 1;
-#else
-#if 0
-int _CRT_MT = 0;
-#endif
-#endif
-
-/* Static functions for libgcc. */
-#ifndef SHARED
-
-int __mingwthr_key_dtor (DWORD,void (*dtor)(void *));
-int __mingwthr_remove_key_dtor (DWORD);
-
-
-int
-__mingwthr_key_dtor (DWORD key __attribute__ ((__unused__)),
- void (*dtor) (void *) __attribute__ ((__unused__)))
-{
- return 0;
-}
-
-int
-__mingwthr_remove_key_dtor (DWORD key __attribute__ ((__unused__)))
-{
- return 0;
-}
-#else
/* Shared functions for libgcc. */
/* Prototypes. */