diff options
| author | bors <bors@rust-lang.org> | 2025-01-24 01:59:34 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-01-24 01:59:34 +0000 |
| commit | 1c9837df1dde9b234229709e89b3672bd3cf04a4 (patch) | |
| tree | 4d956f28c67a405de6f8cb0515e242d00f59fdb2 /compiler/rustc_codegen_llvm/src | |
| parent | 22a220a1a8280a262a277fc24661511f6c4dab51 (diff) | |
| parent | 7d2600698d2acc2b2497dab18433dd6fd5bdd2d6 (diff) | |
| download | rust-1c9837df1dde9b234229709e89b3672bd3cf04a4.tar.gz rust-1c9837df1dde9b234229709e89b3672bd3cf04a4.zip | |
Auto merge of #135947 - matthiaskrgr:rollup-k9jpfls, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #135073 (Implement `ByteStr` and `ByteString` types) - #135492 (Add missing check for async body when suggesting await on futures.) - #135766 (handle global trait bounds defining assoc types) - #135880 (Get rid of RunCompiler) - #135908 (rustc_codegen_llvm: remove outdated asm-to-obj codegen note) - #135911 (Allow `arena_cache` queries to return `Option<&'tcx T>`) - #135920 (simplify parse_format::Parser::ws by using next_if) 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 | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/compiler/rustc_codegen_llvm/src/back/write.rs b/compiler/rustc_codegen_llvm/src/back/write.rs index 509b24dd703..4706744f353 100644 --- a/compiler/rustc_codegen_llvm/src/back/write.rs +++ b/compiler/rustc_codegen_llvm/src/back/write.rs @@ -769,12 +769,9 @@ pub(crate) unsafe fn codegen( } } - // Two things to note: - // - If object files are just LLVM bitcode we write bitcode, copy it to - // the .o file, and delete the bitcode if it wasn't otherwise - // requested. - // - If we don't have the integrated assembler then we need to emit - // asm from LLVM and use `gcc` to create the object file. + // Note that if object files are just LLVM bitcode we write bitcode, + // copy it to the .o file, and delete the bitcode if it wasn't + // otherwise requested. let bc_out = cgcx.output_filenames.temp_path(OutputType::Bitcode, module_name); let bc_summary_out = |
