Skip to content

Actually set IMAGE_SCN_LNK_REMOVE for .rmeta - #92107

Merged
bors merged 1 commit into
rust-lang:masterfrom
nikic:rmeta-lnk-remove
Jan 4, 2022
Merged

Actually set IMAGE_SCN_LNK_REMOVE for .rmeta#92107
bors merged 1 commit into
rust-lang:masterfrom
nikic:rmeta-lnk-remove

Conversation

@nikic

Copy link
Copy Markdown
Contributor

The code intended to set the IMAGE_SCN_LNK_REMOVE flag for the
.rmeta section, however the value of this flag was set to zero.
Instead use the actual value provided by the object crate.

This dates back to the original introduction of this code in
PR #84449, so we were never setting this flag. As I'm not on
Windows, I'm not sure whether that means we were embedding .rmeta
into executables, or whether the section ended up getting stripped
for some other reason.

The code intended to set the IMAGE_SCN_LNK_REMOVE flag for the
.rmeta section, however the value of this flag was set to zero.
Instead use the actual value provided by the object crate.
This dates back to the original introduction of this code in
PR rust-lang#84449, so we were never setting this flag. As I'm not on
Windows, I'm not sure whether that means we were embedding .rmeta
into executables, or whether the section ended up getting stripped
for some other reason.
@rustbotrustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Dec 19, 2021
@rust-highfive

Copy link
Copy Markdown
Contributor

r? @matthewjasper

(rust-highfive has picked a reviewer for you, use r? to override)

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

nikic commented Jan 3, 2022

Copy link
Copy Markdown
ContributorAuthor

r? @nagisa

@nagisa

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Jan 3, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 6eb5072 has been approved by nagisa

@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 Jan 3, 2022
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 3, 2022
Actually set IMAGE_SCN_LNK_REMOVE for .rmeta
The code intended to set the IMAGE_SCN_LNK_REMOVE flag for the
.rmeta section, however the value of this flag was set to zero.
Instead use the actual value provided by the object crate.
This dates back to the original introduction of this code in
PR rust-lang#84449, so we were never setting this flag. As I'm not on
Windows, I'm not sure whether that means we were embedding .rmeta
into executables, or whether the section ended up getting stripped
for some other reason.
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 4, 2022
…askrgr
Rollup of 7 pull requests
Successful merges:
- rust-lang#91754 (Modifications to `std::io::Stdin` on Windows so that there is no longer a 4-byte buffer minimum in read().)
- rust-lang#91884 (Constify `Box<T, A>` methods)
- rust-lang#92107 (Actually set IMAGE_SCN_LNK_REMOVE for .rmeta)
- rust-lang#92456 (Make the documentation of builtin macro attributes accessible)
- rust-lang#92507 (Suggest single quotes when char expected, str provided)
- rust-lang#92525 (intra-doc: Make `Receiver::into_iter` into a clickable link)
- rust-lang#92532 (revert rust-lang#92254 "Bump gsgdt to 0.1.3")
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 855f630 into rust-lang:masterJan 4, 2022
@rustbotrustbot added this to the 1.59.0 milestone Jan 4, 2022
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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

Development

Successfully merging this pull request may close these issues.

6 participants

@nikic@rust-highfive@nagisa@bors@matthewjasper@rustbot