squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Rollup merge of #74842 - hermitcore:thread_local, r=Mark-Simulacrum

Browse source 
adjust remaining targets

- fix commit 7dc3886
- previous commit doesn't adjust all targets
This commit is contained in:
Yuki Okushi 2020-08-09 06:41:16 +09:00 committed by GitHub
commit dde4fb3fd2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
library/std/src/sys/hermit/mod.rs
View file

@ -106,7 +106,7 @@ pub unsafe extern "C" fn runtime_entry(
argv: *const *const c_char, argv: *const *const c_char,
env: *const *const c_char, env: *const *const c_char,
) -> ! { ) -> ! {
use crate::sys::hermit::fast_thread_local::run_dtors; use crate::sys::hermit::thread_local_dtor::run_dtors;
extern "C" { extern "C" {
fn main(argc: isize, argv: *const *const c_char) -> i32; fn main(argc: isize, argv: *const *const c_char) -> i32;
} }

2
library/std/src/sys/hermit/thread.rs
View file

@ -4,7 +4,7 @@ use crate::ffi::CStr;
use crate::io; use crate::io;
use crate::mem; use crate::mem;
use crate::sys::hermit::abi; use crate::sys::hermit::abi;
use crate::sys::hermit::fast_thread_local::run_dtors; use crate::sys::hermit::thread_local_dtor::run_dtors;
use crate::time::Duration; use crate::time::Duration;
pub type Tid = abi::Tid; pub type Tid = abi::Tid;