diff options
| author | bors <bors@rust-lang.org> | 2021-02-01 16:30:22 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-02-01 16:30:22 +0000 |
| commit | 02b85d722050d61b40ae9746b3bac54ab55b1056 (patch) | |
| tree | 250983ce89c6c4ed41b5468c4640f589ce666be2 /compiler/rustc_codegen_cranelift/example/alloc_example.rs | |
| parent | 70b18bc2cbac4712020019f5bf57c00905373205 (diff) | |
| parent | b3339ab8283d173ffd4bcbacaf799b50d3dbcdff (diff) | |
| download | rust-02b85d722050d61b40ae9746b3bac54ab55b1056.tar.gz rust-02b85d722050d61b40ae9746b3bac54ab55b1056.zip | |
Auto merge of #81625 - jonas-schievink:rollup-mshpp2n, r=jonas-schievink
Rollup of 12 pull requests Successful merges: - #78641 (Let io::copy reuse BufWriter buffers) - #79291 (Add error message for private fn) - #81364 (Improve `rustc_mir_build::matches` docs) - #81387 (Move some tests to more reasonable directories - 3) - #81463 (Rename NLL* to Nll* accordingly to C-CASE) - #81504 (Suggest accessing field when appropriate) - #81529 (Fix invalid camel case suggestion involving unicode idents) - #81536 (Indicate both start and end of pass RSS in time-passes output) - #81592 (Rustdoc UI fixes) - #81594 (Avoid building LLVM just for llvm-dwp) - #81598 (Fix calling convention for CRT startup) - #81618 (Sync rustc_codegen_cranelift) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_cranelift/example/alloc_example.rs')
| -rw-r--r-- | compiler/rustc_codegen_cranelift/example/alloc_example.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_cranelift/example/alloc_example.rs b/compiler/rustc_codegen_cranelift/example/alloc_example.rs index dc2ad4c676e..f59600ebb33 100644 --- a/compiler/rustc_codegen_cranelift/example/alloc_example.rs +++ b/compiler/rustc_codegen_cranelift/example/alloc_example.rs @@ -11,7 +11,8 @@ use alloc_system::System; #[global_allocator] static ALLOC: System = System; -#[link(name = "c")] +#[cfg_attr(unix, link(name = "c"))] +#[cfg_attr(target_env = "msvc", link(name = "msvcrt"))] extern "C" { fn puts(s: *const u8) -> i32; } |