From 99b3b2cced0cd1185e2011bc2600a0d544a337db Mon Sep 17 00:00:00 2001
From: =?utf8?q?Alex=20R=C3=B8nne=20Petersen?= <alexrp@xamarin.com>
Date: Wed, 4 Nov 2015 20:16:28 +0100
Subject: [PATCH] [arm] HACK: Disable fast TLS on ARM for now.

https://bugzilla.xamarin.com/show_bug.cgi?id=35178
---
 mono/mini/mini-arm.c | 1 +
 mono/mini/mini-arm.h | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/mono/mini/mini-arm.c b/mono/mini/mini-arm.c
index 6016ab56ab2..bdbd4ba488a 100644
--- a/mono/mini/mini-arm.c
+++ b/mono/mini/mini-arm.c
@@ -678,6 +678,7 @@ mono_arm_have_fast_tls (void)
 gboolean
 mono_arm_have_tls_get (void)
 {
+	return FALSE;
 #ifdef HAVE_FAST_TLS
 	return TRUE;
 #else
diff --git a/mono/mini/mini-arm.h b/mono/mini/mini-arm.h
index b09db53452a..1994ba0a6ab 100644
--- a/mono/mini/mini-arm.h
+++ b/mono/mini/mini-arm.h
@@ -306,7 +306,7 @@ typedef struct MonoCompileArch {
 #endif
 
 #define MONO_ARCH_HAVE_TLS_GET (mono_arm_have_tls_get ())
-#define MONO_ARCH_HAVE_TLS_GET_REG 1
+// #define MONO_ARCH_HAVE_TLS_GET_REG 1
 
 /* ARM doesn't have too many registers, so we have to use a callee saved one */
 #define MONO_ARCH_RGCTX_REG ARMREG_V5
-- 
2.11.4.GIT