diff options
| author | bors <bors@rust-lang.org> | 2020-05-05 02:51:41 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-05-05 02:51:41 +0000 |
| commit | 04689e22e946879f2f5e2c73849d2f4e1f2b4b32 (patch) | |
| tree | ff298794d1db2312cfc0fe0f29fbb9d2cb8c01f6 /src/librustc_codegen_llvm | |
| parent | 2454a68cfbb63aa7b8e09fe05114d5f98b2f9740 (diff) | |
| parent | 8b781b0ffdc751924520f5a705c4e60e7dd4ab36 (diff) | |
Auto merge of #71907 - Dylan-DPC:rollup-z8iaqlv, r=Dylan-DPC
Rollup of 10 pull requests Successful merges: - #71587 (Report cannot move errors in promoted MIR) - #71711 (Updates to some ignored tests) - #71845 (Add const examples) - #71878 (Add remove_current_as_list to LinkedList's CursorMut) - #71881 (Correctly handle UEFI targets as Windows-like when emitting sections for LLVM bitcode) - #71883 (add a missing "at" in a comment) - #71891 (¬∃x. ¬y => ∀x. y) - #71892 (Update btree_map::VacantEntry::insert docs to actually call insert) - #71902 (Suggest to add missing feature when using gated const features) - #71904 (fix typo in function name) Failed merges: r? @ghost
Diffstat (limited to 'src/librustc_codegen_llvm')
| -rw-r--r-- | src/librustc_codegen_llvm/back/write.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/librustc_codegen_llvm/back/write.rs b/src/librustc_codegen_llvm/back/write.rs index 6d175fda45f..394e2f332cb 100644 --- a/src/librustc_codegen_llvm/back/write.rs +++ b/src/librustc_codegen_llvm/back/write.rs @@ -853,7 +853,9 @@ unsafe fn embed_bitcode( || cgcx.opts.target_triple.triple().starts_with("asmjs") { // nothing to do here - } else if cgcx.opts.target_triple.triple().contains("windows") { + } else if cgcx.opts.target_triple.triple().contains("windows") + || cgcx.opts.target_triple.triple().contains("uefi") + { let asm = " .section .llvmbc,\"n\" .section .llvmcmd,\"n\" |