From 1c7fa71a4aa9188a9434a88da2bb52c02de5692f Mon Sep 17 00:00:00 2001 From: Rodrigo Kumpera Date: Wed, 12 Oct 2016 08:50:19 -0700 Subject: [PATCH] [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. --- mono/metadata/icall-def.h | 2 +- mono/metadata/icall.c | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/mono/metadata/icall-def.h b/mono/metadata/icall-def.h index 2d48a0a8a0dc..724a8ef87504 100644 --- 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 index df28c606b3cc..310d0677cbdb 100644 --- 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);