2009-04-29 Zoltan Varga <vargaz@gmail.com>

* mini.c (mini_method_compile): Use TARGET_<ARCH> defines instead of __<arch>__ defines in the JIT code. svn path=/branches/mono-2-4/mono/; revision=132980
baulig · Apr 29, 2009 · 378ea0e · 378ea0e
1 parent 2d66b2d
commit 378ea0e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
@@ -1,7 +1,10 @@
 2009-04-29  Zoltan Varga  <vargaz@gmail.com>
 
-	* *.h *.c: Use TARGET_<ARCH> defines instead of __<arch>__ defines in the
-	JIT code.
+	* mini.c (mini_method_compile): Use TARGET_<ARCH> defines instead of 
+	__<arch>__ defines in the JIT code.
+
+	* *.h *.c: Use TARGET_<ARCH> defines instead of __<arch>__ defines in 
+	the JIT code.
 
 2009-03-31  Martin Baulig  <martin@ximian.com>
 

diff --git 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);