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

mbedtls: Fix MSVC ARM build after 2.28.3 enabled AES-NI intrinsics #81405

Merged
merged 1 commit into from
Sep 7, 2023

Conversation

akien-mga
Copy link
Member

master counterpart to #81401.

We don't support UWP in 4.0+ anymore, but if we ever fix it this would be needed. More importantly, the Windows builds may be failing on ARM and ARM64 due to the same error (untested).

Upstream bug report: Mbed-TLS/mbedtls#8168

@akien-mga akien-mga added bug platform:windows topic:thirdparty cherrypick:4.0 cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release labels Sep 7, 2023
@akien-mga akien-mga added this to the 4.2 milestone Sep 7, 2023
@akien-mga akien-mga requested a review from a team as a code owner September 7, 2023 09:01
Copy link
Member

@aaronfranke aaronfranke left a comment

Choose a reason for hiding this comment

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

Haven't tested but makes sense and looks good.

thirdparty/mbedtls/include/mbedtls/aesni.h Show resolved Hide resolved
@bruvzg
Copy link
Member

bruvzg commented Sep 7, 2023

We don't support UWP in 4.0+ anymore, but if we ever fix it this would be needed.

This is likely required for non-UWP ARM Windows build as well.

@akien-mga akien-mga merged commit a16e178 into godotengine:master Sep 7, 2023
15 checks passed
@akien-mga akien-mga deleted the mbedtls-fix-msvc-arm branch September 7, 2023 12:08
@akien-mga
Copy link
Member Author

Cherry-picked for 4.1.2.

@akien-mga akien-mga removed the cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release label Sep 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants