Skip to content

Commit

Permalink
Rollup merge of #74842 - hermitcore:thread_local, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
adjust remaining targets

- fix commit 7dc3886
- previous commit doesn't adjust all targets
JohnTitor authored Aug 8, 2020

Verified

This commit was signed with the committer’s verified signature.
vkbo Veronica Berglyd Olsen
2 parents 5bbdc73 + a4fb1d0 commit dde4fb3
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion library/std/src/sys/hermit/mod.rs
Original file line number Diff line number Diff line change
@@ -106,7 +106,7 @@ pub unsafe extern "C" fn runtime_entry(
argv: *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" {
fn main(argc: isize, argv: *const *const c_char) -> i32;
}
2 changes: 1 addition & 1 deletion library/std/src/sys/hermit/thread.rs
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ use crate::ffi::CStr;
use crate::io;
use crate::mem;
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;

pub type Tid = abi::Tid;

0 comments on commit dde4fb3

Please sign in to comment.