diff options
| author | bors <bors@rust-lang.org> | 2021-10-09 10:00:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-10-09 10:00:54 +0000 |
| commit | bb918d0a5bf22211df0423f7474e4e4056978007 (patch) | |
| tree | e04106a063fb7c42b2a898f95024ff6ce29fe4ac /compiler/rustc_codegen_ssa/src | |
| parent | 910692de742e9c0b1a57b7c5e467b8b85d903269 (diff) | |
| parent | 2e5a5e22b215b9dc59386315f5562c0517cec064 (diff) | |
| download | rust-bb918d0a5bf22211df0423f7474e4e4056978007.tar.gz rust-bb918d0a5bf22211df0423f7474e4e4056978007.zip | |
Auto merge of #89698 - matthiaskrgr:rollup-gna54x6, r=matthiaskrgr
Rollup of 10 pull requests Successful merges: - #88707 (String.split_terminator: Add an example when using a slice of chars) - #89605 (Fix stabilization version for `bindings_after_at`) - #89634 (rustc_driver: Enable the `WARN` log level by default) - #89641 (make #[target_feature] work with `asm` register classes) - #89678 (Fix minor std::thread documentation typo) - #89684 (Fix asm docs typo) - #89687 (Move `read2_abbreviated` function into read2.rs) - #89693 (Add #[must_use] to stdin/stdout/stderr locks) - #89694 (Add #[must_use] to string/char transformation methods) - #89697 (Fix min LLVM version for bpf-types test) 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/link.rs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs index 3fdfb08f584..cf1c6058897 100644 --- a/compiler/rustc_codegen_ssa/src/back/link.rs +++ b/compiler/rustc_codegen_ssa/src/back/link.rs @@ -843,19 +843,18 @@ fn link_natively<'a, B: ArchiveBuilder<'a>>( let msg_bus = "clang: error: unable to execute command: Bus error: 10"; if out.contains(msg_segv) || out.contains(msg_bus) { warn!( + ?cmd, %out, "looks like the linker segfaulted when we tried to call it, \ - automatically retrying again. cmd = {:?}, out = {}.", - cmd, out, + automatically retrying again", ); continue; } if is_illegal_instruction(&output.status) { warn!( + ?cmd, %out, status = %output.status, "looks like the linker hit an illegal instruction when we \ - tried to call it, automatically retrying again. cmd = {:?}, ]\ - out = {}, status = {}.", - cmd, out, output.status, + tried to call it, automatically retrying again.", ); continue; } |
