From e898a13edaead9711b302c2cf75be0d93c5fe5a4 Mon Sep 17 00:00:00 2001
From: Radek Doulik <radek.doulik@gmail.com>
Date: Mon, 14 Oct 2024 15:48:26 +0200
Subject: [PATCH 1/4] [wasm] Do not use link flags for bitcode compilation

Backport of (#101397)

This avoids errors like:

    /root/helix/work/correlation/build/wasm-shared/WasmApp.Common.targets(832,5): error : emcc: warning: linker setting ignored during compilation: 'EXPORT_ES6' [-Wunused-command-line-argument] [/root/helix/work/workitem/e/publish/ProxyProjectForAOTOnHelix.proj]
    /root/helix/work/correlation/build/wasm-shared/WasmApp.Common.targets(832,5): error : emcc: warning: linker setting ignored during compilation: 'EXPORT_EXCEPTION_HANDLING_HELPERS' [-Wunused-command-line-argument] [/root/helix/work/workitem/e/publish/ProxyProjectForAOTOnHelix.proj]

This should helps with known build error https://github.com/dotnet/runtime/issues/104827
where the warning can hide another errors
---
 src/mono/wasm/build/WasmApp.Native.targets | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/mono/wasm/build/WasmApp.Native.targets b/src/mono/wasm/build/WasmApp.Native.targets
index 7aa1203bd1155..8f8d6e09c07c0 100644
--- a/src/mono/wasm/build/WasmApp.Native.targets
+++ b/src/mono/wasm/build/WasmApp.Native.targets
@@ -398,10 +398,11 @@
 
   <Target Name="_WasmWriteRspForCompilingBitcode">
     <ItemGroup>
-      <_BitcodeLDFlags Include="@(_EmccLDFlags)" />
-      <_BitcodeLDFlags Include="$(EmccExtraBitcodeLDFlags)" />
+      <_BitcodeCompileFlags Include="$(EmccLinkOptimizationFlag)" />
+      <_BitcodeCompileFlags Include="@(_EmccCommonFlags)" />
+      <_BitcodeCompileFlags Include="$(EmccExtraBitcodeLDFlags)" />
     </ItemGroup>
-    <WriteLinesToFile Lines="@(_BitcodeLDFlags)" File="$(_EmccCompileBitcodeRsp)" Overwrite="true" WriteOnlyWhenDifferent="true" />
+    <WriteLinesToFile Lines="@(_BitcodeCompileFlags)" File="$(_EmccCompileBitcodeRsp)" Overwrite="true" WriteOnlyWhenDifferent="true" />
     <ItemGroup>
       <FileWrites Include="$(_EmccCompileBitcodeRsp)" />
     </ItemGroup>

From 626cf6c5ede5f04ce9b1ad4f77437edc2483b0fd Mon Sep 17 00:00:00 2001
From: Radek Doulik <radek.doulik@gmail.com>
Date: Tue, 15 Oct 2024 11:43:31 +0200
Subject: [PATCH 2/4] Backport of [wasm] Add optimization flags to bitcode
 compilation (#101538)

---
 src/mono/wasm/build/WasmApp.Native.targets | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/mono/wasm/build/WasmApp.Native.targets b/src/mono/wasm/build/WasmApp.Native.targets
index 8f8d6e09c07c0..cb7f41a6b4862 100644
--- a/src/mono/wasm/build/WasmApp.Native.targets
+++ b/src/mono/wasm/build/WasmApp.Native.targets
@@ -397,10 +397,14 @@
   </Target>
 
   <Target Name="_WasmWriteRspForCompilingBitcode">
+    <PropertyGroup>
+      <WasmBitcodeCompileOptimizationFlag Condition="'$(WasmBitcodeCompileOptimizationFlag)' == '' and '$(Configuration)' == 'Release'">-O2</WasmBitcodeCompileOptimizationFlag>
+      <WasmBitcodeCompileOptimizationFlag Condition="'$(WasmBitcodeCompileOptimizationFlag)' == '' ">$(WasmCompileOptimizationFlag)</WasmBitcodeCompileOptimizationFlag>    <ItemGroup>
+    </PropertyGroup>
     <ItemGroup>
-      <_BitcodeCompileFlags Include="$(EmccLinkOptimizationFlag)" />
+      <_BitcodeCompileFlags Include="$(WasmBitcodeCompileOptimizationFlag)" />
       <_BitcodeCompileFlags Include="@(_EmccCommonFlags)" />
-      <_BitcodeCompileFlags Include="$(EmccExtraBitcodeLDFlags)" />
+      <_BitcodeCompileFlags Include="$(EmccExtraBitcodeCompilationFlags)" />
     </ItemGroup>
     <WriteLinesToFile Lines="@(_BitcodeCompileFlags)" File="$(_EmccCompileBitcodeRsp)" Overwrite="true" WriteOnlyWhenDifferent="true" />
     <ItemGroup>

From 52bae1c2049936350d4878e4538e40c4c83af47e Mon Sep 17 00:00:00 2001
From: Radek Doulik <radek.doulik@gmail.com>
Date: Tue, 15 Oct 2024 14:30:09 +0200
Subject: [PATCH 3/4] Fix build

---
 src/mono/wasm/build/WasmApp.Native.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mono/wasm/build/WasmApp.Native.targets b/src/mono/wasm/build/WasmApp.Native.targets
index cb7f41a6b4862..0a9798029c087 100644
--- a/src/mono/wasm/build/WasmApp.Native.targets
+++ b/src/mono/wasm/build/WasmApp.Native.targets
@@ -399,7 +399,7 @@
   <Target Name="_WasmWriteRspForCompilingBitcode">
     <PropertyGroup>
       <WasmBitcodeCompileOptimizationFlag Condition="'$(WasmBitcodeCompileOptimizationFlag)' == '' and '$(Configuration)' == 'Release'">-O2</WasmBitcodeCompileOptimizationFlag>
-      <WasmBitcodeCompileOptimizationFlag Condition="'$(WasmBitcodeCompileOptimizationFlag)' == '' ">$(WasmCompileOptimizationFlag)</WasmBitcodeCompileOptimizationFlag>    <ItemGroup>
+      <WasmBitcodeCompileOptimizationFlag Condition="'$(WasmBitcodeCompileOptimizationFlag)' == '' ">$(WasmCompileOptimizationFlag)</WasmBitcodeCompileOptimizationFlag>
     </PropertyGroup>
     <ItemGroup>
       <_BitcodeCompileFlags Include="$(WasmBitcodeCompileOptimizationFlag)" />

From 884429476f2c835ee2c95b8a4f297e97016aa2c4 Mon Sep 17 00:00:00 2001
From: Radek Doulik <radek.doulik@gmail.com>
Date: Wed, 16 Oct 2024 11:01:16 +0200
Subject: [PATCH 4/4] Keep using EmccLinkOptimizationFlag to reduce the changes

---
 src/mono/wasm/build/WasmApp.Native.targets | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/mono/wasm/build/WasmApp.Native.targets b/src/mono/wasm/build/WasmApp.Native.targets
index 0a9798029c087..f59384725fbcf 100644
--- a/src/mono/wasm/build/WasmApp.Native.targets
+++ b/src/mono/wasm/build/WasmApp.Native.targets
@@ -397,12 +397,8 @@
   </Target>
 
   <Target Name="_WasmWriteRspForCompilingBitcode">
-    <PropertyGroup>
-      <WasmBitcodeCompileOptimizationFlag Condition="'$(WasmBitcodeCompileOptimizationFlag)' == '' and '$(Configuration)' == 'Release'">-O2</WasmBitcodeCompileOptimizationFlag>
-      <WasmBitcodeCompileOptimizationFlag Condition="'$(WasmBitcodeCompileOptimizationFlag)' == '' ">$(WasmCompileOptimizationFlag)</WasmBitcodeCompileOptimizationFlag>
-    </PropertyGroup>
     <ItemGroup>
-      <_BitcodeCompileFlags Include="$(WasmBitcodeCompileOptimizationFlag)" />
+      <_BitcodeCompileFlags Include="$(EmccLinkOptimizationFlag)" />
       <_BitcodeCompileFlags Include="@(_EmccCommonFlags)" />
       <_BitcodeCompileFlags Include="$(EmccExtraBitcodeCompilationFlags)" />
     </ItemGroup>