From 58444861c2c5ebce02d7477fb5a825150d4f98c9 Mon Sep 17 00:00:00 2001
From: Radek Doulik <radekdoulik@gmail.com>
Date: Mon, 14 Feb 2022 21:42:00 +0100
Subject: [PATCH] [wasm] Add memalign to exported functions (#65316)

* [wasm] Add memalign to exported functions

Fix https://github.com/dotnet/runtime/issues/64724 and https://github.com/dotnet/runtime/issues/64725

The tests were crashing because calling the memalign function, which was
not exported.

* Re-enable failing tests
---
 src/libraries/tests.proj | 4 ----
 src/mono/wasm/wasm.proj  | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj
index 149251dc370abc..68b379ef10c0c9 100644
--- a/src/libraries/tests.proj
+++ b/src/libraries/tests.proj
@@ -41,10 +41,6 @@
   <ItemGroup Condition="'$(TargetOS)' == 'Browser' and '$(BuildAOTTestsOnHelix)' == 'true' and '$(RunDisabledWasmTests)' != 'true' and '$(RunAOTCompilation)' == 'true' and '$(BrowserHost)' == 'Windows'">
     <!-- https://github.com/dotnet/runtime/issues/61756 -->
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\System.Text.RegularExpressions.Tests.csproj" />
-    <!-- https://github.com/dotnet/runtime/issues/64724 -->
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.HostFactoryResolver\tests\Microsoft.Extensions.HostFactoryResolver.Tests.csproj" />
-    <!-- https://github.com/dotnet/runtime/issues/64725 -->
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.Logging\tests\Common\Microsoft.Extensions.Logging.Tests.csproj" />
   </ItemGroup>
 
   <!-- Projects that don't support code coverage measurement. -->
diff --git a/src/mono/wasm/wasm.proj b/src/mono/wasm/wasm.proj
index 32326f087ad20f..b3dd1ac43a5eb7 100644
--- a/src/mono/wasm/wasm.proj
+++ b/src/mono/wasm/wasm.proj
@@ -72,7 +72,7 @@
       <_EmccLinkFlags Include="-s FORCE_FILESYSTEM=1" />
       <_EmccLinkFlags Include="-s EXPORTED_RUNTIME_METHODS=&quot;['FS','print','ccall','cwrap','setValue','getValue','UTF8ToString','UTF8ArrayToString','FS_createPath','FS_createDataFile','removeRunDependency','addRunDependency']&quot;" />
       <!-- _htons,_ntohs,__get_daylight,__get_timezone,__get_tzname are exported temporarily, until the issue is fixed in emscripten, https://github.com/dotnet/runtime/issues/64724  -->
-      <_EmccLinkFlags Include="-s EXPORTED_FUNCTIONS=_free,_malloc,_htons,_ntohs,__get_daylight,__get_timezone,__get_tzname" />
+      <_EmccLinkFlags Include="-s EXPORTED_FUNCTIONS=_free,_malloc,_htons,_ntohs,__get_daylight,__get_timezone,__get_tzname,_memalign" />
       <_EmccLinkFlags Include="--source-map-base http://example.com" />
       <_EmccLinkFlags Include="-s STRICT_JS=1" />
       <_EmccLinkFlags Include="-s EXPORT_NAME=&quot;'createDotnetRuntime'&quot;" />