From e5613f469b7633b188a32a8483e5b9a5e87e54f6 Mon Sep 17 00:00:00 2001
From: zoltan <zoltan@e3ebcda4-bce8-0310-ba0a-eca2169e7518>
Date: Fri, 16 Apr 2010 02:59:31 +0000
Subject: [PATCH] 2010-04-16  Zoltan Varga  <vargaz@gmail.com>

	* method-to-ir.c driver.c: Disable a few more things when DISABLE_JIT is set.

git-svn-id: svn+ssh://mono-cvs.ximian.com/source/trunk/mono@155607 e3ebcda4-bce8-0310-ba0a-eca2169e7518
---
 mono/mini/ChangeLog      | 4 ++++
 mono/mini/driver.c       | 2 ++
 mono/mini/method-to-ir.c | 4 ----
 mono/mini/mini.c         | 2 ++
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index 139b22f85..aeb04ad73 100755
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,5 +1,9 @@
 2010-04-16  Zoltan Varga  <vargaz@gmail.com>
 
+	* method-to-ir.c driver.c: Disable a few more things when DISABLE_JIT is set.
+
+2010-04-16  Zoltan Varga  <vargaz@gmail.com>
+
 	* mini-llvm.c (emit_entry_bb): Fix support for simd arguments passed on the
 	stack.
 
diff --git a/mono/mini/driver.c b/mono/mini/driver.c
index fea2633ea..8bb937c34 100644
--- a/mono/mini/driver.c
+++ b/mono/mini/driver.c
@@ -1832,6 +1832,7 @@ mono_main (int argc, char* argv[])
 		return 3;
 	}
 
+#ifndef DISABLE_JIT
 	if (action == DO_DRAW) {
 		int part = 0;
 
@@ -1923,6 +1924,7 @@ mono_main (int argc, char* argv[])
 		cfg = mini_method_compile (method, opt, mono_get_root_domain (), FALSE, FALSE, 0);
 		mono_destroy_compile (cfg);
 	}
+#endif
 
 	mini_cleanup (domain);
  	return 0;
diff --git a/mono/mini/method-to-ir.c b/mono/mini/method-to-ir.c
index bb6c9fb3d..c8eda3b56 100644
--- a/mono/mini/method-to-ir.c
+++ b/mono/mini/method-to-ir.c
@@ -1713,8 +1713,6 @@ mini_emit_memset (MonoCompile *cfg, int destreg, int offset, int size, int val,
 	}
 }
 
-#endif /* DISABLE_JIT */
-
 void 
 mini_emit_memcpy (MonoCompile *cfg, int destreg, int doffset, int srcreg, int soffset, int size, int align)
 {
@@ -1777,8 +1775,6 @@ mini_emit_memcpy (MonoCompile *cfg, int destreg, int doffset, int srcreg, int so
 	}
 }
 
-#ifndef DISABLE_JIT
-
 static int
 ret_type_to_call_opcode (MonoType *type, int calli, int virt, MonoGenericSharingContext *gsctx)
 {
diff --git a/mono/mini/mini.c b/mono/mini/mini.c
index a16ed003a..f0046ecd6 100644
--- a/mono/mini/mini.c
+++ b/mono/mini/mini.c
@@ -4607,6 +4607,7 @@ mono_jit_compile_method_inner (MonoMethod *method, MonoDomain *target_domain, in
 	}
 #endif
 
+#ifndef DISABLE_JIT
 	if ((method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) ||
 	    (method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL)) {
 		MonoMethod *nm;
@@ -4665,6 +4666,7 @@ mono_jit_compile_method_inner (MonoMethod *method, MonoDomain *target_domain, in
 		}
 		return NULL;
 	}
+#endif
 
 	if (mono_aot_only) {
 		char *fullname = mono_method_full_name (method, TRUE);
-- 
2.11.4.GIT