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

[release/6.0-staging] define UNW_AARCH64 aliases conditionally #84873

Merged
merged 1 commit into from
May 3, 2023

Conversation

VSadov
Copy link
Member

@VSadov VSadov commented Apr 15, 2023

backport of: #84591

Customer Impact

Fixes a build break with the new macOS SDK.


The libunwind.h that comes with the new MacOS SDK now has the enum for things like UNW_AARCH64_X19, so the workaround for not having those constants now causes build failures due to duplicate definition.

// MacOS uses ARM64 instead of AARCH64 to describe these registers

Without taking build dependency on the newest SDK, we need to apply the workaround conditionally.
Since this is an enum (not a define), we can't do simple #ifndef and need to do a configure test.

Testing

Risk

Copy link
Member

@janvorli janvorli left a comment

Choose a reason for hiding this comment

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

LGTM, thank you!

@VSadov VSadov added the Servicing-consider Issue for next servicing release review label Apr 27, 2023
Copy link
Member

@jeffschwMSFT jeffschwMSFT left a comment

Choose a reason for hiding this comment

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

approved. we will take for consideration in 6.0.x

@rbhanda rbhanda added Servicing-approved Approved for servicing release and removed Servicing-consider Issue for next servicing release review labels May 2, 2023
@rbhanda rbhanda added this to the 6.0.18 milestone May 2, 2023
@VSadov
Copy link
Member Author

VSadov commented May 3, 2023

Thanks!

@VSadov VSadov merged commit 832c3f2 into dotnet:release/6.0-staging May 3, 2023
@VSadov VSadov deleted the 6.0-staging_osxBuild branch May 3, 2023 00:03
@ghost ghost locked as resolved and limited conversation to collaborators Jun 2, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
area-PAL-coreclr Servicing-approved Approved for servicing release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants