diff options
| author | bors <bors@rust-lang.org> | 2023-11-17 22:58:19 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-11-17 22:58:19 +0000 |
| commit | 82b804c74433a233914f604bb0ba385719605e5e (patch) | |
| tree | 716c6703b2d98395895c54e6fd710ea1940176af /compiler/rustc_codegen_llvm/src | |
| parent | 2831701757eb7b3105eda26a306c2f3a97e2664b (diff) | |
| parent | 8acb27c165ce6b0af2705e653d3506ce607a9c0b (diff) | |
| download | rust-82b804c74433a233914f604bb0ba385719605e5e.tar.gz rust-82b804c74433a233914f604bb0ba385719605e5e.zip | |
Auto merge of #118023 - matthiaskrgr:rollup-i9skwic, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #117338 (Remove asmjs) - #117549 (Use `copied` instead of manual `map`) - #117745 (Emit smir) - #117964 (When using existing fn as module, don't claim it doesn't exist) - #118006 (clarify `fn discriminant` guarantees: only free lifetimes may get erased) - #118016 (Add stable mir members to triagebot config) - #118022 (Miri subtree update) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/back/write.rs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/compiler/rustc_codegen_llvm/src/back/write.rs b/compiler/rustc_codegen_llvm/src/back/write.rs index 9d5204034de..8d335ff1718 100644 --- a/compiler/rustc_codegen_llvm/src/back/write.rs +++ b/compiler/rustc_codegen_llvm/src/back/write.rs @@ -990,11 +990,7 @@ unsafe fn embed_bitcode( // reason (see issue #90326 for historical background). let is_aix = target_is_aix(cgcx); let is_apple = target_is_apple(cgcx); - if is_apple - || is_aix - || cgcx.opts.target_triple.triple().starts_with("wasm") - || cgcx.opts.target_triple.triple().starts_with("asmjs") - { + if is_apple || is_aix || cgcx.opts.target_triple.triple().starts_with("wasm") { // We don't need custom section flags, create LLVM globals. let llconst = common::bytes_in_context(llcx, bitcode); let llglobal = llvm::LLVMAddGlobal( |