about summary refs log tree commit diff
path: root/src/libstd/thread
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-09-14 03:02:58 +0000
committerbors <bors@rust-lang.org>2017-09-14 03:02:58 +0000
commit84bbd14e3f392d63524482e2f0c69cd6fcd7f2c5 (patch)
tree245c38d385167096343d83f9884d37275c349e27 /src/libstd/thread
parentd1ca653b170c235ad01a83d89fcb18b1f8b6a3b0 (diff)
parentb2b50635172254777d16d0fc6112e6d5b68b63f2 (diff)
downloadrust-84bbd14e3f392d63524482e2f0c69cd6fcd7f2c5.tar.gz
rust-84bbd14e3f392d63524482e2f0c69cd6fcd7f2c5.zip
Auto merge of #43972 - TobiasSchaffner:std_clean, r=alexcrichton
 Add the libstd-modifications needed for the L4Re target

This commit adds the needed modifications to compile the std crate for the L4 Runtime environment (L4Re).

A target for the L4Re was introduced in commit: c151220a84e40b65e45308cc0f3bbea4466d3acf

In many aspects implementations for linux also apply for the L4Re microkernel.

Some uncommon characteristics had to be resolved:
 * L4Re has no network funktionality
 * L4Re has a maximum stacksize of 1Mb for threads
 * L4Re has no uid or gid

Co-authored-by: Sebastian Humenda <sebastian.humenda@tu-dresden.de>
Diffstat (limited to 'src/libstd/thread')
-rw-r--r--src/libstd/thread/mod.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/thread/mod.rs b/src/libstd/thread/mod.rs
index 4912ff93abd..ca01eaefcae 100644
--- a/src/libstd/thread/mod.rs
+++ b/src/libstd/thread/mod.rs
@@ -174,7 +174,7 @@ use sync::{Mutex, Condvar, Arc};
 use sys::thread as imp;
 use sys_common::mutex;
 use sys_common::thread_info;
-use sys_common::util;
+use sys_common::thread;
 use sys_common::{AsInner, IntoInner};
 use time::Duration;
 
@@ -374,7 +374,7 @@ impl Builder {
     {
         let Builder { name, stack_size } = self;
 
-        let stack_size = stack_size.unwrap_or_else(util::min_stack);
+        let stack_size = stack_size.unwrap_or_else(thread::min_stack);
 
         let my_thread = Thread::new(name);
         let their_thread = my_thread.clone();