Skip to content

Commit

Permalink
Take sys/vxworks/thread from sys/unix instead.
Browse files Browse the repository at this point in the history
  • Loading branch information
m-ou-se committed Oct 16, 2020
1 parent c8628f4 commit 5d526f6
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 158 deletions.
9 changes: 6 additions & 3 deletions library/std/src/sys/unix/thread.rs
Expand Up @@ -6,10 +6,12 @@ use crate::ptr;
use crate::sys::{os, stack_overflow};
use crate::time::Duration;

#[cfg(not(target_os = "l4re"))]
#[cfg(not(any(target_os = "l4re", target_os = "vxworks")))]
pub const DEFAULT_MIN_STACK_SIZE: usize = 2 * 1024 * 1024;
#[cfg(target_os = "l4re")]
pub const DEFAULT_MIN_STACK_SIZE: usize = 1024 * 1024;
#[cfg(target_os = "vxworks")]
pub const DEFAULT_MIN_STACK_SIZE: usize = 256 * 1024;

pub struct Thread {
id: libc::pthread_t,
Expand Down Expand Up @@ -152,10 +154,11 @@ impl Thread {
target_os = "haiku",
target_os = "l4re",
target_os = "emscripten",
target_os = "redox"
target_os = "redox",
target_os = "vxworks"
))]
pub fn set_name(_name: &CStr) {
// Newlib, Haiku, and Emscripten have no way to set a thread name.
// Newlib, Haiku, Emscripten, and VxWorks have no way to set a thread name.
}
#[cfg(target_os = "fuchsia")]
pub fn set_name(_name: &CStr) {
Expand Down
1 change: 1 addition & 0 deletions library/std/src/sys/vxworks/mod.rs
Expand Up @@ -31,6 +31,7 @@ pub mod rwlock;
#[path = "../unix/stack_overflow.rs"]
pub mod stack_overflow;
pub mod stdio;
#[path = "../unix/thread.rs"]
pub mod thread;
pub mod thread_local_dtor;
pub mod thread_local_key;
Expand Down
155 changes: 0 additions & 155 deletions library/std/src/sys/vxworks/thread.rs

This file was deleted.

0 comments on commit 5d526f6

Please sign in to comment.