From 3a572fda25502e2ecf691148ff9f5190ba32f893 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Thu, 29 Oct 2015 16:52:25 -0700
Subject: [PATCH] Be more selective about skipped pthread on musl tests

Fixup the value of PTHREAD_STACK_MIN as well
---
 libc-test/build.rs           | 2 +-
 src/unix/notbsd/linux/mod.rs | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/libc-test/build.rs b/libc-test/build.rs
index b4eb70c68514d..4ee2ca6212ccc 100644
--- a/libc-test/build.rs
+++ b/libc-test/build.rs
@@ -200,7 +200,7 @@ fn main() {
             "SIG_IGN" => true, // sighandler_t weirdness
 
             // types on musl are defined a little differently
-            n if musl && n.contains("PTHREAD") => true,
+            n if musl && n.contains("__SIZEOF_PTHREAD") => true,
 
             _ => false,
         }
diff --git a/src/unix/notbsd/linux/mod.rs b/src/unix/notbsd/linux/mod.rs
index 6606b41c9c6e0..e5b529e1180da 100644
--- a/src/unix/notbsd/linux/mod.rs
+++ b/src/unix/notbsd/linux/mod.rs
@@ -221,7 +221,9 @@ extern {
 }
 
 cfg_if! {
-    if #[cfg(any(target_arch = "arm", target_arch = "x86",
+    if #[cfg(any(target_env = "musl"))] {
+        pub const PTHREAD_STACK_MIN: ::size_t = 2048;
+    } else if #[cfg(any(target_arch = "arm", target_arch = "x86",
                  target_arch = "x86_64"))] {
         pub const PTHREAD_STACK_MIN: ::size_t = 16384;
     } else {