From 378ea0e69a784a84c6a5e01d453c01e72c997338 Mon Sep 17 00:00:00 2001 From: Zoltan Varga Date: Wed, 29 Apr 2009 10:00:32 +0000 Subject: [PATCH] 2009-04-29 Zoltan Varga * mini.c (mini_method_compile): Use TARGET_ defines instead of ____ defines in the JIT code. svn path=/branches/mono-2-4/mono/; revision=132980 --- mono/mini/ChangeLog | 7 +++++-- mono/mini/mini.c | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog index d755d26534121..9c487b8468af4 100644 --- a/mono/mini/ChangeLog +++ b/mono/mini/ChangeLog @@ -1,7 +1,10 @@ 2009-04-29 Zoltan Varga - * *.h *.c: Use TARGET_ defines instead of ____ defines in the - JIT code. + * mini.c (mini_method_compile): Use TARGET_ defines instead of + ____ defines in the JIT code. + + * *.h *.c: Use TARGET_ defines instead of ____ defines in + the JIT code. 2009-03-31 Martin Baulig diff --git a/mono/mini/mini.c b/mono/mini/mini.c index 4d4c09b4f54af..e5f9262c993fe 100644 --- a/mono/mini/mini.c +++ b/mono/mini/mini.c @@ -3601,9 +3601,9 @@ mini_method_compile (MonoMethod *method, guint32 opts, MonoDomain *domain, gbool gi->this_reg = inst->dreg; } else { g_assert (inst->opcode == OP_REGOFFSET); -#ifdef __i386__ +#ifdef TARGET_X86 g_assert (inst->inst_basereg == X86_EBP); -#elif defined(__x86_64__) +#elif defined(TARGET_AMD64) g_assert (inst->inst_basereg == X86_EBP || inst->inst_basereg == X86_ESP); #endif g_assert (inst->inst_offset >= G_MININT32 && inst->inst_offset <= G_MAXINT32);