diff options
| author | Paolo Molaro <lupus@oddwiz.org> | 2006-02-28 16:02:26 +0300 |
|---|---|---|
| committer | Paolo Molaro <lupus@oddwiz.org> | 2006-02-28 16:02:26 +0300 |
| commit | fe120c12ff512b4fbdf3d0f852461471fa319804 (patch) | |
| tree | dbb9cc18e44620d5a328d28657dd8a0c7f3a8000 | |
| parent | 896b1899df8fbfe14ca6663218330adcf4074634 (diff) | |
Tue Feb 28 13:58:50 CET 2006 Paolo Molaro <lupus@ximian.com>
* mono-compiler.h: fixed Jakub's patch to actually compile on amd64.
svn path=/trunk/mono/; revision=57388
| -rw-r--r-- | mono/utils/ChangeLog | 4 | ||||
| -rw-r--r-- | mono/utils/mono-compiler.h | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/mono/utils/ChangeLog b/mono/utils/ChangeLog index e2fa4fe58f5..1a7f214050b 100644 --- a/mono/utils/ChangeLog +++ b/mono/utils/ChangeLog @@ -1,4 +1,8 @@ +Tue Feb 28 13:58:50 CET 2006 Paolo Molaro <lupus@ximian.com> + + * mono-compiler.h: fixed Jakub's patch to actually compile on amd64. + Tue Feb 28 11:33:40 CET 2006 Paolo Molaro <lupus@ximian.com> * mono-compiler.h: patch from Jakub Jelinek to retrieve diff --git a/mono/utils/mono-compiler.h b/mono/utils/mono-compiler.h index 7e42973a9b5..3fdf971f3c3 100644 --- a/mono/utils/mono-compiler.h +++ b/mono/utils/mono-compiler.h @@ -29,8 +29,7 @@ #endif #elif defined(__x86_64__) #if defined(PIC) -#define MONO_THREAD_VAR_OFFSET(var,offset) do { guint64 foo; __asm ("movq $" #var "@GOTTPOFF(%%rip), %0" : "=r" (foo)); offset -= foo; } while (0) +#define MONO_THREAD_VAR_OFFSET(var,offset) do { guint64 foo; __asm ("movq " #var "@GOTTPOFF(%%rip), %0" : "=r" (foo)); offset = foo; } while (0) #else #define MONO_THREAD_VAR_OFFSET(var,offset) do { guint64 foo; __asm ("movq $" #var "@TPOFF, %0" : "=r" (foo)); offset = foo; } while (0) #endif |