Add support for --llvm option to mono_jit_parse_options (). Fixes #4704.

diff --git a/mono/mini/debugger-agent.c b/mono/mini/debugger-agent.c
index 8151e0770b56cbea1742c492dde8f7327e46d39e..5c4b4a7e144fdeceaecf41f9147abfd0b82694fd 100644 (file)
--- a/mono/mini/debugger-agent.c
+++ b/mono/mini/debugger-agent.c
@@ -810,6 +810,7 @@ mono_debugger_agent_parse_options (char *options)
 #endif
 
        extra = getenv ("MONO_SDB_ENV_OPTIONS");
+       extra = "loglevel=10";
        if (extra)
                options = g_strdup_printf ("%s,%s", options, extra);
 

diff --git a/mono/mini/driver.c b/mono/mini/driver.c
index d4c2525e05dd2beeaabe2f70a88dbe88d1d600d8..e01a6d304ccb02606d373579d53df702dcc77e64 100644 (file)
--- a/mono/mini/driver.c
+++ b/mono/mini/driver.c
@@ -1342,6 +1342,12 @@ mono_jit_parse_options (int argc, char * argv[])
                        
                        if (!mono_debugger_insert_breakpoint (argv [++i], FALSE))
                                fprintf (stderr, "Error: invalid method name '%s'\n", argv [i]);
+               } else if (strcmp (argv [i], "--llvm") == 0) {
+#ifndef MONO_ARCH_LLVM_SUPPORTED
+                       fprintf (stderr, "Mono Warning: --llvm not supported on this platform.\n");
+#else
+                       mono_use_llvm = TRUE;
+#endif
                } else {
                        fprintf (stderr, "Unsupported command line option: '%s'\n", argv [i]);
                        exit (1);