diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-11-17 23:04:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-17 23:04:21 +0100 |
| commit | ca3a02836e24dec24c63235851f6160d2f2351af (patch) | |
| tree | cf928c2fee17511c738010e8ea75b64a2ce4d46d /compiler/rustc_codegen_llvm/src | |
| parent | f6dcaee23f274dd18b391b2f0f70df6e98f1c3b2 (diff) | |
| parent | dbb250046d20da4eaa0320b3ecb52befce3dd419 (diff) | |
| download | rust-ca3a02836e24dec24c63235851f6160d2f2351af.tar.gz rust-ca3a02836e24dec24c63235851f6160d2f2351af.zip | |
Rollup merge of #117338 - workingjubilee:asmjs-meets-thanatos, r=b-naber
Remove asmjs Fulfills [MCP 668](https://github.com/rust-lang/compiler-team/issues/668). `asmjs-unknown-emscripten` does not work as-specified, and lacks essential upstream support for generating asm.js, so it should not exist at all.
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( |