diff options
| author | bors <bors@rust-lang.org> | 2022-06-19 14:51:28 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-06-19 14:51:28 +0000 |
| commit | 68d0b29098ed75f50dabc7d07b96c70caab5c182 (patch) | |
| tree | 4aab4e2b4b5778738a08618abb7670c0221ff637 /compiler/rustc_codegen_ssa/src | |
| parent | 67404f7200c13deec255ffe1146e1d2c9d0d3028 (diff) | |
| parent | 6a2a56da451a357141bc8c929045ec2aafa3421f (diff) | |
| download | rust-68d0b29098ed75f50dabc7d07b96c70caab5c182.tar.gz rust-68d0b29098ed75f50dabc7d07b96c70caab5c182.zip | |
Auto merge of #98255 - Dylan-DPC:rollup-hr129rg, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - #98105 (rustdoc: remove tuple link on round braces) - #98136 (Rename `impl_constness` to `constness`) - #98146 (Remove --memory-init-file flag when linking with Emscripten) - #98219 (Skip late bound regions in GATSubstCollector) - #98233 (Remove accidental uses of `&A: Allocator`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_ssa/src')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/back/linker.rs | 2 |
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) { |