Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add arm64 wasm support #83677

Merged

Conversation

eukarpov
Copy link
Contributor

No description provided.

@ghost ghost added the community-contribution Indicates that the PR has been added by a community member label Mar 20, 2023
@@ -856,7 +856,7 @@

<PropertyGroup>
<_MonoSkipInitCompiler Condition="'$(RealTargetArchitecture)' != '' and '$(RealTargetArchitecture)' != '$(BuildArchitecture)'">false</_MonoSkipInitCompiler>
<_MonoAotCrossOffsetsCommand Condition="'$(MonoUseCrossTool)' == 'true'">$(PythonCmd) $(MonoProjectRoot)mono/tools/offsets-tool/offsets-tool.py @(MonoAotCrossOffsetsToolParams, ' ')</_MonoAotCrossOffsetsCommand>
<_MonoAotCrossOffsetsCommand Condition="'$(MonoUseCrossTool)' == 'true'">python $(MonoProjectRoot)mono/tools/offsets-tool/offsets-tool.py @(MonoAotCrossOffsetsToolParams, ' ')</_MonoAotCrossOffsetsCommand>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should still use $(PythonCmd), so that it works on other platforms.

You can change it conditionally to python on win/arm64.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vargaz
Copy link
Contributor

vargaz commented Mar 20, 2023

The mono changes look ok.

@steveisok
Copy link
Member

@eukarpov when you have a moment, can you please make the suggested change? @radekdoulik @vargaz if the changes look ok minus the suggested item to review, can you please approve?

@@ -293,7 +293,6 @@
<_EmccLinkFlags Include="-s EXPORTED_RUNTIME_METHODS=$(_EmccExportedRuntimeMethods)" />
<_EmccLinkFlags Include="-s EXPORTED_FUNCTIONS=$(_EmccExportedFunctions)" />
<_EmccLinkFlags Include="--source-map-base http://example.com" />
<_EmccLinkFlags Include="-s STRICT_JS=1" />
<_EmccLinkFlags Include="-s WASM_BIGINT=1" />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this needed/related ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it is a fix to resolve issue related to regression in the latest emscripten

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that latest emscripten doesn't allow it together with EXPORT_ES6=1 which is fine because that is always strict. I think @radekdoulik mentioned that last week.

@eukarpov
Copy link
Contributor Author

eukarpov commented Apr 25, 2023

@eukarpov when you have a moment, can you please make the suggested change? @radekdoulik @vargaz if the changes look ok minus the suggested item to review, can you please approve?

@steveisok
requested change has been done and tested

@steveisok
Copy link
Member

@radekdoulik @vargaz can one of you please approve if this is ready?

@steveisok steveisok merged commit 86c71e4 into dotnet:main Apr 27, 2023
@ghost ghost locked as resolved and limited conversation to collaborators May 27, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
area-Build-mono community-contribution Indicates that the PR has been added by a community member
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants