Skip to content

Fix handling of +whole-archive native link modifier. - #88161

Merged
bors merged 3 commits into
rust-lang:masterfrom
michaelwoerister:fix-whole-archive-no-bundle
Sep 7, 2021
Merged

Fix handling of +whole-archive native link modifier.#88161
bors merged 3 commits into
rust-lang:masterfrom
michaelwoerister:fix-whole-archive-no-bundle

Conversation

@michaelwoerister

@michaelwoeristermichaelwoerister commented Aug 19, 2021•
edited
Loading

Copy link
Copy Markdown
Member

This PR fixes a bug in add_upstream_native_libraries that led to the +whole-archive modifier being ignored when linking in native libs.

Note that the PR does not address the situation when +whole-archive is combined with +bundle.
@wesleywiser's commit adds validation code that turns combining +whole-archive with +bundle into an error.

Fixes#88085.

r? @petrochenkov
cc @wesleywiser@gcoakes

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 19, 2021
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@michaelwoerister
michaelwoeristerforce-pushed the fix-whole-archive-no-bundle branch from 1da2ebd to 4f42015CompareAugust 19, 2021 15:39
wesleywiser
wesleywiser reviewed Aug 19, 2021
View reviewed changes
Comment threadsrc/test/run-make/native-link-modifier-whole-archive/c_static_lib_with_constructor.c Outdated
@michaelwoerister
michaelwoeristerforce-pushed the fix-whole-archive-no-bundle branch from 4f42015 to 7b57e22CompareAugust 20, 2021 12:37
petrochenkov
petrochenkov reviewed Aug 20, 2021
View reviewed changes
Comment threadcompiler/rustc_codegen_ssa/src/back/link.rs Outdated
Comment threadsrc/test/run-make/native-link-modifier-whole-archive/Makefile Outdated
Comment threadcompiler/rustc_codegen_ssa/src/back/link.rs Outdated
@petrochenkovpetrochenkov 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-review Status: Awaiting review from the assignee but also interested parties. labels Aug 20, 2021
@michaelwoerister
michaelwoeristerforce-pushed the fix-whole-archive-no-bundle branch from 7b57e22 to fc53fffCompareAugust 20, 2021 14:14
@petrochenkovpetrochenkov added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 20, 2021
petrochenkov
petrochenkov reviewed Aug 21, 2021
View reviewed changes
Comment threadcompiler/rustc_session/src/config.rs Outdated
@petrochenkovpetrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Aug 21, 2021
@wesleywiser
wesleywiserforce-pushed the fix-whole-archive-no-bundle branch from 34f7f7c to e024481CompareAugust 23, 2021 00:41
@michaelwoerister

michaelwoerister commented Aug 23, 2021

Copy link
Copy Markdown
MemberAuthor

I think this is ready for review now.

@michaelwoeristermichaelwoerister added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 23, 2021
@inquisitivecrystalinquisitivecrystal added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Aug 24, 2021
petrochenkov
petrochenkov reviewed Aug 26, 2021
View reviewed changes
Comment threadcompiler/rustc_session/src/config.rs Outdated
@petrochenkovpetrochenkov 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-review Status: Awaiting review from the assignee but also interested parties. labels Aug 26, 2021
@wesleywiser
wesleywiserforce-pushed the fix-whole-archive-no-bundle branch from e024481 to 2899c45CompareAugust 26, 2021 23:30
@wesleywiserwesleywiser added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 26, 2021
@petrochenkov

petrochenkov commented Aug 27, 2021

Copy link
Copy Markdown
Contributor

Thanks!
@bors r+

@bors

bors commented Aug 27, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit 2899c45 has been approved by petrochenkov

@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 Aug 27, 2021
@michaelwoerister
michaelwoeristerforce-pushed the fix-whole-archive-no-bundle branch from 2899c45 to 07241e6CompareAugust 30, 2021 09:57
@michaelwoerister

michaelwoerister commented Aug 30, 2021

Copy link
Copy Markdown
MemberAuthor

@petrochenkov, the merge conflict is resolved now.

@michaelwoeristermichaelwoerister added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 30, 2021
@petrochenkov

petrochenkov commented Aug 30, 2021

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Aug 30, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit 07241e6 has been approved by petrochenkov

@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 Aug 30, 2021
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Sep 1, 2021
@GuillaumeGomez
Rollup merge ofrust-lang#88161- michaelwoerister:fix-whole-archive-…
6ed7428
…no-bundle, r=petrochenkov
Fix handling of +whole-archive native link modifier.
This PR fixes a bug in `add_upstream_native_libraries` that led to the `+whole-archive` modifier being ignored when linking in native libs.
~~Note that the PR does not address the situation when `+whole-archive` is combined with `+bundle`.~~
`@wesleywiser's` commit adds validation code that turns combining `+whole-archive` with `+bundle` into an error.
Fixesrust-lang#88085.
r? `@petrochenkov`
cc `@wesleywiser` `@gcoakes`
@GuillaumeGomezGuillaumeGomez mentioned this pull request Sep 1, 2021
Closed
@GuillaumeGomez

GuillaumeGomez commented Sep 2, 2021

Copy link
Copy Markdown
Member

It failed CI in #88570.

@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 Sep 2, 2021
@michaelwoerister
michaelwoeristerforce-pushed the fix-whole-archive-no-bundle branch from 07241e6 to 70c7317CompareSeptember 7, 2021 12:14
@michaelwoerister

michaelwoerister commented Sep 7, 2021

Copy link
Copy Markdown
MemberAuthor

I added ignore-cross-compile to the test case. Let's see if that is enough to disable the platforms that have trouble compiling C++ code.

@michaelwoerister

michaelwoerister commented Sep 7, 2021

Copy link
Copy Markdown
MemberAuthor

@bors r=petrochenkov rollup=never

@bors

bors commented Sep 7, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit 70c7317 has been approved by petrochenkov

@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 Sep 7, 2021
@bors

bors commented Sep 7, 2021

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 70c7317 with merge 73641cd...

@bors

bors commented Sep 7, 2021

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: petrochenkov
Pushing 73641cd to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Sep 7, 2021
@bors
bors merged commit 73641cd into rust-lang:masterSep 7, 2021
@rustbotrustbot added this to the 1.57.0 milestone Sep 7, 2021
@rust-timer

rust-timer commented Sep 7, 2021

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (73641cd): comparison url.

Summary: This benchmark run did not return any relevant changes.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

@petrochenkovpetrochenkov mentioned this pull request Jul 18, 2022
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@wesleywiserwesleywiserwesleywiser left review comments
@petrochenkovpetrochenkovpetrochenkov left review comments

Assignees

@petrochenkovpetrochenkov

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.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.57.0

Development

Successfully merging this pull request may close these issues.

Whole archive modifier for native libraries is not propagated to final output.

10 participants

@michaelwoerister@rust-log-analyzer@petrochenkov@bors@GuillaumeGomez@rust-timer@wesleywiser@rust-highfive@inquisitivecrystal@rustbot