[jit] Disable fast tls on osx if MONO_HAVE_FAST_TLS is not defined.

diff --git a/mono/mini/mini-amd64.c b/mono/mini/mini-amd64.c
index 522497fcfe0ed9f63dfbbc54583266b7de29d0c2..bf88f17bace11357a53f5ac7a00bdefc6a4588ee 100644 (file)
--- a/mono/mini/mini-amd64.c
+++ b/mono/mini/mini-amd64.c
@@ -3480,6 +3480,7 @@ mono_amd64_have_tls_get (void)
        if (inited)
                return have_tls_get;
 
+#if MONO_HAVE_FAST_TLS
        ins = (guint8*)pthread_getspecific;
 
        /*
@@ -3498,9 +3499,10 @@ mono_amd64_have_tls_get (void)
                       ins [8] == 0x00 &&
                       ins [9] == 0xc3;
 
-       inited = TRUE;
-
        tls_gs_offset = ins[5];
+#endif
+
+       inited = TRUE;
 
        return have_tls_get;
 #elif defined(TARGET_ANDROID)

diff --git a/mono/mini/mini-x86.c b/mono/mini/mini-x86.c
index b53f0a6bccf2d8fe72bc133dcb9ec66e6e163812..1268643dd135d67a5e94200611b9b22d862095f8 100644 (file)
--- a/mono/mini/mini-x86.c
+++ b/mono/mini/mini-x86.c
@@ -2297,6 +2297,7 @@ mono_x86_have_tls_get (void)
        if (inited)
                return have_tls_get;
 
+#ifdef MONO_HAVE_FAST_TLS
        ins = (guint32*)pthread_getspecific;
        /*
         * We're looking for these two instructions:
@@ -2306,6 +2307,7 @@ mono_x86_have_tls_get (void)
         */
        have_tls_get = ins [0] == 0x0424448b && ins [1] == 0x85048b65;
        tls_gs_offset = ins [2];
+#endif
 
        inited = TRUE;