2010-04-24 Mark Probst <mark.probst@gmail.com>

        * mini.c, driver.c: Initialize mono_use_llvm in mono_main(), not
        in the initializer, because it's non-constant.

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

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index 8ee9d29c52bbb0a98e1e752493906e33493beec6..2d614f908e7483b641b5a10c0221f6575c36a1d1 100755 (executable)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-24  Mark Probst  <mark.probst@gmail.com>
+
+       * mini.c, driver.c: Initialize mono_use_llvm in mono_main(), not
+       in the initializer, because it's non-constant.
+
 2010-04-23  Miguel de Icaza  <miguel@novell.com>
 
        * mini.c: Use MONO_USE_LLVM as an environment flag to turn the use

diff --git a/mono/mini/driver.c b/mono/mini/driver.c
index 8bb937c3407d7c60d1a0b63384dd340d1a329ad6..3f885b0547c2abf9f17919b8b0bff12d7b44fb61 100644 (file)
--- a/mono/mini/driver.c
+++ b/mono/mini/driver.c
@@ -1339,6 +1339,8 @@ mono_main (int argc, char* argv[])
        g_log_set_always_fatal (G_LOG_LEVEL_ERROR);
        g_log_set_fatal_mask (G_LOG_DOMAIN, G_LOG_LEVEL_ERROR);
 
+       mono_use_llvm = getenv ("MONO_USE_LLVM") != NULL;
+
        opt = parse_optimizations (NULL);
 
        for (i = 1; i < argc; ++i) {

diff --git a/mono/mini/mini.c b/mono/mini/mini.c
index 2e8e406f919e5c78c63ccc80d21e3bac20923bf0..87b7cc6c73fb7e304f754cc9580ad03a52e9a6fb 100644 (file)
--- a/mono/mini/mini.c
+++ b/mono/mini/mini.c
@@ -120,7 +120,7 @@ static int methods_with_llvm, methods_without_llvm;
  *   one trampoline.
  * - fast generic virtual calls are not supported.
  */
-gboolean mono_use_llvm = getenv ("MONO_USE_LLVM") != NULL;
+gboolean mono_use_llvm = FALSE;
 
 #define mono_jit_lock() EnterCriticalSection (&jit_mutex)
 #define mono_jit_unlock() LeaveCriticalSection (&jit_mutex)