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

	* aot-runtime.c (load_function): Use TARGET_X86 instead of __i386__.

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

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index 955d7f5d48032bed647ff78766f9c176f20c94c7..b5e3b890257e7f74f32f59a616c0e4d1972525ba 100755 (executable)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-29  Zoltan Varga  <vargaz@gmail.com>
+
+       * aot-runtime.c (load_function): Use TARGET_X86 instead of __i386__.
+
 2010-04-28  Zoltan Varga  <vargaz@gmail.com>
 
        * aot-compiler.c (emit_got_info): Double the buffer size to avoid an assert.

diff --git a/mono/mini/aot-runtime.c b/mono/mini/aot-runtime.c
index 6176d13d5ed644605f0c87148e3b9f83c6034525..e9e4d92d7fca6e18024194c9588aa9edefc089bf 100644 (file)
--- a/mono/mini/aot-runtime.c
+++ b/mono/mini/aot-runtime.c
@@ -3471,11 +3471,11 @@ load_function (MonoAotModule *amodule, const char *name)
                                } else if (!strcmp (ji->data.name, "mono_amd64_get_original_ip")) {
                                        target = mono_amd64_get_original_ip;
 #endif
-#ifdef __i386__
+#ifdef TARGET_X86
                                } else if (!strcmp (ji->data.name, "mono_x86_throw_exception")) {
                                        target = mono_x86_throw_exception;
 #endif
-#ifdef __i386__
+#ifdef TARGET_X86
                                } else if (!strcmp (ji->data.name, "mono_x86_throw_corlib_exception")) {
                                        target = mono_x86_throw_corlib_exception;
 #endif