diff options
| author | bors <bors@rust-lang.org> | 2021-03-12 00:23:05 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-03-12 00:23:05 +0000 |
| commit | 77b996e1c628e8089f058244b011a2ee945a8984 (patch) | |
| tree | 3c87ee142e0bfe550b0cb2e14ffa09f6d8c7f17f /compiler/rustc_codegen_ssa/src | |
| parent | 03e864fd86b8e346a2ea75235ce2b924ab453fa1 (diff) | |
| parent | 14846d945d78987641aba1ec8c0c799b56c7da19 (diff) | |
| download | rust-77b996e1c628e8089f058244b011a2ee945a8984.tar.gz rust-77b996e1c628e8089f058244b011a2ee945a8984.zip | |
Auto merge of #83042 - JohnTitor:rollup-s8efv94, r=JohnTitor
Rollup of 11 pull requests Successful merges: - #80385 (Clarify what `Cell::replace` returns) - #82571 (Rustdoc Json: Add tests for Reexports, and improve jsondocck) - #82860 (Add `-Z unpretty` flag for the THIR) - #82950 (convert slice doc link to intra-doc links) - #82965 (Add spirv extension handling in compiletest) - #82966 (update MSYS2 link in README) - #82979 (Fix "run" button position in error index) - #83001 (Ignore Vim swap files) - #83003 (rustdoc: tweak the search index format) - #83013 (Adjust some `#[cfg]`s to take non-Unix non-Windows operating systems into account) - #83018 (Reintroduce accidentally deleted assertions.) 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, 7 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs index caa6a6a8e3a..b11821b7db0 100644 --- a/compiler/rustc_codegen_ssa/src/back/link.rs +++ b/compiler/rustc_codegen_ssa/src/back/link.rs @@ -711,7 +711,7 @@ fn link_natively<'a, B: ArchiveBuilder<'a>>( status.signal() == Some(libc::SIGILL) } - #[cfg(windows)] + #[cfg(not(unix))] fn is_illegal_instruction(_status: &ExitStatus) -> bool { false } @@ -1198,7 +1198,7 @@ fn exec_linker( flush_linked_file(&output, out_filename)?; return output; - #[cfg(unix)] + #[cfg(not(windows))] fn flush_linked_file(_: &io::Result<Output>, _: &Path) -> io::Result<()> { Ok(()) } @@ -1238,6 +1238,11 @@ fn exec_linker( err.raw_os_error() == Some(ERROR_FILENAME_EXCED_RANGE) } + #[cfg(not(any(unix, windows)))] + fn command_line_too_big(_: &io::Error) -> bool { + false + } + struct Escape<'a> { arg: &'a str, is_like_msvc: bool, |