Skip to content

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

Merged
bors merged 2 commits into
rust-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 into
rust-lang:masterfrom
mati865:mingw-unwind-linking-cleanup

Conversation

@mati865

@mati865mati865 commented Apr 11, 2020•
edited
Loading

Copy link
Copy Markdown
Member

Fixes#71061

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 11, 2020
@mati865
mati865force-pushed the mingw-unwind-linking-cleanup branch from e7bea91 to bd2e4f1CompareApril 11, 2020 12:45
petrochenkov
petrochenkov reviewed Apr 11, 2020
View reviewed changes
Comment threadsrc/librustc_codegen_ssa/back/link.rs Outdated
@mati865
mati865force-pushed the mingw-unwind-linking-cleanup branch from bd2e4f1 to 7e68cf8CompareApril 11, 2020 19:38
@mati865mati865 changed the title [windows-gnu] Cleanup unwind linkage a bit and add testscase for self-contained executables[windows] Add testscase for self-contained executablesApr 11, 2020
@Amanieu

Amanieu commented Apr 11, 2020

Copy link
Copy Markdown
Member

@bors r+ rollup

@bors

bors commented Apr 11, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 7e68cf8 has been approved by Amanieu

@borsbors 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 ofrust-lang#71023- mati865:mingw-unwind-linking-cleanu…
73a962d
…p, r=Amanieu
[windows] Add testscase for self-contained executables
@Dylan-DPC-zzDylan-DPC-zz mentioned this pull request Apr 12, 2020
Closed
@Dylan-DPC-zz

Dylan-DPC-zz commented Apr 12, 2020

Copy link
Copy Markdown

failing in rollup

@bors r-

@borsbors 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 commented Apr 12, 2020•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

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.

@mati865mati865 mentioned this pull request Apr 12, 2020
Closed
@mati865

mati865 commented Apr 12, 2020

Copy link
Copy Markdown
MemberAuthor

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

@Dylan-DPC-zz

Dylan-DPC-zz commented Apr 12, 2020

Copy link
Copy Markdown

@bors r=Amanieu rollup=never p=1

@bors

bors commented Apr 12, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit a32e340 has been approved by Amanieu

@borsbors 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

mati865 commented Apr 12, 2020

Copy link
Copy Markdown
MemberAuthor

@bors r-
Last commit is not approved.

@borsbors 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
@mati865mati865 changed the title [windows] Add testscase for self-contained executables[windows] Add testscase for self-contained executables and fix pthread linkingApr 12, 2020
@Amanieu

Amanieu commented Apr 12, 2020

Copy link
Copy Markdown
Member

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

bors commented Apr 12, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit a32e340 has been approved by Amanieu

@borsbors 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

mati865 commented Apr 12, 2020

Copy link
Copy Markdown
MemberAuthor

@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

bors commented Apr 13, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit a32e340 with merge cc07228...

@bors

bors commented Apr 13, 2020

Copy link
Copy Markdown
Collaborator

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

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

Reviewers

@petrochenkovpetrochenkovpetrochenkov left review comments

Assignees

@AmanieuAmanieu

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: 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