 @@ -1,14 +1,14 @@
-#	$NetBSD: Makefile,v 1.53 2008/09/29 08:48:15 ad Exp $
+#	$NetBSD: Makefile,v 1.54 2008/10/08 08:27:07 ad Exp $
+#
 WARNS=	4
 .include <bsd.own.mk>
 .if exists(${.CURDIR}/arch/${MACHINE_ARCH})
 ARCHSUBDIR=	${MACHINE_ARCH}
 .elif exists(${.CURDIR}/arch/${MACHINE_CPU})
 ARCHSUBDIR=	${MACHINE_CPU}
 .else
 .BEGIN:
 	@echo "WARNING: no ARCHSUBDIR for ${MACHINE_ARCH}/${MACHINE_CPU}; skipping..."
 @@ -58,27 +58,26 @@ SRCS+=	pthread_rwlock.c
 SRCS+=	pthread_specific.c
 SRCS+=	pthread_spin.c
 SRCS+=	pthread_tsd.c
 SRCS+=	res_state.c
 SRCS+=	sem.c
 # Architecture-dependent files
 SRCS+=	_context_u.S
 .if exists(${ARCHDIR}/pthread_md.c)
 SRCS+= pthread_md.c
 .endif
 .if defined(PTHREAD__COMPAT)
 SRCS+=		pthread_compat.c
 CPPFLAGS+=	-DPTHREAD__COMPAT
 .PATH.c:	${.CURDIR}/../../common/lib/libc/arch/${ARCHSUBDIR}/atomic
 .PATH.S:	${.CURDIR}/../../common/lib/libc/arch/${ARCHSUBDIR}/atomic
 .PATH.c:	${.CURDIR}/../../common/lib/libc/atomic
 .PATH.c:	${.CURDIR}/../libc/misc
 .include "../../common/lib/libc/arch/${ARCHSUBDIR}/atomic/Makefile.inc"
 .endif
 # The TSD routines are used in the implementation of profiling, and so
 # can't be profiled themselves.
 COPTS.pthread_specific.c+=	-fomit-frame-pointer -falign-functions=32
 pthread_specific.po: pthread_specific.o
 	${_MKTARGET_CREATE}
 	cp pthread_specific.o pthread_specific.po

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pthread_cancelstub.c,v 1.21 2008/09/29 08:48:15 ad Exp $	*/
+/*	$NetBSD: pthread_cancelstub.c,v 1.22 2008/10/08 08:27:07 ad Exp $	*/
 /*-
  * Copyright (c) 2002, 2007 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_cancelstub.c,v 1.21 2008/09/29 08:48:15 ad Exp $");
+__RCSID("$NetBSD: pthread_cancelstub.c,v 1.22 2008/10/08 08:27:07 ad Exp $");
 #ifndef lint
 /*
  * This is necessary because the names are always weak (they are not
  * POSIX functions).
  */
 #define	fsync_range	_fsync_range
 #define	pollts		_pollts
 /*
  * XXX this is necessary to get the prototypes for the __sigsuspend14
 @@ -121,26 +121,41 @@ accept(int s, struct sockaddr *addr, soc
+{
 	int retval;
 	pthread_t self;
 	self = pthread__self();
 	TESTCANCEL(self);
 	retval = _sys_accept(s, addr, addrlen);
 	TESTCANCEL(self);
 	return retval;
+}
 int
 aio_suspend(const struct aiocb * const list[], int nent,
     const struct timespec *timeout)
+{
 	int retval;
 	pthread_t self;
 	self = pthread__self();
 	TESTCANCEL(self);
 	retval = _sys_aio_suspend(list, nent, timeout);
 	TESTCANCEL(self);
 	return retval;
+}
 int
 close(int d)
+{
 	int retval;
 	pthread_t self;
 	self = pthread__self();
 	TESTCANCEL(self);
 	retval = _sys_close(d);
 	TESTCANCEL(self);
 	return retval;
+}
 @@ -207,26 +222,84 @@ int
 fsync_range(int d, int f, off_t s, off_t e)
+{
 	int retval;
 	pthread_t self;
 	self = pthread__self();
 	TESTCANCEL(self);
 	retval = _sys_fsync_range(d, f, s, e);
 	TESTCANCEL(self);
 	return retval;
+}
 int
 mq_send(mqd_t mqdes, const char *msg_ptr, size_t msg_len, unsigned msg_prio)
+{
 	int retval;
 	pthread_t self;
 	self = pthread__self();
 	TESTCANCEL(self);
 	retval = _sys_mq_send(mqdes, msg_ptr, msg_len, msg_prio);
 	TESTCANCEL(self);
 	return retval;
+}
 ssize_t
 mq_receive(mqd_t mqdes, char *msg_ptr, size_t msg_len, unsigned *msg_prio)
+{
 	ssize_t retval;
 	pthread_t self;
 	self = pthread__self();
 	TESTCANCEL(self);
 	retval = _sys_mq_receive(mqdes, msg_ptr, msg_len, msg_prio);
 	TESTCANCEL(self);
 	return retval;
+}
 int
 mq_timedsend(mqd_t mqdes, const char *msg_ptr, size_t msg_len,
     unsigned msg_prio, const struct timespec *abst)
+{
 	int retval;
 	pthread_t self;
 	self = pthread__self();
 	TESTCANCEL(self);
 	retval = _sys_mq_timedsend(mqdes, msg_ptr, msg_len, msg_prio, abst);
 	TESTCANCEL(self);
 	return retval;
+}
 ssize_t
 mq_timedreceive(mqd_t mqdes, char *msg_ptr, size_t msg_len, unsigned *msg_prio,
     const struct timespec *abst)
+{
 	ssize_t retval;
 	pthread_t self;
 	self = pthread__self();
 	TESTCANCEL(self);
 	retval = _sys_mq_timedreceive(mqdes, msg_ptr, msg_len, msg_prio, abst);
 	TESTCANCEL(self);
 	return retval;
+}
 ssize_t
 msgrcv(int msgid, void *msgp, size_t msgsz, long msgtyp, int msgflg)
+{
 	ssize_t retval;
 	pthread_t self;
 	self = pthread__self();
 	TESTCANCEL(self);
 	retval = _sys_msgrcv(msgid, msgp, msgsz, msgtyp, msgflg);
 	TESTCANCEL(self);
 	return retval;
+}
 @@ -457,116 +530,40 @@ sigtimedwait(const sigset_t * __restrict
 	     const struct timespec * __restrict timeout)
+{
 	pthread_t self;
 	int retval;
 	self = pthread__self();
 	TESTCANCEL(self);
 	retval = _sigtimedwait(set, info, timeout);
 	TESTCANCEL(self);
 	return retval;
+}
 __strong_alias(_aio_suspend, aio_suspend)
 __strong_alias(_close, close)
 __strong_alias(_fcntl, fcntl)
 __strong_alias(_fdatasync, fdatasync)
 __strong_alias(_fsync, fsync)
 __weak_alias(fsync_range, _fsync_range)
 __strong_alias(_mq_send, mq_send)
 __strong_alias(_mq_receive, mq_receive)
 __strong_alias(_mq_timedsend, mq_timedsend)
 __strong_alias(_mq_timedreceive, mq_timedreceive)
 __strong_alias(_msgrcv, msgrcv)
 __strong_alias(_msgsnd, msgsnd)
 __strong_alias(___msync13, __msync13)
 __strong_alias(_open, open)
 __strong_alias(_poll, poll)
 __weak_alias(pollts, _pollts)
 __strong_alias(_pread, pread)
 __strong_alias(_pselect, pselect)
 __strong_alias(_pwrite, pwrite)
 __strong_alias(_read, read)
 __strong_alias(_readv, readv)
 __strong_alias(_select, select)
 __strong_alias(_wait4, wait4)
 __strong_alias(_write, write)
 __strong_alias(_writev, writev)
 #ifndef PTHREAD__COMPAT
 int
 aio_suspend(const struct aiocb * const list[], int nent,
     const struct timespec *timeout)
 	int retval;
 	pthread_t self;
 	self = pthread__self();
 	TESTCANCEL(self);
 	retval = _sys_aio_suspend(list, nent, timeout);
 	TESTCANCEL(self);
 	return retval;
 int
 mq_send(mqd_t mqdes, const char *msg_ptr, size_t msg_len, unsigned msg_prio)
 	int retval;
 	pthread_t self;
 	self = pthread__self();
 	TESTCANCEL(self);
 	retval = _sys_mq_send(mqdes, msg_ptr, msg_len, msg_prio);
 	TESTCANCEL(self);
 	return retval;
 ssize_t
 mq_receive(mqd_t mqdes, char *msg_ptr, size_t msg_len, unsigned *msg_prio)
 	ssize_t retval;
 	pthread_t self;
 	self = pthread__self();
 	TESTCANCEL(self);
 	retval = _sys_mq_receive(mqdes, msg_ptr, msg_len, msg_prio);
 	TESTCANCEL(self);
 	return retval;
 int
 mq_timedsend(mqd_t mqdes, const char *msg_ptr, size_t msg_len,
     unsigned msg_prio, const struct timespec *abst)
 	int retval;
 	pthread_t self;
 	self = pthread__self();
 	TESTCANCEL(self);
 	retval = _sys_mq_timedsend(mqdes, msg_ptr, msg_len, msg_prio, abst);
 	TESTCANCEL(self);
 	return retval;
 ssize_t
 mq_timedreceive(mqd_t mqdes, char *msg_ptr, size_t msg_len, unsigned *msg_prio,
     const struct timespec *abst)
 	ssize_t retval;
 	pthread_t self;
 	self = pthread__self();
 	TESTCANCEL(self);
 	retval = _sys_mq_timedreceive(mqdes, msg_ptr, msg_len, msg_prio, abst);
 	TESTCANCEL(self);
 	return retval;
 __strong_alias(_aio_suspend, aio_suspend)
 __strong_alias(_mq_send, mq_send)
 __strong_alias(_mq_receive, mq_receive)
 __strong_alias(_mq_timedsend, mq_timedsend)
 __strong_alias(_mq_timedreceive, mq_timedreceive)
 #endif	/* !PTHREAD__COMPAT */
 #endif	/* !lint */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pthread_compat.c,v 1.1 2008/09/29 08:48:15 ad Exp $	*/
+/*	$NetBSD: pthread_compat.c,v 1.2 2008/10/08 08:27:07 ad Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software developed for The NetBSD Foundation
  * by 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.
 @@ -19,51 +19,65 @@
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``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.
  */
 /*
  * libc symbols that are not present before NetBSD 5.0.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: pthread_compat.c,v 1.1 2008/09/29 08:48:15 ad Exp $");
+__RCSID("$NetBSD: pthread_compat.c,v 1.2 2008/10/08 08:27:07 ad Exp $");
 #include <sys/param.h>
 #include <sys/syscall.h>
 #include <sys/aio.h>
 #include <lwp.h>
 #include <unistd.h>
 #include <sched.h>
 #include "pthread.h"
 #include "pthread_int.h"
 static void     __pthread_init(void) __attribute__((__constructor__, __used__));
 void	__libc_thr_init(void);
 void	__libc_atomic_init(void);
 int	_sys_sched_yield(void);
 int	_sys_aio_suspend(const struct aiocb * const[], int,
 			 const struct timespec *);
 int	_sys_mq_send(mqd_t, const char *, size_t, unsigned);
 ssize_t	_sys_mq_receive(mqd_t, char *, size_t, unsigned *);
 int	_sys_mq_timedsend(mqd_t, const char *, size_t, unsigned,
 			  const struct timespec *);
 ssize_t	_sys_mq_timedreceive(mqd_t, char *, size_t, unsigned *,
 			     const struct timespec *);
 static void
 __pthread_init(void)
+{
 	__libc_thr_init();
 	__libc_atomic_init();
 	__libc_thr_init();
+}
 int
 _lwp_kill(lwpid_t a, int b)
+{
 	return syscall(SYS__lwp_kill, a, b);
+}
 int
 _lwp_detach(lwpid_t a)
+{
 @@ -78,27 +92,27 @@ _lwp_park(const struct timespec *a, lwpi
+}
 int
 _lwp_unpark(lwpid_t a, const void *b)
+{
 	return syscall(SYS__lwp_unpark, a, b);
+}
 ssize_t
 _lwp_unpark_all(const lwpid_t *a, size_t b, const void *c)
+{
-	return syscall(SYS__lwp_unpark_all, a, b, c);
+	return (ssize_t)syscall(SYS__lwp_unpark_all, a, b, c);
+}
 int
 _lwp_setname(lwpid_t a, const char *b)
+{
 	return syscall(SYS__lwp_setname, a, b);
+}
 int
 _lwp_getname(lwpid_t a, char *b, size_t c)
+{
 @@ -143,13 +157,51 @@ _sched_getaffinity(pid_t a, lwpid_t b, s
 int
 _sched_setparam(pid_t a, lwpid_t b, int c, const struct sched_param *d)
+{
 	return syscall(SYS__sched_setparam, a, b, c, d);
+}
 int
 _sched_getparam(pid_t a, lwpid_t b, int *c, struct sched_param *d)
+{
 	return syscall(SYS__sched_getparam, a, b, c, d);
+}
 int
 _sys_aio_suspend(const struct aiocb * const a[], int b,
 		 const struct timespec *c)
+{
 	return syscall(SYS_aio_suspend, a, b, c);
+}
 int
 _sys_mq_send(mqd_t a, const char *b, size_t c, unsigned d)
+{
 	return syscall(SYS_mq_send, a, b, c, d);
+}
 ssize_t
 _sys_mq_receive(mqd_t a, char *b, size_t c, unsigned *d)
+{
 	return (ssize_t)syscall(SYS_mq_receive, a, b, c, d);
+}
 int
 _sys_mq_timedsend(mqd_t a, const char *b, size_t c, unsigned d,
 		  const struct timespec *e)
+{
 	return syscall(SYS_mq_timedsend, a, b,c ,d, e);
+}
 ssize_t
 _sys_mq_timedreceive(mqd_t a, char *b, size_t c, unsigned *d,
 		     const struct timespec *e)
+{
 	return (ssize_t)syscall(SYS_mq_timedreceive, a, b, c, d, e);
+}