2009-01-25 Zoltan Varga <vargaz@gmail.com>

	* mono-compiler.h (MONO_THREAD_VAR_OFFSET): Add ARM Linux support.

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

diff --git a/mono/utils/ChangeLog b/mono/utils/ChangeLog
index 5cf44c7c3b4a0d96362abae9d09033a293e827cf..73b683228fea58110dca03bf36bf7958b76d40fa 100644 (file)
--- a/mono/utils/ChangeLog
+++ b/mono/utils/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-25  Zoltan Varga  <vargaz@gmail.com>
+
+       * mono-compiler.h (MONO_THREAD_VAR_OFFSET): Add ARM Linux support.
+
 2009-01-21  Zoltan Varga  <vargaz@gmail.com>
 
        * mono-mmap.c: Applied patch from Koushik Dutta

diff --git a/mono/utils/mono-compiler.h b/mono/utils/mono-compiler.h
index 7cf576f75b4dd2830035e0bed2ff7cab3071541b..a40f63509d9c8740d187d92c748b70279c3590c6 100644 (file)
--- a/mono/utils/mono-compiler.h
+++ b/mono/utils/mono-compiler.h
@@ -65,6 +65,8 @@
 #else
 #define MONO_THREAD_VAR_OFFSET(var,offset) __asm ("addl %0 = @tprel(" #var "#), r0 ;;\n" : "=r" (offset))
 #endif
+#elif defined(__arm__) && defined(__ARM_EABI__) && !defined(PIC)
+#define MONO_THREAD_VAR_OFFSET(var,offset) __asm ("    ldr     %0, 1f; b 2f; 1: .word " #var "(tpoff); 2:" : "=r" (offset))
 #else
 #define MONO_THREAD_VAR_OFFSET(var,offset) (offset) = -1
 #endif