Mon Jul 13 17:58:50 CEST 2009 Paolo Molaro <lupus@ximian.com>

	* mini-ppc.c: fixed bug introduced by Steven's TLS changes.

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

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index 606bb28077c328fa58e4d9ce1c05eef4d2fe024c..559cd719dfa1a8413ebe39afc0a1684a2d55afc4 100644 (file)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,3 +1,8 @@
+
+Mon Jul 13 17:58:50 CEST 2009 Paolo Molaro <lupus@ximian.com>
+
+       * mini-ppc.c: fixed bug introduced by Steven's TLS changes.
+
 2009-07-13  Mark Probst  <mark.probst@gmail.com>
 
        * mini.c: Register function for getting the IP from a signal

diff --git a/mono/mini/mini-ppc.c b/mono/mini/mini-ppc.c
index e1dbcfa764da48ab6fe60a77309ac93183a259f3..960f81d4e6ec2e5800cef50391bd43afd66465ee 100644 (file)
--- a/mono/mini/mini-ppc.c
+++ b/mono/mini/mini-ppc.c
@@ -5268,8 +5268,6 @@ setup_tls_access (void)
                conf_size = confstr ( _CS_GNU_LIBPTHREAD_VERSION, confbuf, sizeof(confbuf));
                if ((conf_size > 4) && (strncmp (confbuf, "NPTL", 4) == 0))
                        tls_mode = TLS_MODE_NPTL;
-               else
-                       tls_mode = TLS_MODE_LTHREADS;
 #else
                ins = (guint32*)pthread_getspecific;
                /* uncond branch to the real method */
@@ -5344,6 +5342,10 @@ setup_tls_access (void)
                }
 #endif
        }
+       if (tls_mode == TLS_MODE_DETECT)
+               tls_mode = TLS_MODE_FAILED;
+       if (tls_mode == TLS_MODE_FAILED)
+               return;
        if ((monodomain_key == -1) && (tls_mode == TLS_MODE_NPTL)) {
                monodomain_key = mono_domain_get_tls_offset();
        }