Merge pull request #946 from akoeplinger/fix-mono-parallel

[mono.git] / mono / mini / aot-compiler.c

diff --git a/mono/mini/aot-compiler.c b/mono/mini/aot-compiler.c
index 2cd4bb7311a7f35545d276e96bcee179e5c0124f..660d9da1e047dc3b061ee8766037e0b85f83c1b1 100644 (file)
--- a/mono/mini/aot-compiler.c
+++ b/mono/mini/aot-compiler.c
@@ -667,7 +667,7 @@ arch_init (MonoAotCompile *acfg)
        acfg->user_symbol_prefix = "";
 
 #if defined(TARGET_AMD64)
-       g_string_append (acfg->llc_args, " -march=x86-64");
+       g_string_append (acfg->llc_args, " -march=x86-64 -mattr=sse4.1");
 #endif
 
 #ifdef TARGET_ARM
@@ -7259,9 +7259,9 @@ emit_code (MonoAotCompile *acfg)
                        fprintf (acfg->fp, "    .no_dead_strip %s\n", symbol);
 
                for (i = 0; i < acfg->nmethods; ++i) {
+#ifdef MONO_ARCH_AOT_SUPPORTED
                        int call_size;
 
-#ifdef MONO_ARCH_AOT_SUPPORTED
                        if (acfg->cfgs [i])
                                arch_emit_direct_call (acfg, acfg->cfgs [i]->asm_symbol, FALSE, acfg->thumb_mixed && acfg->cfgs [i]->compile_llvm, NULL, &call_size);
                        else
@@ -7318,7 +7318,9 @@ emit_code (MonoAotCompile *acfg)
                method = cfg->orig_method;
 
                if (acfg->aot_opts.full_aot && cfg->orig_method->klass->valuetype) {
+#ifdef MONO_ARCH_AOT_SUPPORTED
                        int call_size;
+#endif
 
                        index = get_method_index (acfg, method);
                        sprintf (symbol, "ut_%d", index);