diff options
| author | bors <bors@rust-lang.org> | 2021-07-08 04:05:41 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-07-08 04:05:41 +0000 |
| commit | ac8c3bfffb2829d0af075a5d4020fb7e9e86c3a2 (patch) | |
| tree | 7ed177e41caaf762288a5e899f18a027fa12e320 /compiler/rustc_codegen_cranelift/example | |
| parent | d2b04f075c0ce010758c4c8674152ff89d1d73f3 (diff) | |
| parent | 01474ad92cc025ac7e16a9d70c76c2d030d414d7 (diff) | |
| download | rust-ac8c3bfffb2829d0af075a5d4020fb7e9e86c3a2.tar.gz rust-ac8c3bfffb2829d0af075a5d4020fb7e9e86c3a2.zip | |
Auto merge of #86966 - JohnTitor:rollup-uiqj2vc, r=JohnTitor
Rollup of 9 pull requests Successful merges: - #86639 (Support lint tool names in rustc command line options) - #86812 (Recover from `&dyn mut ...` parse errors) - #86917 (Add doc comment for `impl From<LayoutError> for TryReserveError`) - #86925 (Add self to mailmap) - #86927 (Sync rustc_codegen_cranelift) - #86932 (Fix ICE when misplaced visibility cannot be properly parsed) - #86933 (Clean up rustdoc static files) - #86955 (Fix typo in `ops::Drop` docs) - #86956 (Revert "Add "every" as a doc alias for "all".") Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_cranelift/example')
| -rw-r--r-- | compiler/rustc_codegen_cranelift/example/mini_core_hello_world.rs | 6 | ||||
| -rw-r--r-- | compiler/rustc_codegen_cranelift/example/std_example.rs | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/compiler/rustc_codegen_cranelift/example/mini_core_hello_world.rs b/compiler/rustc_codegen_cranelift/example/mini_core_hello_world.rs index 6570f2bf9f2..d997ce6d1b3 100644 --- a/compiler/rustc_codegen_cranelift/example/mini_core_hello_world.rs +++ b/compiler/rustc_codegen_cranelift/example/mini_core_hello_world.rs @@ -292,7 +292,7 @@ fn main() { #[cfg(not(any(jit, windows)))] test_tls(); - #[cfg(all(not(jit), target_os = "linux"))] + #[cfg(all(not(jit), target_arch = "x86_64", target_os = "linux"))] unsafe { global_asm_test(); } @@ -303,12 +303,12 @@ fn main() { assert_eq!(*REF1, *REF2); } -#[cfg(all(not(jit), target_os = "linux"))] +#[cfg(all(not(jit), target_arch = "x86_64", target_os = "linux"))] extern "C" { fn global_asm_test(); } -#[cfg(all(not(jit), target_os = "linux"))] +#[cfg(all(not(jit), target_arch = "x86_64", target_os = "linux"))] global_asm! { " .global global_asm_test diff --git a/compiler/rustc_codegen_cranelift/example/std_example.rs b/compiler/rustc_codegen_cranelift/example/std_example.rs index 7d608df9253..5bc51a541b5 100644 --- a/compiler/rustc_codegen_cranelift/example/std_example.rs +++ b/compiler/rustc_codegen_cranelift/example/std_example.rs @@ -15,8 +15,6 @@ fn main() { let stderr = ::std::io::stderr(); let mut stderr = stderr.lock(); - // FIXME support lazy jit when multi threading - #[cfg(not(lazy_jit))] std::thread::spawn(move || { println!("Hello from another thread!"); }); |