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

[ATfE] Cherry-pick libcxx change in wchar inclusion guarding into 20.x #153

Merged

Conversation

pratlucas
Copy link
Contributor

@pratlucas pratlucas commented Mar 3, 2025

This change is required for the newlib-nano library overlay
implementation to work correctly, as it provides the definition
mbstate_t despite not providing wide-character support.

This change is required for the newlib-nano library overlay
implementation to work correctly, as it provides the definition of
`mbstate_t` despite not providing wide-character support.
@pratlucas pratlucas changed the base branch from arm-software to release/arm-software/20.x March 3, 2025 16:31
@pratlucas pratlucas changed the title libcxx cherry pick [ATfE] Cherry-pick libcxx change in wchar inclusion guarding into 20.x Mar 3, 2025
voltur01
voltur01 previously approved these changes Mar 3, 2025
Copy link
Contributor

@statham-arm statham-arm left a comment

Choose a reason for hiding this comment

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

Since this is a cherry-pick of an upstream commit on main, it's probably a good idea to mention the original commit id somewhere.

The original commit hash on main is 7620011. But that doesn't match the value in the header line of the new patch file, presumably because it was cherry-picked before running git format-patch. Perhaps if you redid it with cherry-pick -x it would include a footer citing the original id?

@pratlucas
Copy link
Contributor Author

Good catch @statham-arm , I've updated the patch file using cherry-pick -x.

@pratlucas pratlucas merged commit 349fafb into arm:release/arm-software/20.x Mar 3, 2025
@pratlucas pratlucas deleted the libcxx-cherry-pick branch March 3, 2025 17:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants