From 40794bf4b890ed4a6fba9a7c2bee81304a754379 Mon Sep 17 00:00:00 2001
From: Sebastian Humenda <shumenda@gmx.de>
Date: Thu, 7 Sep 2017 21:04:24 +0200
Subject: [PATCH] Move the stack size value for L4Re to the min_stack_size
 function

---
 src/libstd/sys/unix/thread.rs | 4 ----
 src/libstd/sys_common/util.rs | 5 +++++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/libstd/sys/unix/thread.rs b/src/libstd/sys/unix/thread.rs
index 5e2610736a8..60bce7924cd 100644
--- a/src/libstd/sys/unix/thread.rs
+++ b/src/libstd/sys/unix/thread.rs
@@ -53,10 +53,6 @@ impl Thread {
 
         let stack_size = cmp::max(stack, min_stack_size(&attr));
 
-        // L4Re only supports a maximum of 1Mb per default.
-        #[cfg(target_os = "l4re")]
-        let stack_size = cmp::min(stack_size, 1024 * 1024);
-
         match pthread_attr_setstacksize(&mut attr,
                                         stack_size) {
             0 => {}
diff --git a/src/libstd/sys_common/util.rs b/src/libstd/sys_common/util.rs
index daa0c15920b..41be6f43763 100644
--- a/src/libstd/sys_common/util.rs
+++ b/src/libstd/sys_common/util.rs
@@ -22,7 +22,12 @@ pub fn min_stack() -> usize {
         n => return n - 1,
     }
     let amt = env::var("RUST_MIN_STACK").ok().and_then(|s| s.parse().ok());
+    #[cfg(not(target_os = "l4re"))]
     let amt = amt.unwrap_or(2 * 1024 * 1024);
+    // L4Re only supports a maximum of 1Mb per default.
+    #[cfg(target_os = "l4re")]
+    let amt = amt.unwrap_or(1024 * 1024);
+
     // 0 is our sentinel value, so ensure that we'll never see 0 after
     // initialization has run
     MIN.store(amt + 1, Ordering::SeqCst);