Skip to content

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

@ghost ghost added the area-PAL-coreclr label Apr 15, 2023
@ghost ghost assigned VSadov Apr 15, 2023
@VSadov VSadov requested review from agocke and janvorli April 15, 2023 02:38
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 7.0.x

@VSadov
Copy link
Member Author

VSadov commented May 2, 2023

Curious - what is needed for check-service-labels / check-labels (pull_request) to pass? I assumed the failure will have some info, but it appears very generic - Error: Process completed with exit code 1.

Is it just something that will pass when this is servicing approved ?

@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 7.0.7 milestone May 2, 2023
@janvorli
Copy link
Member

janvorli commented May 2, 2023

@VSadov just a wild guess - maybe the missing milestone is causing that?

@VSadov
Copy link
Member Author

VSadov commented May 3, 2023

Thanks!

@VSadov VSadov merged commit 693a3c6 into dotnet:release/7.0-staging May 3, 2023
@VSadov VSadov deleted the 7.0-staging_osxBuild branch May 3, 2023 00:02
@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