From e1d138717589c397ea7ecb2fd7015799b44e8bee Mon Sep 17 00:00:00 2001
From: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
Date: Mon, 15 Aug 2022 11:45:17 +0100
Subject: [PATCH] Use marshal-ilgen stub for compatibility with updated runtime

---
 src/Wasi.Sdk/build/Wasi.Sdk.targets | 1 +
 src/Wasi.Sdk/native/main.c          | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/src/Wasi.Sdk/build/Wasi.Sdk.targets b/src/Wasi.Sdk/build/Wasi.Sdk.targets
index 63bb3c1..76e6d0b 100644
--- a/src/Wasi.Sdk/build/Wasi.Sdk.targets
+++ b/src/Wasi.Sdk/build/Wasi.Sdk.targets
@@ -53,6 +53,7 @@
 		<WasiNativeFileReference Include="$(WasiRuntimePackRoot)native\libmono-wasi-driver.a" />
 		<WasiNativeFileReference Include="$(WasiRuntimePackRoot)native\libmonosgen-2.0.a" />
 		<WasiNativeFileReference Include="$(WasiRuntimePackRoot)native\libmono-component-hot_reload-stub-static.a" />
+		<WasiNativeFileReference Include="$(WasiRuntimePackRoot)native\libmono-component-marshal-ilgen-stub-static.a" />
 		<WasiNativeFileReference Include="$(WasiRuntimePackRoot)native\libmono-component-diagnostics_tracing-stub-static.a" />
 		<WasiNativeFileReference Condition="'$(WaitForDebugger)' == 'true'" Include="$(WasiRuntimePackRoot)native\libmono-component-debugger-static.a" />
 		<WasiNativeFileReference Condition="'$(WaitForDebugger)' != 'true'" Include="$(WasiRuntimePackRoot)native\libmono-component-debugger-stub-static.a" />
diff --git a/src/Wasi.Sdk/native/main.c b/src/Wasi.Sdk/native/main.c
index b4c01b9..aff3a44 100644
--- a/src/Wasi.Sdk/native/main.c
+++ b/src/Wasi.Sdk/native/main.c
@@ -9,6 +9,9 @@ const char* dotnet_wasi_getentrypointassemblyname();
 const char* dotnet_wasi_getbundledfile(const char* name, int* out_length);
 void dotnet_wasi_registerbundledassemblies();
 
+// TODO: This should actually go in driver.c in the runtime
+void mono_marshal_ilgen_init() {}
+
 #ifdef WASI_AFTER_RUNTIME_LOADED_DECLARATIONS
 // This is supplied from the MSBuild itemgroup @(WasiAfterRuntimeLoaded)
 WASI_AFTER_RUNTIME_LOADED_DECLARATIONS