From f67e77e54a1fd0be31654e28778d5774931dee01 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Fri, 26 Aug 2022 17:52:00 +0200 Subject: [PATCH] [tools] Don't call mono_marshal_ilgen_init in .NET. Ref: https://github.com/dotnet/runtime/issues/74628. --- tools/common/Target.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/common/Target.cs b/tools/common/Target.cs index 645e0dcbe650..b35d44a13290 100644 --- a/tools/common/Target.cs +++ b/tools/common/Target.cs @@ -744,7 +744,9 @@ void GenerateIOSMain (StringWriter sw, Abi abi) if (app.UseInterpreter) { sw.WriteLine ("extern \"C\" { void mono_ee_interp_init (const char *); }"); sw.WriteLine ("extern \"C\" { void mono_icall_table_init (void); }"); +#if !NET sw.WriteLine ("extern \"C\" { void mono_marshal_ilgen_init (void); }"); +#endif sw.WriteLine ("extern \"C\" { void mono_method_builder_ilgen_init (void); }"); sw.WriteLine ("extern \"C\" { void mono_sgen_mono_ilgen_init (void); }"); } @@ -769,7 +771,9 @@ void GenerateIOSMain (StringWriter sw, Abi abi) sw.WriteLine ("\tmono_jit_set_aot_mode (MONO_AOT_MODE_LLVMONLY);"); else if (app.UseInterpreter) { sw.WriteLine ("\tmono_icall_table_init ();"); +#if !NET sw.WriteLine ("\tmono_marshal_ilgen_init ();"); +#endif sw.WriteLine ("\tmono_method_builder_ilgen_init ();"); sw.WriteLine ("\tmono_sgen_mono_ilgen_init ();"); #if !NET