Thu Jul 7 12:15:22 CEST 2005 Paolo Molaro <lupus@ximian.com>

	* pthread_support.c: fix compilation when TLS_ALLOC is not defined.

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

diff --git a/ChangeLog b/ChangeLog
index 9580b2f4026a97eb64b17cf646ac374f8d8be964..057e0a336944ffccaeff8114bfa35106dced6d78 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
 
+
+Thu Jul 7 12:15:22 CEST 2005 Paolo Molaro <lupus@ximian.com>
+
+       * pthread_support.c: fix compilation when TLS_ALLOC is not defined.
+
 Thu Jul 7 11:59:42 CEST 2005 Paolo Molaro <lupus@ximian.com>
 
        * pthread_support.c, Makefile.am: make the __thread var use

diff --git a/pthread_support.c b/pthread_support.c
index 5331b1744b5e2d1763fb83422618998b15e58e01..ae66ece912fa3aedeacf8a0034165f82807166b2 100644 (file)
--- a/pthread_support.c
+++ b/pthread_support.c
@@ -527,7 +527,7 @@ volatile GC_thread GC_threads[THREAD_TABLE_SZ];
  * gcc-3.3.6 miscompiles the &GC_thread_key+sizeof(&GC_thread_key) expression so
  * put it into a separate function.
  */
-#   ifdef __GNUC__
+#   if defined(__GNUC__) && defined(THREAD_LOCAL_ALLOC) && !defined(DBG_HDRS_ALL)
 static __attribute__((noinline)) unsigned char* get_gc_thread_key_addr GC_PROTO((void))
 {
        return (unsigned char*)&GC_thread_key;