Skip to content

[windows] Add testscase for self-contained executables and fix pthread linking#71023

Merged
bors merged 2 commits intorust-lang:masterfrom
mati865:mingw-unwind-linking-cleanup
Apr 13, 2020
Merged

[windows] Add testscase for self-contained executables and fix pthread linking#71023
bors merged 2 commits intorust-lang:masterfrom
mati865:mingw-unwind-linking-cleanup

Conversation

@mati865
Copy link
Member

@mati865 mati865 commented Apr 11, 2020 •
edited
Loading

Fixes #71061

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 11, 2020
@mati865 mati865 force-pushed the mingw-unwind-linking-cleanup branch from e7bea91 to bd2e4f1 Compare April 11, 2020 12:45
petrochenkov
petrochenkov reviewed Apr 11, 2020
View reviewed changes
@mati865 mati865 force-pushed the mingw-unwind-linking-cleanup branch from bd2e4f1 to 7e68cf8 Compare April 11, 2020 19:38
@mati865 mati865 changed the title [windows-gnu] Cleanup unwind linkage a bit and add testscase for self-contained executables [windows] Add testscase for self-contained executables Apr 11, 2020
@Amanieu
Copy link
Member

Amanieu commented Apr 11, 2020

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Apr 11, 2020

📌 Commit 7e68cf8 has been approved by Amanieu

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 11, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Apr 12, 2020
@Dylan-DPC
Rollup merge of rust-lang#71023 - mati865:mingw-unwind-linking-cleanu…
73a962d 
…p, r=Amanieu

[windows] Add testscase for self-contained executables
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Apr 12, 2020
Closed
@Dylan-DPC-zz
Copy link

Dylan-DPC-zz commented Apr 12, 2020

failing in rollup

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 12, 2020
@mati865
Copy link
Member Author

mati865 commented Apr 12, 2020 •
edited
Loading

We have nightly regression where i686-pc-windows-gnu creates executables depending on libwinpthread-1.dll. I'll open the issue and try to fix it soon.

@mati865 mati865 mentioned this pull request Apr 12, 2020
Closed
@mati865
Copy link
Member Author

mati865 commented Apr 12, 2020

This time tested on i686-pc-windows-gnu but not rolling up is probably good idea.

@Dylan-DPC-zz
Copy link

Dylan-DPC-zz commented Apr 12, 2020

@bors r=Amanieu rollup=never p=1

@bors
Copy link
Collaborator

bors commented Apr 12, 2020

📌 Commit a32e340 has been approved by Amanieu

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 12, 2020
@mati865
Copy link
Member Author

mati865 commented Apr 12, 2020

@bors r-
Last commit is not approved.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 12, 2020
@mati865 mati865 changed the title [windows] Add testscase for self-contained executables [windows] Add testscase for self-contained executables and fix pthread linking Apr 12, 2020
@Amanieu
Copy link
Member

Amanieu commented Apr 12, 2020

It looks fine. I seem to remember libgcc having a dependency on libpthread, but it seems that this is not the case.

@bors r+

@bors
Copy link
Collaborator

bors commented Apr 12, 2020

📌 Commit a32e340 has been approved by Amanieu

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 12, 2020
@mati865
Copy link
Member Author

mati865 commented Apr 12, 2020

@Amanieu it's convoluted...
IIRC libgcc_{eh,s} depend on winpthreads which in turn depend on libgcc.
I hope it can be replaced by compilert-rt + libunwind (no more winpthreads) one day.

@bors
Copy link
Collaborator

bors commented Apr 13, 2020

⌛ Testing commit a32e340 with merge cc07228...

@bors
Copy link
Collaborator

bors commented Apr 13, 2020

☀️ Test successful - checks-azure
Approved by: Amanieu
Pushing cc07228 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 13, 2020
@bors bors merged commit cc07228 into rust-lang:master Apr 13, 2020
This was referenced Apr 13, 2020
Merged
Closed
@mati865 mati865 deleted the mingw-unwind-linking-cleanup branch April 13, 2020 08:06
@LunarLambda LunarLambda mentioned this pull request Nov 30, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@petrochenkov petrochenkov petrochenkov left review comments

Assignees

@Amanieu Amanieu

Labels

merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

i686-pc-windows-gnu executables depend on additional DLL

6 participants

@mati865 @Amanieu @bors @Dylan-DPC-zz @petrochenkov @rust-highfive