tag 330369 + patch upstream fixed-upstream
thanks

--- Begin Message ---
Author: zoltan
Date: 2005-09-11 18:12:58 -0400 (Sun, 11 Sep 2005)
New Revision: 49929

Modified:
   trunk/mono/mono/utils/ChangeLog
   trunk/mono/mono/utils/mono-compiler.h
Log:
2005-09-12  Zoltan Varga  <[EMAIL PROTECTED]>

        * mono-compiler.h (MONO_THREAD_VAR_OFFSET): Fix compilation on amd64
        with recent binutils.


Modified: trunk/mono/mono/utils/ChangeLog
===================================================================
--- trunk/mono/mono/utils/ChangeLog     2005-09-11 21:20:17 UTC (rev 49928)
+++ trunk/mono/mono/utils/ChangeLog     2005-09-11 22:12:58 UTC (rev 49929)
@@ -1,4 +1,8 @@
+2005-09-12  Zoltan Varga  <[EMAIL PROTECTED]>
 
+       * mono-compiler.h (MONO_THREAD_VAR_OFFSET): Fix compilation on amd64
+       with recent binutils.
+
 Wed Sep 7 21:23:18 BST 2005 Paolo Molaro <[EMAIL PROTECTED]>
 
        * mono-codeman.c: ensure we have enough room for thunks

Modified: trunk/mono/mono/utils/mono-compiler.h
===================================================================
--- trunk/mono/mono/utils/mono-compiler.h       2005-09-11 21:20:17 UTC (rev 
49928)
+++ trunk/mono/mono/utils/mono-compiler.h       2005-09-11 22:12:58 UTC (rev 
49929)
@@ -27,7 +27,7 @@
 #if defined(PIC)
 #define MONO_THREAD_VAR_OFFSET(var,offset) (offset) = -1
 #else
-#define MONO_THREAD_VAR_OFFSET(var,offset) __asm ("jmp 1f; .section writetext, 
\"awx\"; 1: movl $" #var "@TPOFF, %0; jmp 2f; .previous; 2:" : "=r" (offset));
+#define MONO_THREAD_VAR_OFFSET(var,offset) do { guint64 foo;  __asm ("jmp 1f; 
.section writetext, \"awx\"; 1: movq $" #var "@TPOFF, %0; jmp 2f; .previous; 
2:" : "=a" (foo)); offset = foo; } while (0);
 #endif
 #elif defined(__ia64__) && !defined(__INTEL_COMPILER)
 #define MONO_THREAD_VAR_OFFSET(var,offset) __asm ("addl %0 = @tprel(" #var 
"#), r0 ;;\n" : "=r" (offset));

_______________________________________________
Mono-patches maillist  -  Mono-patches@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-patches


--- End Message ---

Reply via email to