Added new API mono_runtime_set_main_args() and fixed CommandLine for embedders.

[mono.git] / mono / metadata / assembly.c

diff --git a/mono/metadata/assembly.c b/mono/metadata/assembly.c
index a0703c9257b3bc7f2a7070eef1daec25784b42a9..459602bcfc58e34e1886401bf227c652f2c943bc 100644 (file)
--- a/mono/metadata/assembly.c
+++ b/mono/metadata/assembly.c
@@ -758,7 +758,7 @@ mono_assembly_fill_assembly_name (MonoImage *image, MonoAssemblyName *aname)
 {
        MonoTableInfo *t = &image->tables [MONO_TABLE_ASSEMBLY];
        guint32 cols [MONO_ASSEMBLY_SIZE];
-       gint32 machine;
+       gint32 machine, flags;
 
        if (!t->rows)
                return FALSE;
@@ -804,9 +804,16 @@ mono_assembly_fill_assembly_name (MonoImage *image, MonoAssemblyName *aname)
                aname->public_key = 0;
 
        machine = ((MonoCLIImageInfo*)(image->image_info))->cli_header.coff.coff_machine;
+       flags = ((MonoCLIImageInfo*)(image->image_info))->cli_cli_header.ch_flags;
        switch (machine) {
        case COFF_MACHINE_I386:
-               aname->arch = MONO_PROCESSOR_ARCHITECTURE_X86;
+               /* https://bugzilla.xamarin.com/show_bug.cgi?id=17632 */
+               if (flags & (CLI_FLAGS_32BITREQUIRED|CLI_FLAGS_PREFERRED32BIT))
+                       aname->arch = MONO_PROCESSOR_ARCHITECTURE_X86;
+               else if ((flags & 0x70) == 0x70)
+                       aname->arch = MONO_PROCESSOR_ARCHITECTURE_NONE;
+               else
+                       aname->arch = MONO_PROCESSOR_ARCHITECTURE_MSIL;
                break;
        case COFF_MACHINE_IA64:
                aname->arch = MONO_PROCESSOR_ARCHITECTURE_IA64;
@@ -2109,9 +2116,7 @@ mono_assembly_name_parse_full (const char *name, MonoAssemblyName *aname, gboole
                }
 
                if (part_name_len == 21 && !g_ascii_strncasecmp (part_name, "ProcessorArchitecture", part_name_len)) {
-                       if (!g_ascii_strcasecmp (value, "None"))
-                               arch = MONO_PROCESSOR_ARCHITECTURE_NONE;
-                       else if (!g_ascii_strcasecmp (value, "MSIL"))
+                       if (!g_ascii_strcasecmp (value, "MSIL"))
                                arch = MONO_PROCESSOR_ARCHITECTURE_MSIL;
                        else if (!g_ascii_strcasecmp (value, "X86"))
                                arch = MONO_PROCESSOR_ARCHITECTURE_X86;