2010-07-13 Miguel de Icaza <miguel@novell.com>

	* mini.c: LLVM is disabled by default on LLVM builds.  You can use
	the MONO_ENV_OPTIONS to set the --llvm flag.

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

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index eff59b58143876ec9b3646ea8f04f8f755f2eafa..801090bfd2da5ab727228b1763889e9a7293d781 100755 (executable)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-13  Miguel de Icaza  <miguel@novell.com>
+
+       * mini.c: LLVM is disabled by default on LLVM builds.  You can use
+       the MONO_ENV_OPTIONS to set the --llvm flag.
+       
 2010-07-13  Atsushi Enomoto  <atsushi@ximian.com>
 
        * driver.c : windows build fix for --with-moonlight.

diff --git a/mono/mini/mini.c b/mono/mini/mini.c
index f4065ba7500499ab816a51190888d3321e187c62..9fa8fb4455171e653540d8f45b2b0cbbf68d841d 100644 (file)
--- a/mono/mini/mini.c
+++ b/mono/mini/mini.c
@@ -125,11 +125,7 @@ static int methods_with_llvm, methods_without_llvm;
  *   one trampoline.
  * - fast generic virtual calls are not supported.
  */
-#if defined(ENABLE_LLVM) && !defined(MONO_LLVM_LOADED)
-gboolean mono_use_llvm = TRUE;
-#else
 gboolean mono_use_llvm = FALSE;
-#endif
 
 #define mono_jit_lock() EnterCriticalSection (&jit_mutex)
 #define mono_jit_unlock() LeaveCriticalSection (&jit_mutex)