summary refs log tree commit diff
path: root/compiler/rustc_codegen_ssa/src
diff options
context:
space:
mode:
authorDylan DPC <99973273+Dylan-DPC@users.noreply.github.com>2022-06-19 15:26:29 +0200
committerGitHub <noreply@github.com>2022-06-19 15:26:29 +0200
commit88cb597e7ae3f6b7d8d7e17f3f49cdf30eb726b8 (patch)
treef2cde5f0194d19a7c4ecae3ea8f0c203ff2f08b5 /compiler/rustc_codegen_ssa/src
parent6e8f541fffac4cbd0b342b2b106b6547b99781aa (diff)
parent3fb6d45af9c9e8a682da743f6d920bb5b6dd66de (diff)
downloadrust-88cb597e7ae3f6b7d8d7e17f3f49cdf30eb726b8.tar.gz
rust-88cb597e7ae3f6b7d8d7e17f3f49cdf30eb726b8.zip
Rollup merge of #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``
Diffstat (limited to 'compiler/rustc_codegen_ssa/src')
-rw-r--r--compiler/rustc_codegen_ssa/src/back/linker.rs2
1 files changed, 0 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_ssa/src/back/linker.rs b/compiler/rustc_codegen_ssa/src/back/linker.rs
index ee097b5f051..8ac5f094cf6 100644
--- a/compiler/rustc_codegen_ssa/src/back/linker.rs
+++ b/compiler/rustc_codegen_ssa/src/back/linker.rs
@@ -1120,8 +1120,6 @@ impl<'a> Linker for EmLinker<'a> {
             OptLevel::Size => "-Os",
             OptLevel::SizeMin => "-Oz",
         });
-        // Unusable until https://github.com/rust-lang/rust/issues/38454 is resolved
-        self.cmd.args(&["--memory-init-file", "0"]);
     }
 
     fn pgo_gen(&mut self) {