Skip to content

Commit bbf023d

Browse files
authored
[wasm] Rename WasmExceptionHandling to WasmEnableExceptionHandling (#75543)
1 parent b1a725d commit bbf023d

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

src/mono/wasm/build/WasmApp.Native.targets

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,8 @@
196196
<_EmccCommonFlags Include="-s EXPORT_ES6=1" />
197197
<_EmccCommonFlags Include="-g" Condition="'$(WasmNativeStrip)' == 'false'" />
198198
<_EmccCommonFlags Include="-v" Condition="'$(EmccVerbose)' != 'false'" />
199-
<_EmccCommonFlags Include="-s DISABLE_EXCEPTION_CATCHING=0" Condition="'$(WasmExceptionHandling)' == 'false'" />
200-
<_EmccCommonFlags Include="-fwasm-exceptions" Condition="'$(WasmExceptionHandling)' == 'true'" />
199+
<_EmccCommonFlags Include="-s DISABLE_EXCEPTION_CATCHING=0" Condition="'$(WasmEnableExceptionHandling)' == 'false'" />
200+
<_EmccCommonFlags Include="-fwasm-exceptions" Condition="'$(WasmEnableExceptionHandling)' == 'true'" />
201201
<_EmccCommonFlags Include="-msimd128" Condition="'$(WasmEnableSIMD)' == 'true'" />
202202

203203
<_EmccIncludePaths Include="$(_WasmIntermediateOutputPath.TrimEnd('\/'))" />
@@ -370,10 +370,10 @@
370370

371371
<Target Name="_WasmWriteRspFilesForLinking">
372372
<PropertyGroup>
373-
<_WasmEHLib Condition="'$(WasmExceptionHandling)' == 'true'">libmono-wasm-eh-wasm.a</_WasmEHLib>
374-
<_WasmEHLib Condition="'$(WasmExceptionHandling)' != 'true'">libmono-wasm-eh-js.a</_WasmEHLib>
375-
<_WasmEHLibToExclude Condition="'$(WasmExceptionHandling)' == 'true'">libmono-wasm-eh-js.a</_WasmEHLibToExclude>
376-
<_WasmEHLibToExclude Condition="'$(WasmExceptionHandling)' != 'true'">libmono-wasm-eh-wasm.a</_WasmEHLibToExclude>
373+
<_WasmEHLib Condition="'$(WasmEnableExceptionHandling)' == 'true'">libmono-wasm-eh-wasm.a</_WasmEHLib>
374+
<_WasmEHLib Condition="'$(WasmEnableExceptionHandling)' != 'true'">libmono-wasm-eh-js.a</_WasmEHLib>
375+
<_WasmEHLibToExclude Condition="'$(WasmEnableExceptionHandling)' == 'true'">libmono-wasm-eh-js.a</_WasmEHLibToExclude>
376+
<_WasmEHLibToExclude Condition="'$(WasmEnableExceptionHandling)' != 'true'">libmono-wasm-eh-wasm.a</_WasmEHLibToExclude>
377377
</PropertyGroup>
378378
<ItemGroup>
379379
<!-- order matters -->
@@ -528,7 +528,7 @@
528528
<MonoAOTCompilerDefaultAotArguments Include="direct-icalls" />
529529
<MonoAOTCompilerDefaultAotArguments Include="deterministic" />
530530
<MonoAOTCompilerDefaultAotArguments Include="mattr=simd" Condition="'$(WasmEnableSIMD)' == 'true'" />
531-
<MonoAOTCompilerDefaultProcessArguments Include="--wasm-exceptions" Condition="'$(WasmExceptionHandling)' == 'true'" />
531+
<MonoAOTCompilerDefaultProcessArguments Include="--wasm-exceptions" Condition="'$(WasmEnableExceptionHandling)' == 'true'" />
532532
<MonoAOTCompilerDefaultProcessArguments Include="--wasm-gc-safepoints" Condition="'$(WasmEnableThreads)' == 'true' or '$(WasmEnablePerfTracing)' == 'true'" />
533533
<AotProfilePath Include="$(WasmAotProfilePath)"/>
534534
</ItemGroup>

src/mono/wasm/build/WasmApp.targets

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@
6565
- $(RunAOTCompilationAfterBuild) - Run AOT compilation even after Build. By default, it is run only for publish.
6666
Defaults to false.
6767
- $(WasmAotProfilePath) - Path to an AOT profile file.
68-
- $(WasmExceptionHandling) - Enable support for the WASM Exception Handling feature.
69-
- $(WasmEnableSIMD) - Enable support for the WASM SIMD feature.
68+
- $(WasmEnableExceptionHandling) - Enable support for the WASM Exception Handling feature.
69+
- $(WasmEnableSIMD) - Enable support for the WASM SIMD feature.
7070
7171
Public items:
7272
- @(WasmExtraFilesToDeploy) - Files to copy to $(WasmAppDir).
@@ -86,7 +86,7 @@
8686

8787
<PropertyGroup>
8888
<WasmDedup Condition="'$(WasmDedup)' == ''">false</WasmDedup>
89-
<WasmExceptionHandling Condition="'$(WasmExceptionHandling)' == ''">false</WasmExceptionHandling>
89+
<WasmEnableExceptionHandling Condition="'$(WasmEnableExceptionHandling)' == ''">false</WasmEnableExceptionHandling>
9090
<WasmEnableSIMD Condition="'$(WasmEnableSIMD)' == ''">false</WasmEnableSIMD>
9191

9292
<!--<WasmStripAOTAssemblies Condition="'$(AOTMode)' == 'LLVMOnlyInterp'">false</WasmStripAOTAssemblies>-->

0 commit comments

Comments
 (0)