diff options
| author | Paolo Molaro <lupus@oddwiz.org> | 2005-07-07 14:01:22 +0400 |
|---|---|---|
| committer | Paolo Molaro <lupus@oddwiz.org> | 2005-07-07 14:01:22 +0400 |
| commit | 9579fa8c94295f85bbf0caf7fa044e4c1643c2f3 (patch) | |
| tree | 7705f144ba9482d503db1ca56fad1983edd26a5b /libgc | |
| parent | 106ad2f37e20824309a1fcccd74aa4e3211fceba (diff) | |
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
Diffstat (limited to 'libgc')
| -rw-r--r-- | libgc/ChangeLog | 6 | ||||
| -rw-r--r-- | libgc/Makefile.am | 2 | ||||
| -rw-r--r-- | libgc/pthread_support.c | 10 |
3 files changed, 17 insertions, 1 deletions
diff --git a/libgc/ChangeLog b/libgc/ChangeLog index 7882ae12212..003a7add7a7 100644 --- a/libgc/ChangeLog +++ b/libgc/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/libgc/Makefile.am b/libgc/Makefile.am index bdb299aa49a..0e88e0a4a09 100644 --- a/libgc/Makefile.am +++ b/libgc/Makefile.am @@ -22,6 +22,8 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = include doc +INCLUDES=-I$(top_srcdir)/.. + # # libtool is not capable of creating shared/static versions of a convenience # library, so we have to do it ourselves diff --git a/libgc/pthread_support.c b/libgc/pthread_support.c index 5486d686e43..bef27a60363 100644 --- a/libgc/pthread_support.c +++ b/libgc/pthread_support.c @@ -168,9 +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; |