-
Notifications
You must be signed in to change notification settings - Fork 4.7k
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
disable new EH on win-arm64 #102052
disable new EH on win-arm64 #102052
Conversation
Tagging subscribers to this area: @mangod9 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, thanks!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is needed for both X64 and Arm64, correct?
/backport to release/8.0-staging (Sorry wrong backport) |
Started backporting to release/8.0-staging: https://github.com/dotnet/runtime/actions/runs/9023891273 |
@mangod9 backporting to release/8.0-staging failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: disable new EH on win-arm64
.git/rebase-apply/patch:13: trailing whitespace.
#if defined(HOST_WINDOWS) && defined(TARGET_ARM64)
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M src/coreclr/inc/clrconfigvalues.h
Falling back to patching base and 3-way merge...
Auto-merging src/coreclr/inc/clrconfigvalues.h
CONFLICT (content): Merge conflict in src/coreclr/inc/clrconfigvalues.h
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 disable new EH on win-arm64
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128 Please backport manually! |
@mangod9 an error occurred while backporting to release/8.0-staging, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
/backport to release/9.0-preview4 |
Started backporting to release/9.0-preview4: https://github.com/dotnet/runtime/actions/runs/9023912075 |
Workaround to fix an SDK issue on windows arm64. This will disable new Exception Handling for this platform while we investigate the issue.