 @@ -1,14 +1,14 @@
-/*	$NetBSD: pthread.c,v 1.127 2012/03/08 16:33:45 joerg Exp $	*/
+/*	$NetBSD: pthread.c,v 1.128 2012/03/08 16:40:45 joerg Exp $	*/
 /*-
  * Copyright (c) 2001, 2002, 2003, 2006, 2007, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Nathan J. Williams and Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: pthread.c,v 1.127 2012/03/08 16:33:45 joerg Exp $");
+__RCSID("$NetBSD: pthread.c,v 1.128 2012/03/08 16:40:45 joerg Exp $");
 #define	__EXPOSE_STACK	1
 #include <sys/param.h>
 #include <sys/exec_elf.h>
 #include <sys/mman.h>
 #include <sys/sysctl.h>
 #include <sys/lwpctl.h>
 #include <sys/tls.h>
 #include <assert.h>
 #include <dlfcn.h>
 #include <err.h>
 @@ -307,43 +307,58 @@ static void
 pthread__scrubthread(pthread_t t, char *name, int flags)
+{
 	t->pt_state = PT_STATE_RUNNING;
 	t->pt_exitval = NULL;
 	t->pt_flags = flags;
 	t->pt_cancel = 0;
 	t->pt_errno = 0;
 	t->pt_name = name;
 	t->pt_lid = 0;
+}
 static int
-pthread__newstack(pthread_t newthread)
+pthread__newstack(pthread_t newthread, const pthread_attr_t *attr)
+{
 	void *stackbase, *redzone;
 	size_t stacksize;
 	bool mapped_stack = false;
-	stackbase = mmap(NULL, pthread__stacksize,
+	if (attr != NULL) {
-	    PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE, -1, (off_t)0);
+		pthread_attr_getstack(attr, &stackbase, &stacksize);
-	if (stackbase == MAP_FAILED)
+	} else {
-		return ENOMEM;
+		stackbase = NULL;
 		stacksize = 0;
+	}
 	if (stacksize == 0)
 		stacksize = pthread__stacksize;
 	if (stackbase == NULL) {
 		stackbase = mmap(NULL, stacksize,
 		    PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE, -1, (off_t)0);
 		if (stackbase == MAP_FAILED)
 			return ENOMEM;
 		mapped_stack = true;
+	}
 	newthread->pt_stack.ss_size = pthread__stacksize - pthread__pagesize;
 		newthread->pt_stack.ss_sp = stackbase;
 #ifdef __MACHINE_STACK_GROWS_UP
 	redzone = (char *)stackbase + newthread->pt_stack.ss_size;
 #else
 	redzone = (char *)stackbase;
 #endif
 	if (mprotect(redzone, pthread__pagesize, PROT_NONE) == -1) {
-		munmap(stackbase, pthread__stacksize);
+		if (mapped_stack)
 			munmap(stackbase, pthread__stacksize);
 		return EPERM;
+	}
 	return 0;
+}
 int
 pthread_create(pthread_t *thread, const pthread_attr_t *attr,
 	    void *(*startfunc)(void *), void *arg)
+{
 	pthread_t newthread;
 	pthread_attr_t nattr;
 	struct pthread_attr_private *p;
 	char * volatile name;
 @@ -401,27 +416,27 @@ pthread_create(pthread_t *thread, const
+	}
 	/*
 	 * If necessary set up a stack, allocate space for a pthread_st,
 	 * and initialize it.
 	 */
 	if (newthread == NULL) {
 		newthread = malloc(sizeof(*newthread));
 		if (newthread == NULL) {
 			free(name);
 			return ENOMEM;
+		}
-		if (pthread__newstack(newthread)) {
+		if (pthread__newstack(newthread, attr)) {
 			free(newthread);
 			free(name);
 			return ENOMEM;
+		}
 		/* This is used only when creating the thread. */
 		_INITCONTEXT_U(&newthread->pt_uc);
 		newthread->pt_uc.uc_stack = newthread->pt_stack;
 		newthread->pt_uc.uc_link = NULL;
 #if defined(__HAVE_TLS_VARIANT_I) || defined(__HAVE_TLS_VARIANT_II)
 		newthread->pt_tls = NULL;
 #endif