Skip to content

Commit ebef4ab

Browse files
authored
Rollup merge of rust-lang#98146 - hoodmane:remove-memory-init-flag, r=petrochenkov
Remove --memory-init-file flag when linking with Emscripten This flag does nothing. It only applies when generating asmjs JavaScript. `@sbc100`
2 parents 9b28a62 + 3fb6d45 commit ebef4ab

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

compiler/rustc_codegen_ssa/src/back/linker.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1120,8 +1120,6 @@ impl<'a> Linker for EmLinker<'a> {
11201120
OptLevel::Size => "-Os",
11211121
OptLevel::SizeMin => "-Oz",
11221122
});
1123-
// Unusable until https://github.com/rust-lang/rust/issues/38454 is resolved
1124-
self.cmd.args(&["--memory-init-file", "0"]);
11251123
}
11261124

11271125
fn pgo_gen(&mut self) {

compiler/rustc_target/src/spec/asmjs_unknown_emscripten.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ use super::{wasm32_unknown_emscripten, LinkerFlavor, Target};
22

33
pub fn target() -> Target {
44
let mut target = wasm32_unknown_emscripten::target();
5-
target
6-
.post_link_args
7-
.entry(LinkerFlavor::Em)
8-
.or_default()
9-
.extend(vec!["-s".into(), "WASM=0".into()]);
5+
target.post_link_args.entry(LinkerFlavor::Em).or_default().extend(vec![
6+
"-sWASM=0".into(),
7+
"--memory-init-file".into(),
8+
"0".into(),
9+
]);
1010
target
1111
}

0 commit comments

Comments
 (0)