[icalls] Multiple fixes to get_bundled_machine_config.

Enviroment::get_bundled_machine_config icall should be ves_icall_System_Environment_get_bundled_machine_config. Mark all icalls doing get_bundled_machine_config as ICALL_EXPORT so maccore can link them in/out.
monojenkins · Oct 12, 2016 · 1c7fa71 · 1c7fa71
1 parent b57f33b
commit 1c7fa71
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/mono/metadata/icall-def.h b/mono/metadata/icall-def.h
@@ -521,7 +521,7 @@ ICALL(ENV_13, "get_Platform", ves_icall_System_Environment_get_Platform)
 ICALL(ENV_14, "get_ProcessorCount", mono_cpu_count)
 ICALL(ENV_15, "get_TickCount", ves_icall_System_Environment_get_TickCount)
 ICALL(ENV_16, "get_UserName", ves_icall_System_Environment_get_UserName)
-HANDLES(ICALL(ENV_16b, "get_bundled_machine_config", get_bundled_machine_config))
+HANDLES(ICALL(ENV_16b, "get_bundled_machine_config", ves_icall_System_Environment_get_bundled_machine_config))
 ICALL(ENV_16m, "internalBroadcastSettingChange", ves_icall_System_Environment_BroadcastSettingChange)
 HANDLES(ICALL(ENV_17, "internalGetEnvironmentVariable_native", ves_icall_System_Environment_GetEnvironmentVariable_native))
 HANDLES(ICALL(ENV_18, "internalGetGacPath", ves_icall_System_Environment_GetGacPath))

diff --git a/mono/metadata/icall.c b/mono/metadata/icall.c
@@ -7280,13 +7280,20 @@ get_bundled_machine_config (MonoError *error)
 	return mono_string_new_handle (mono_domain_get (), machine_config, error);
 }
 
-static MonoStringHandle
+ICALL_EXPORT MonoStringHandle
+ves_icall_System_Environment_get_bundled_machine_config (MonoError *error)
+{
+	return get_bundled_machine_config (error);
+}
+
+
+ICALL_EXPORT MonoStringHandle
 ves_icall_System_Configuration_DefaultConfig_get_bundled_machine_config (MonoError *error)
 {
 	return get_bundled_machine_config (error);
 }
 
-static MonoStringHandle
+ICALL_EXPORT MonoStringHandle
 ves_icall_System_Configuration_InternalConfigurationHost_get_bundled_machine_config (MonoError *error)
 {
 	return get_bundled_machine_config (error);