Skip to content

Rebaseline llvm-libunwind tree - #72351

Merged
jkotas merged 3 commits into
dotnet:mainfrom
am11:feature/external/llvm-libunwind
Jul 18, 2022
Merged

Rebaseline llvm-libunwind tree#72351
jkotas merged 3 commits into
dotnet:mainfrom
am11:feature/external/llvm-libunwind

Conversation

@am11

@am11am11 commented Jul 18, 2022

Copy link
Copy Markdown
Member

The purpose of this PR is to extract all the changes we have on top of upstream/original copy: https://github.com/llvm/llvm-project/tree/llvmorg-9.0.0/libunwind in a separate commit. This will make it possible bring llvm-libunwind to the same plan as other external dependencies trees under src/native/external directory in a followup PR.

Please merge it without squashing the commits, otherwise it will defeat its purpose.

I have listed all those commits in description of third commit.

Contributes to #72344

@ghostghost added community-contribution Indicates that the PR has been added by a community member area-NativeAOT-coreclr labels Jul 18, 2022
@am11
am11 marked this pull request as ready for review July 18, 2022 03:43

@MichalStrehovskyMichalStrehovsky left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thank you!

@jkotas

Copy link
Copy Markdown
Member

cc @VSadov

@am11 Should this be merged as rebase and merge ?

@am11

am11 commented Jul 18, 2022

Copy link
Copy Markdown
MemberAuthor

@am11 Should this be merged as rebase and merge ?

Yes please. We just need a reference to the third commit from main branch, for bookkeeping additional modifications in version file. In next PR, I'll move this directory under src\native\external and add the version file.

@VSadov

Copy link
Copy Markdown
Member

@am11 - very nice! Thanks!

BTW, #71187 has some libunwind fixes, but I think the llvm-libunwind already has similar fixes, so it may not have any impact here.

@VSadov

Copy link
Copy Markdown
Member

rebase and merge is "Not enabled for this branch". I assume someone has the necessary permissions?

@am11
am11force-pushed the feature/external/llvm-libunwind branch from 4c0ce47 to 6034e73CompareJuly 18, 2022 10:05
am11and others added 2 commits July 18, 2022 13:06
Extracted changes from:
* dotnet/corert@a48e1a6
* dotnet/corert@c6571c6
* dotnet/corert@e6ff543
* dotnet/corert@4009f5a
* dotnet/corert@94f2d8e
* dotnet/corert@753c19b
* dotnet/corert@3d25db5
* dotnet/corert@3d25db5
* dotnet/corert@1bd9c3c
* dotnet/corert@b65389a
* dotnet/corert@d56451e
* dotnet/corert@b059615
* dotnet/corert@b059615
* dotnet/corert@8157d14
* dotnet/corert@fd57cf1
* dotnet/corert@f528e70
* dotnet/corert@ccda70a
* dotnet/corert@180a175
* dotnet/corert@f252660
* dotnet/corert@f252660
* dotnet/corert@68d8ec9
* dotnet/corert@c01d95a
* dotnet/corert@7f8470d
* dotnet/corert@2dfab60
* dotnet/runtimelab@a89d3cb
* dotnet/runtimelab@07bf6d3
* dotnet/runtimelab@ad25495
* dotnet/runtimelab@11e915e
* dotnet/runtimelab@666e35a
* dotnet/runtimelab@9a766d3
* dotnet@3ea30ed
Co-authored-by: RalfKornmannEnvision <ralf.kornmann@envision-entertainment.de>
Co-authored-by: FabianNitsche <ifab@freenet.de>
Co-authored-by: Jan Kotas <jkotas@microsoft.com>
Co-authored-by: Jan Vorlicek <janvorli@microsoft.com>
Co-authored-by: Sergey Ignatov <sergign60@mail.ru>
Co-authored-by: Morgan Brown <morganbr@users.noreply.github.com>
Co-authored-by: John Doe <github.john.doe@outlook.com>
Co-authored-by: Ivan Arishchenko <36693675+iarischenko@users.noreply.github.com>
Co-authored-by: Andrii Kurdiumov <kant2002@gmail.com>
@am11
am11force-pushed the feature/external/llvm-libunwind branch from 6034e73 to ce81fcbCompareJuly 18, 2022 10:06
@jkotas
jkotas merged commit 3719058 into dotnet:mainJul 18, 2022
@ghostghost locked as resolved and limited conversation to collaborators Aug 17, 2022
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area-NativeAOT-coreclrcommunity-contributionIndicates that the PR has been added by a community member

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@am11@jkotas@VSadov@MichalStrehovsky