Thu Jul 7 11:59:42 CEST 2005 Paolo Molaro <lupus@ximian.com>

	* pthread_support.c, Makefile.am: make the __thread var use
	fast access if available (and avoid dlopen issue, bug #75390).

svn path=/trunk/mono/; revision=47031

diff --git a/ChangeLog b/ChangeLog
index 80702c4ecb58573e2264ee6506b3bb680511a62b..9580b2f4026a97eb64b17cf646ac374f8d8be964 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+
+Thu Jul 7 11:59:42 CEST 2005 Paolo Molaro <lupus@ximian.com>
+
+       * pthread_support.c, Makefile.am: make the __thread var use
+       fast access if available (and avoid dlopen issue, bug #75390).
+
 2005-07-05  Ben Maurer  <bmaurer@ximian.com>
 
        * pthread_stop_world.c (pthread_start_world, _GC_suspend_handler):

diff --git a/Makefile.am b/Makefile.am
index 3df9aee1bf09faefbc62dccf63bea723059c79c9..a00e1745985d315cd5f6d0fc3bf3ea98a23091ed 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,7 +22,14 @@ AUTOMAKE_OPTIONS = foreign
 
 SUBDIRS = include doc
 
-noinst_LTLIBRARIES = libmonogc.la
+INCLUDES=-I$(top_srcdir)/..
+
+#
+# libtool is not capable of creating shared/static versions of a convenience
+# library, so we have to do it ourselves
+#
+
+noinst_LTLIBRARIES = libmonogc.la libmonogc-static.la
 
 EXTRA_DIST = 
     ## more items will be succesively added below

diff --git a/pthread_support.c b/pthread_support.c
index 33101ccdcf5d1da3dba81db298a55f5a93af8c2b..5331b1744b5e2d1763fb83422618998b15e58e01 100644 (file)
--- a/pthread_support.c
+++ b/pthread_support.c
@@ -168,8 +168,17 @@ void GC_init_parallel();
 
 /* We don't really support thread-local allocation with DBG_HDRS_ALL */
 
+/* work around a dlopen issue (bug #75390), undefs to avoid warnings with redefinitions */
+#undef PACKAGE_BUGREPORT
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_VERSION
+#include "mono/utils/mono-compiler.h"
+
+static
 #ifdef USE_COMPILER_TLS
-  __thread
+  __thread MONO_TLS_FAST
 #endif
 GC_key_t GC_thread_key;