Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove --memory-init-file flag when linking with Emscripten #98146

Merged
merged 1 commit into from
Jun 19, 2022
Merged

Remove --memory-init-file flag when linking with Emscripten #98146

merged 1 commit into from
Jun 19, 2022

Conversation

hoodmane
Copy link
Contributor

This flag does nothing. It only applies when generating asmjs JavaScript.
@sbc100

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jun 15, 2022
@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 15, 2022
@hoodmane hoodmane changed the title Remove --memory-init-file flag when compiling with Emscripten Remove --memory-init-file flag when linking with Emscripten Jun 15, 2022
@petrochenkov
Copy link
Contributor

It only applies when generating asmjs JavaScript.

Does it apply to this target - https://github.com/rust-lang/rust/blob/master/compiler/rustc_target/src/spec/asmjs_unknown_emscripten.rs ?

@hoodmane
Copy link
Contributor Author

Yeah exactly. I have never used the asmjs target so I don't know whether it's a good idea in that case. Compiling for wasm, it is harmless it just does nothing.

@Mark-Simulacrum
Copy link
Member

It seems like we shouldn't do this, then, at least not on the grounds of it being useless for wasm, since presumably it is being used for the asm.js generation in some way.

@hoodmane
Copy link
Contributor Author

How about let's move it to the asmjs target. It's not clear why this belongs in the linker optimize method if it's a target specific setting.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@petrochenkov
Copy link
Contributor

r=me after squashing commits.
@rustbot author

@rustbot rustbot 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 Jun 18, 2022
@hoodmane hoodmane force-pushed the remove-memory-init-flag branch from 1aa15eb to 3fb6d45 Compare June 19, 2022 00:48
@petrochenkov
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jun 19, 2022

📌 Commit 3fb6d45 has been approved by petrochenkov

@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 Jun 19, 2022
@Dylan-DPC Dylan-DPC mentioned this pull request Jun 19, 2022
Closed
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Jun 19, 2022
@Dylan-DPC
Rollup merge of rust-lang#98146 - hoodmane:remove-memory-init-flag, r…
ebef4ab 
…=petrochenkov

Remove --memory-init-file flag when linking with Emscripten

This flag does nothing. It only applies when generating asmjs JavaScript.
`@sbc100`
@Dylan-DPC Dylan-DPC mentioned this pull request Jun 19, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 19, 2022
@bors
Auto merge of rust-lang#98255 - Dylan-DPC:rollup-hr129rg, r=Dylan-DPC
68d0b29 
Rollup of 5 pull requests

Successful merges:

 - rust-lang#98105 (rustdoc: remove tuple link on round braces)
 - rust-lang#98136 (Rename `impl_constness` to `constness`)
 - rust-lang#98146 (Remove --memory-init-file flag when linking with Emscripten)
 - rust-lang#98219 (Skip late bound regions in GATSubstCollector)
 - rust-lang#98233 (Remove accidental uses of `&A: Allocator`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 88cb597 into rust-lang:master Jun 19, 2022
@rustbot rustbot added this to the 1.63.0 milestone Jun 19, 2022
@hoodmane hoodmane deleted the remove-memory-init-flag branch June 20, 2022 18:07
@workingjubilee workingjubilee added the O-emscripten Target: 50% off wasm32-unknown-musl. the savings come out of stdio.h, but hey, you get SDL! label Oct 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sbc100 sbc100 sbc100 approved these changes

Assignees

@petrochenkov petrochenkov

Labels
O-emscripten Target: 50% off wasm32-unknown-musl. the savings come out of stdio.h, but hey, you get SDL! S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.63.0
Development

Successfully merging this pull request may close these issues.
9 participants
@hoodmane @rust-highfive @petrochenkov @Mark-Simulacrum @rust-log-analyzer @bors @sbc100 @workingjubilee @rustbot