From owner-svn-src-stable-7@FreeBSD.ORG Tue Jun 9 15:09:13 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1CEEB10656E5; Tue, 9 Jun 2009 15:09:13 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 03C308FC20; Tue, 9 Jun 2009 15:09:13 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n59F9DlL075411; Tue, 9 Jun 2009 15:09:13 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n59F9ASo075357; Tue, 9 Jun 2009 15:09:10 GMT (envelope-from des@svn.freebsd.org) Message-Id: <200906091509.n59F9ASo075357@svn.freebsd.org> From: Dag-Erling Smorgrav Date: Tue, 9 Jun 2009 15:09:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193835 - in stable/7/lib/libkse: . arch/amd64/include arch/arm/include arch/i386/include arch/ia64/include arch/powerpc/include arch/sparc64/include sys thread X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Jun 2009 15:09:15 -0000 Author: des Date: Tue Jun 9 15:09:10 2009 New Revision: 193835 URL: http://svn.freebsd.org/changeset/base/193835 Log: merge r174111, r174112, r174335: style and warning fixes. The functional parts of these commits have already been merged. Modified: stable/7/lib/libkse/ (props changed) stable/7/lib/libkse/Makefile stable/7/lib/libkse/arch/amd64/include/atomic_ops.h stable/7/lib/libkse/arch/amd64/include/pthread_md.h stable/7/lib/libkse/arch/arm/include/atomic_ops.h stable/7/lib/libkse/arch/i386/include/atomic_ops.h stable/7/lib/libkse/arch/i386/include/pthread_md.h stable/7/lib/libkse/arch/ia64/include/atomic_ops.h stable/7/lib/libkse/arch/powerpc/include/atomic_ops.h stable/7/lib/libkse/arch/powerpc/include/pthread_md.h stable/7/lib/libkse/arch/sparc64/include/atomic_ops.h stable/7/lib/libkse/arch/sparc64/include/pthread_md.h stable/7/lib/libkse/sys/lock.c stable/7/lib/libkse/sys/thr_error.c stable/7/lib/libkse/thread/thr_accept.c stable/7/lib/libkse/thread/thr_aio_suspend.c stable/7/lib/libkse/thread/thr_atfork.c stable/7/lib/libkse/thread/thr_attr_destroy.c stable/7/lib/libkse/thread/thr_attr_get_np.c stable/7/lib/libkse/thread/thr_attr_getdetachstate.c stable/7/lib/libkse/thread/thr_attr_getguardsize.c stable/7/lib/libkse/thread/thr_attr_getinheritsched.c stable/7/lib/libkse/thread/thr_attr_getschedparam.c stable/7/lib/libkse/thread/thr_attr_getschedpolicy.c stable/7/lib/libkse/thread/thr_attr_getscope.c stable/7/lib/libkse/thread/thr_attr_getstack.c stable/7/lib/libkse/thread/thr_attr_getstackaddr.c stable/7/lib/libkse/thread/thr_attr_getstacksize.c stable/7/lib/libkse/thread/thr_attr_init.c stable/7/lib/libkse/thread/thr_attr_setcreatesuspend_np.c stable/7/lib/libkse/thread/thr_attr_setdetachstate.c stable/7/lib/libkse/thread/thr_attr_setguardsize.c stable/7/lib/libkse/thread/thr_attr_setinheritsched.c stable/7/lib/libkse/thread/thr_attr_setschedparam.c stable/7/lib/libkse/thread/thr_attr_setschedpolicy.c stable/7/lib/libkse/thread/thr_attr_setscope.c stable/7/lib/libkse/thread/thr_attr_setstack.c stable/7/lib/libkse/thread/thr_attr_setstackaddr.c stable/7/lib/libkse/thread/thr_attr_setstacksize.c stable/7/lib/libkse/thread/thr_barrier.c stable/7/lib/libkse/thread/thr_barrierattr.c stable/7/lib/libkse/thread/thr_cancel.c stable/7/lib/libkse/thread/thr_clean.c stable/7/lib/libkse/thread/thr_close.c stable/7/lib/libkse/thread/thr_concurrency.c stable/7/lib/libkse/thread/thr_cond.c stable/7/lib/libkse/thread/thr_condattr_destroy.c stable/7/lib/libkse/thread/thr_condattr_init.c stable/7/lib/libkse/thread/thr_condattr_pshared.c stable/7/lib/libkse/thread/thr_connect.c stable/7/lib/libkse/thread/thr_creat.c stable/7/lib/libkse/thread/thr_create.c stable/7/lib/libkse/thread/thr_detach.c stable/7/lib/libkse/thread/thr_equal.c stable/7/lib/libkse/thread/thr_execve.c stable/7/lib/libkse/thread/thr_exit.c stable/7/lib/libkse/thread/thr_fcntl.c stable/7/lib/libkse/thread/thr_find_thread.c stable/7/lib/libkse/thread/thr_fork.c stable/7/lib/libkse/thread/thr_fsync.c stable/7/lib/libkse/thread/thr_getschedparam.c stable/7/lib/libkse/thread/thr_info.c stable/7/lib/libkse/thread/thr_init.c stable/7/lib/libkse/thread/thr_join.c stable/7/lib/libkse/thread/thr_kern.c stable/7/lib/libkse/thread/thr_kill.c stable/7/lib/libkse/thread/thr_main_np.c stable/7/lib/libkse/thread/thr_mattr_init.c stable/7/lib/libkse/thread/thr_mattr_kind_np.c stable/7/lib/libkse/thread/thr_mattr_pshared.c stable/7/lib/libkse/thread/thr_msync.c stable/7/lib/libkse/thread/thr_multi_np.c stable/7/lib/libkse/thread/thr_mutex.c stable/7/lib/libkse/thread/thr_mutex_prioceiling.c stable/7/lib/libkse/thread/thr_mutex_protocol.c stable/7/lib/libkse/thread/thr_mutexattr_destroy.c stable/7/lib/libkse/thread/thr_nanosleep.c stable/7/lib/libkse/thread/thr_once.c stable/7/lib/libkse/thread/thr_open.c stable/7/lib/libkse/thread/thr_pause.c stable/7/lib/libkse/thread/thr_poll.c stable/7/lib/libkse/thread/thr_priority_queue.c stable/7/lib/libkse/thread/thr_private.h stable/7/lib/libkse/thread/thr_pselect.c stable/7/lib/libkse/thread/thr_pspinlock.c stable/7/lib/libkse/thread/thr_raise.c stable/7/lib/libkse/thread/thr_read.c stable/7/lib/libkse/thread/thr_readv.c stable/7/lib/libkse/thread/thr_resume_np.c stable/7/lib/libkse/thread/thr_rtld.c stable/7/lib/libkse/thread/thr_rwlock.c stable/7/lib/libkse/thread/thr_rwlockattr.c stable/7/lib/libkse/thread/thr_select.c stable/7/lib/libkse/thread/thr_self.c stable/7/lib/libkse/thread/thr_seterrno.c stable/7/lib/libkse/thread/thr_setprio.c stable/7/lib/libkse/thread/thr_setschedparam.c stable/7/lib/libkse/thread/thr_sig.c stable/7/lib/libkse/thread/thr_sigaction.c stable/7/lib/libkse/thread/thr_sigaltstack.c stable/7/lib/libkse/thread/thr_sigmask.c stable/7/lib/libkse/thread/thr_sigpending.c stable/7/lib/libkse/thread/thr_sigprocmask.c stable/7/lib/libkse/thread/thr_sigsuspend.c stable/7/lib/libkse/thread/thr_sigwait.c stable/7/lib/libkse/thread/thr_single_np.c stable/7/lib/libkse/thread/thr_sleep.c stable/7/lib/libkse/thread/thr_spec.c stable/7/lib/libkse/thread/thr_spinlock.c stable/7/lib/libkse/thread/thr_stack.c stable/7/lib/libkse/thread/thr_suspend_np.c stable/7/lib/libkse/thread/thr_switch_np.c stable/7/lib/libkse/thread/thr_symbols.c stable/7/lib/libkse/thread/thr_system.c stable/7/lib/libkse/thread/thr_tcdrain.c stable/7/lib/libkse/thread/thr_vfork.c stable/7/lib/libkse/thread/thr_wait.c stable/7/lib/libkse/thread/thr_wait4.c stable/7/lib/libkse/thread/thr_waitpid.c stable/7/lib/libkse/thread/thr_write.c stable/7/lib/libkse/thread/thr_writev.c stable/7/lib/libkse/thread/thr_yield.c Modified: stable/7/lib/libkse/Makefile ============================================================================== --- stable/7/lib/libkse/Makefile Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/Makefile Tue Jun 9 15:09:10 2009 (r193835) @@ -32,7 +32,7 @@ CFLAGS+=-fno-builtin # Uncomment this if you want libkse to contain debug information for # thread locking. CFLAGS+=-D_LOCK_DEBUG -WARNS?=2 +WARNS?=3 # Uncomment this if you want to build a 1:1 threading mode library # however it is no longer strictly conformed to POSIX Modified: stable/7/lib/libkse/arch/amd64/include/atomic_ops.h ============================================================================== --- stable/7/lib/libkse/arch/amd64/include/atomic_ops.h Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/arch/amd64/include/atomic_ops.h Tue Jun 9 15:09:10 2009 (r193835) @@ -36,7 +36,7 @@ * void atomic_swap64(intptr_t *dst, intptr_t val, intptr_t *res); */ static inline void -atomic_swap64(intptr_t *dst, intptr_t val, intptr_t *res) +atomic_swap64(volatile intptr_t *dst, intptr_t val, intptr_t *res) { __asm __volatile( "xchgq %2, %1; movq %2, %0" @@ -44,7 +44,7 @@ atomic_swap64(intptr_t *dst, intptr_t va } static inline void -atomic_swap_int(int *dst, int val, int *res) +atomic_swap_int(volatile int *dst, int val, int *res) { __asm __volatile( "xchgl %2, %1; movl %2, %0" @@ -52,6 +52,6 @@ atomic_swap_int(int *dst, int val, int * } #define atomic_swap_ptr(d, v, r) \ - atomic_swap64((intptr_t *)(d), (intptr_t)(v), (intptr_t *)(r)) + atomic_swap64((volatile intptr_t *)(d), (intptr_t)(v), (intptr_t *)(r)) #endif Modified: stable/7/lib/libkse/arch/amd64/include/pthread_md.h ============================================================================== --- stable/7/lib/libkse/arch/amd64/include/pthread_md.h Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/arch/amd64/include/pthread_md.h Tue Jun 9 15:09:10 2009 (r193835) @@ -250,7 +250,7 @@ _thread_switch(struct kcb *kcb, struct t _amd64_restore_context( &tcb->tcb_tmbx.tm_context.uc_mcontext, (intptr_t)&tcb->tcb_tmbx, - (intptr_t *)&kcb->kcb_kmbx.km_curthread); + (intptr_t *)(void *)&kcb->kcb_kmbx.km_curthread); else _amd64_restore_context( &tcb->tcb_tmbx.tm_context.uc_mcontext, Modified: stable/7/lib/libkse/arch/arm/include/atomic_ops.h ============================================================================== --- stable/7/lib/libkse/arch/arm/include/atomic_ops.h Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/arch/arm/include/atomic_ops.h Tue Jun 9 15:09:10 2009 (r193835) @@ -39,15 +39,15 @@ * void atomic_swap32(intptr_t *dst, intptr_t val, intptr_t *res); */ static inline void -atomic_swap32(intptr_t *dst, intptr_t val, intptr_t *res) +atomic_swap32(volatile intptr_t *dst, intptr_t val, intptr_t *res) { *res = __swp(val, dst); } #define atomic_swap_ptr(d, v, r) \ - atomic_swap32((intptr_t *)d, (intptr_t)v, (intptr_t *)r) + atomic_swap32((volatile intptr_t *)d, (intptr_t)v, (intptr_t *)r) #define atomic_swap_int(d, v, r) \ - atomic_swap32((intptr_t *)d, (intptr_t)v, (intptr_t *)r) + atomic_swap32((volatile intptr_t *)d, (intptr_t)v, (intptr_t *)r) #endif Modified: stable/7/lib/libkse/arch/i386/include/atomic_ops.h ============================================================================== --- stable/7/lib/libkse/arch/i386/include/atomic_ops.h Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/arch/i386/include/atomic_ops.h Tue Jun 9 15:09:10 2009 (r193835) @@ -36,7 +36,7 @@ * void atomic_swap32(intptr_t *dst, intptr_t val, intptr_t *res); */ static inline void -atomic_swap32(intptr_t *dst, intptr_t val, intptr_t *res) +atomic_swap32(volatile intptr_t *dst, intptr_t val, intptr_t *res) { __asm __volatile( "xchgl %2, %1; movl %2, %0" @@ -44,8 +44,8 @@ atomic_swap32(intptr_t *dst, intptr_t va } #define atomic_swap_ptr(d, v, r) \ - atomic_swap32((intptr_t *)d, (intptr_t)v, (intptr_t *)r) + atomic_swap32((volatile intptr_t *)d, (intptr_t)v, (intptr_t *)r) #define atomic_swap_int(d, v, r) \ - atomic_swap32((intptr_t *)d, (intptr_t)v, (intptr_t *)r) + atomic_swap32((volatile intptr_t *)d, (intptr_t)v, (intptr_t *)r) #endif Modified: stable/7/lib/libkse/arch/i386/include/pthread_md.h ============================================================================== --- stable/7/lib/libkse/arch/i386/include/pthread_md.h Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/arch/i386/include/pthread_md.h Tue Jun 9 15:09:10 2009 (r193835) @@ -246,7 +246,7 @@ _thread_switch(struct kcb *kcb, struct t if (setmbox != 0) _thr_setcontext(&tcb->tcb_tmbx.tm_context.uc_mcontext, (intptr_t)&tcb->tcb_tmbx, - (intptr_t *)&kcb->kcb_kmbx.km_curthread); + (intptr_t *)(void *)&kcb->kcb_kmbx.km_curthread); else _thr_setcontext(&tcb->tcb_tmbx.tm_context.uc_mcontext, 0, NULL); Modified: stable/7/lib/libkse/arch/ia64/include/atomic_ops.h ============================================================================== --- stable/7/lib/libkse/arch/ia64/include/atomic_ops.h Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/arch/ia64/include/atomic_ops.h Tue Jun 9 15:09:10 2009 (r193835) @@ -30,18 +30,18 @@ #define _ATOMIC_OPS_H_ static inline void -atomic_swap_int(int *dst, int val, int *res) +atomic_swap_int(volatile int *dst, int val, int *res) { __asm("xchg4 %0=[%2],%1" : "=r"(*res) : "r"(val), "r"(dst)); } static inline void -atomic_swap_long(long *dst, long val, long *res) +atomic_swap_long(volatile long *dst, long val, long *res) { __asm("xchg8 %0=[%2],%1" : "=r"(*res) : "r"(val), "r"(dst)); } #define atomic_swap_ptr(d,v,r) \ - atomic_swap_long((long*)d, (long)v, (long*)r) + atomic_swap_long((volatile long *)d, (long)v, (long *)r) #endif /* _ATOMIC_OPS_H_ */ Modified: stable/7/lib/libkse/arch/powerpc/include/atomic_ops.h ============================================================================== --- stable/7/lib/libkse/arch/powerpc/include/atomic_ops.h Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/arch/powerpc/include/atomic_ops.h Tue Jun 9 15:09:10 2009 (r193835) @@ -37,7 +37,7 @@ * void atomic_swap32(intptr_t *dst, intptr_t val, intptr_t *res); */ static inline void -atomic_swap32(intptr_t *dst, intptr_t val, intptr_t *res) +atomic_swap32(volatile intptr_t *dst, intptr_t val, intptr_t *res) { int tmp; @@ -55,8 +55,8 @@ atomic_swap32(intptr_t *dst, intptr_t va } #define atomic_swap_ptr(d, v, r) \ - atomic_swap32((intptr_t *)d, (intptr_t)v, (intptr_t *)r) + atomic_swap32((volatile intptr_t *)d, (intptr_t)v, (intptr_t *)r) #define atomic_swap_int(d, v, r) \ - atomic_swap32((intptr_t *)d, (intptr_t)v, (intptr_t *)r) + atomic_swap32((volatile intptr_t *)d, (intptr_t)v, (intptr_t *)r) #endif Modified: stable/7/lib/libkse/arch/powerpc/include/pthread_md.h ============================================================================== --- stable/7/lib/libkse/arch/powerpc/include/pthread_md.h Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/arch/powerpc/include/pthread_md.h Tue Jun 9 15:09:10 2009 (r193835) @@ -280,7 +280,7 @@ _thread_switch(struct kcb *kcb, struct t tcb->tcb_tmbx.tm_lwp = kcb->kcb_kmbx.km_lwp; if (setmbox) _ppc32_setcontext(mc, (intptr_t)&tcb->tcb_tmbx, - (intptr_t *)&kcb->kcb_kmbx.km_curthread); + (intptr_t *)(void *)&kcb->kcb_kmbx.km_curthread); else _ppc32_setcontext(mc, 0, NULL); } Modified: stable/7/lib/libkse/arch/sparc64/include/atomic_ops.h ============================================================================== --- stable/7/lib/libkse/arch/sparc64/include/atomic_ops.h Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/arch/sparc64/include/atomic_ops.h Tue Jun 9 15:09:10 2009 (r193835) @@ -38,7 +38,7 @@ * void atomic_swap_long(long *dst, long val, long *res); */ static __inline void -atomic_swap_long(long *dst, long val, long *res) +atomic_swap_long(volatile long *dst, long val, long *res) { long tmp; long r; @@ -54,7 +54,7 @@ atomic_swap_long(long *dst, long val, lo } static __inline void -atomic_swap_int(int *dst, int val, int *res) +atomic_swap_int(volatile int *dst, int val, int *res) { int tmp; int r; @@ -70,6 +70,6 @@ atomic_swap_int(int *dst, int val, int * } #define atomic_swap_ptr(dst, val, res) \ - atomic_swap_long((long *)dst, (long)val, (long *)res) + atomic_swap_long((volatile long *)dst, (long)val, (long *)res) #endif Modified: stable/7/lib/libkse/arch/sparc64/include/pthread_md.h ============================================================================== --- stable/7/lib/libkse/arch/sparc64/include/pthread_md.h Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/arch/sparc64/include/pthread_md.h Tue Jun 9 15:09:10 2009 (r193835) @@ -237,7 +237,7 @@ _thread_switch(struct kcb *kcb, struct t tcb->tcb_tmbx.tm_lwp = kcb->kcb_kmbx.km_lwp; if (setmbox) _thr_setcontext(mc, (intptr_t)&tcb->tcb_tmbx, - (intptr_t *)&kcb->kcb_kmbx.km_curthread); + (intptr_t *)(void *)&kcb->kcb_kmbx.km_curthread); else _thr_setcontext(mc, 0, NULL); } else { Modified: stable/7/lib/libkse/sys/lock.c ============================================================================== --- stable/7/lib/libkse/sys/lock.c Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/sys/lock.c Tue Jun 9 15:09:10 2009 (r193835) @@ -187,11 +187,12 @@ _lock_acquire(struct lock *lck, struct l * Atomically swap the head of the lock request with * this request. */ - atomic_swap_ptr(&lck->l_head, lu->lu_myreq, &lu->lu_watchreq); + atomic_swap_ptr((void *)&lck->l_head, lu->lu_myreq, + (void *)&lu->lu_watchreq); if (lu->lu_watchreq->lr_locked != 0) { atomic_store_rel_ptr - ((volatile uintptr_t *)&lu->lu_watchreq->lr_watcher, + ((volatile uintptr_t *)(void *)&lu->lu_watchreq->lr_watcher, (uintptr_t)lu); if ((lck->l_wait == NULL) || ((lck->l_type & LCK_ADAPTIVE) == 0)) { @@ -223,7 +224,7 @@ _lock_acquire(struct lock *lck, struct l if (lu->lu_watchreq->lr_active == 0) break; } - atomic_swap_int((int *)&lu->lu_watchreq->lr_locked, + atomic_swap_int(&lu->lu_watchreq->lr_locked, 2, &lval); if (lval == 0) lu->lu_watchreq->lr_locked = 0; @@ -262,18 +263,19 @@ _lock_release(struct lock *lck, struct l /* Update tail if our request is last. */ if (lu->lu_watchreq->lr_owner == NULL) { - atomic_store_rel_ptr((volatile uintptr_t *)&lck->l_tail, + atomic_store_rel_ptr((volatile uintptr_t *) + (void *)&lck->l_tail, (uintptr_t)lu->lu_myreq); - atomic_store_rel_ptr - ((volatile uintptr_t *)&lu->lu_myreq->lr_owner, + atomic_store_rel_ptr((volatile uintptr_t *) + (void *)&lu->lu_myreq->lr_owner, (uintptr_t)NULL); } else { /* Remove ourselves from the list. */ atomic_store_rel_ptr((volatile uintptr_t *) - &lu->lu_myreq->lr_owner, + (void *)&lu->lu_myreq->lr_owner, (uintptr_t)lu->lu_watchreq->lr_owner); atomic_store_rel_ptr((volatile uintptr_t *) - &lu->lu_watchreq->lr_owner->lu_myreq, + (void *)&lu->lu_watchreq->lr_owner->lu_myreq, (uintptr_t)lu->lu_myreq); } /* @@ -302,7 +304,7 @@ _lock_release(struct lock *lck, struct l /* Give the lock to the highest priority user. */ if (lck->l_wakeup != NULL) { atomic_swap_int( - (int *)&lu_h->lu_watchreq->lr_locked, + &lu_h->lu_watchreq->lr_locked, 0, &lval); if (lval == 2) /* Notify the sleeper */ @@ -314,7 +316,7 @@ _lock_release(struct lock *lck, struct l &lu_h->lu_watchreq->lr_locked, 0); } else { if (lck->l_wakeup != NULL) { - atomic_swap_int((int *)&myreq->lr_locked, + atomic_swap_int(&myreq->lr_locked, 0, &lval); if (lval == 2) /* Notify the sleeper */ @@ -335,7 +337,7 @@ _lock_release(struct lock *lck, struct l lu->lu_watchreq = NULL; lu->lu_myreq->lr_locked = 1; if (lck->l_wakeup) { - atomic_swap_int((int *)&myreq->lr_locked, 0, &lval); + atomic_swap_int(&myreq->lr_locked, 0, &lval); if (lval == 2) /* Notify the sleeper */ lck->l_wakeup(lck, myreq->lr_watcher); @@ -348,7 +350,7 @@ _lock_release(struct lock *lck, struct l } void -_lock_grant(struct lock *lck /* unused */, struct lockuser *lu) +_lock_grant(struct lock *lck __unused /* unused */, struct lockuser *lu) { atomic_store_rel_int(&lu->lu_watchreq->lr_locked, 3); } Modified: stable/7/lib/libkse/sys/thr_error.c ============================================================================== --- stable/7/lib/libkse/sys/thr_error.c Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/sys/thr_error.c Tue Jun 9 15:09:10 2009 (r193835) @@ -33,6 +33,7 @@ * * $FreeBSD$ */ +#include #include #include "libc_private.h" #include "thr_private.h" Modified: stable/7/lib/libkse/thread/thr_accept.c ============================================================================== --- stable/7/lib/libkse/thread/thr_accept.c Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/thread/thr_accept.c Tue Jun 9 15:09:10 2009 (r193835) @@ -35,6 +35,9 @@ __FBSDID("$FreeBSD$"); LT10_COMPAT_PRIVATE(__accept); LT10_COMPAT_DEFAULT(accept); +int __accept(int s, struct sockaddr *addr, socklen_t *addrlen); + + __weak_reference(__accept, accept); int Modified: stable/7/lib/libkse/thread/thr_aio_suspend.c ============================================================================== --- stable/7/lib/libkse/thread/thr_aio_suspend.c Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/thread/thr_aio_suspend.c Tue Jun 9 15:09:10 2009 (r193835) @@ -36,6 +36,11 @@ LT10_COMPAT_PRIVATE(_aio_suspend); LT10_COMPAT_DEFAULT(aio_suspend); + +int +_aio_suspend(const struct aiocb * const iocbs[], int niocb, const struct + timespec *timeout); + __weak_reference(_aio_suspend, aio_suspend); int Modified: stable/7/lib/libkse/thread/thr_atfork.c ============================================================================== --- stable/7/lib/libkse/thread/thr_atfork.c Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/thread/thr_atfork.c Tue Jun 9 15:09:10 2009 (r193835) @@ -25,10 +25,12 @@ * * $FreeBSD$ */ +#include "namespace.h" #include #include #include #include +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_atfork); Modified: stable/7/lib/libkse/thread/thr_attr_destroy.c ============================================================================== --- stable/7/lib/libkse/thread/thr_attr_destroy.c Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/thread/thr_attr_destroy.c Tue Jun 9 15:09:10 2009 (r193835) @@ -28,9 +28,11 @@ * * $FreeBSD$ */ +#include "namespace.h" #include #include #include +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_attr_destroy); Modified: stable/7/lib/libkse/thread/thr_attr_get_np.c ============================================================================== --- stable/7/lib/libkse/thread/thr_attr_get_np.c Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/thread/thr_attr_get_np.c Tue Jun 9 15:09:10 2009 (r193835) @@ -25,10 +25,13 @@ * * $FreeBSD$ */ + +#include "namespace.h" #include #include #include #include +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_attr_get_np); Modified: stable/7/lib/libkse/thread/thr_attr_getdetachstate.c ============================================================================== --- stable/7/lib/libkse/thread/thr_attr_getdetachstate.c Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/thread/thr_attr_getdetachstate.c Tue Jun 9 15:09:10 2009 (r193835) @@ -28,8 +28,10 @@ * * $FreeBSD$ */ +#include "namespace.h" #include #include +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_attr_getdetachstate); Modified: stable/7/lib/libkse/thread/thr_attr_getguardsize.c ============================================================================== --- stable/7/lib/libkse/thread/thr_attr_getguardsize.c Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/thread/thr_attr_getguardsize.c Tue Jun 9 15:09:10 2009 (r193835) @@ -29,8 +29,10 @@ * $FreeBSD$ */ +#include "namespace.h" #include #include +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_attr_getguardsize); Modified: stable/7/lib/libkse/thread/thr_attr_getinheritsched.c ============================================================================== --- stable/7/lib/libkse/thread/thr_attr_getinheritsched.c Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/thread/thr_attr_getinheritsched.c Tue Jun 9 15:09:10 2009 (r193835) @@ -31,8 +31,11 @@ * * $FreeBSD$ */ + +#include "namespace.h" #include #include +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_attr_getinheritsched); Modified: stable/7/lib/libkse/thread/thr_attr_getschedparam.c ============================================================================== --- stable/7/lib/libkse/thread/thr_attr_getschedparam.c Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/thread/thr_attr_getschedparam.c Tue Jun 9 15:09:10 2009 (r193835) @@ -31,8 +31,11 @@ * * $FreeBSD$ */ + +#include "namespace.h" #include #include +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_attr_getschedparam); Modified: stable/7/lib/libkse/thread/thr_attr_getschedpolicy.c ============================================================================== --- stable/7/lib/libkse/thread/thr_attr_getschedpolicy.c Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/thread/thr_attr_getschedpolicy.c Tue Jun 9 15:09:10 2009 (r193835) @@ -31,8 +31,11 @@ * * $FreeBSD$ */ + +#include "namespace.h" #include #include +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_attr_getschedpolicy); Modified: stable/7/lib/libkse/thread/thr_attr_getscope.c ============================================================================== --- stable/7/lib/libkse/thread/thr_attr_getscope.c Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/thread/thr_attr_getscope.c Tue Jun 9 15:09:10 2009 (r193835) @@ -31,8 +31,11 @@ * * $FreeBSD$ */ + +#include "namespace.h" #include #include +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_attr_getscope); Modified: stable/7/lib/libkse/thread/thr_attr_getstack.c ============================================================================== --- stable/7/lib/libkse/thread/thr_attr_getstack.c Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/thread/thr_attr_getstack.c Tue Jun 9 15:09:10 2009 (r193835) @@ -31,8 +31,11 @@ * * $FreeBSD$ */ + +#include "namespace.h" #include #include +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_attr_getstack); Modified: stable/7/lib/libkse/thread/thr_attr_getstackaddr.c ============================================================================== --- stable/7/lib/libkse/thread/thr_attr_getstackaddr.c Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/thread/thr_attr_getstackaddr.c Tue Jun 9 15:09:10 2009 (r193835) @@ -28,8 +28,11 @@ * * $FreeBSD$ */ + +#include "namespace.h" #include #include +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_attr_getstackaddr); Modified: stable/7/lib/libkse/thread/thr_attr_getstacksize.c ============================================================================== --- stable/7/lib/libkse/thread/thr_attr_getstacksize.c Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/thread/thr_attr_getstacksize.c Tue Jun 9 15:09:10 2009 (r193835) @@ -28,8 +28,11 @@ * * $FreeBSD$ */ + +#include "namespace.h" #include #include +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_attr_getstacksize); Modified: stable/7/lib/libkse/thread/thr_attr_init.c ============================================================================== --- stable/7/lib/libkse/thread/thr_attr_init.c Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/thread/thr_attr_init.c Tue Jun 9 15:09:10 2009 (r193835) @@ -28,10 +28,13 @@ * * $FreeBSD$ */ + +#include "namespace.h" #include #include #include #include +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_attr_init); Modified: stable/7/lib/libkse/thread/thr_attr_setcreatesuspend_np.c ============================================================================== --- stable/7/lib/libkse/thread/thr_attr_setcreatesuspend_np.c Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/thread/thr_attr_setcreatesuspend_np.c Tue Jun 9 15:09:10 2009 (r193835) @@ -28,13 +28,18 @@ * * $FreeBSD$ */ + +#include "namespace.h" #include #include +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_attr_setcreatesuspend_np); LT10_COMPAT_DEFAULT(pthread_attr_setcreatesuspend_np); +int _pthread_attr_setcreatesuspend_np(pthread_attr_t *attr); + __weak_reference(_pthread_attr_setcreatesuspend_np, pthread_attr_setcreatesuspend_np); int Modified: stable/7/lib/libkse/thread/thr_attr_setdetachstate.c ============================================================================== --- stable/7/lib/libkse/thread/thr_attr_setdetachstate.c Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/thread/thr_attr_setdetachstate.c Tue Jun 9 15:09:10 2009 (r193835) @@ -28,8 +28,11 @@ * * $FreeBSD$ */ + +#include "namespace.h" #include #include +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_attr_setdetachstate); Modified: stable/7/lib/libkse/thread/thr_attr_setguardsize.c ============================================================================== --- stable/7/lib/libkse/thread/thr_attr_setguardsize.c Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/thread/thr_attr_setguardsize.c Tue Jun 9 15:09:10 2009 (r193835) @@ -29,9 +29,11 @@ * $FreeBSD$ */ +#include "namespace.h" #include #include #include +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_attr_setguardsize); Modified: stable/7/lib/libkse/thread/thr_attr_setinheritsched.c ============================================================================== --- stable/7/lib/libkse/thread/thr_attr_setinheritsched.c Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/thread/thr_attr_setinheritsched.c Tue Jun 9 15:09:10 2009 (r193835) @@ -31,8 +31,11 @@ * * $FreeBSD$ */ + +#include "namespace.h" #include #include +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_attr_setinheritsched); Modified: stable/7/lib/libkse/thread/thr_attr_setschedparam.c ============================================================================== --- stable/7/lib/libkse/thread/thr_attr_setschedparam.c Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/thread/thr_attr_setschedparam.c Tue Jun 9 15:09:10 2009 (r193835) @@ -31,8 +31,11 @@ * * $FreeBSD$ */ + +#include "namespace.h" #include #include +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_attr_setschedparam); Modified: stable/7/lib/libkse/thread/thr_attr_setschedpolicy.c ============================================================================== --- stable/7/lib/libkse/thread/thr_attr_setschedpolicy.c Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/thread/thr_attr_setschedpolicy.c Tue Jun 9 15:09:10 2009 (r193835) @@ -31,8 +31,11 @@ * * $FreeBSD$ */ + +#include "namespace.h" #include #include +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_attr_setschedpolicy); Modified: stable/7/lib/libkse/thread/thr_attr_setscope.c ============================================================================== --- stable/7/lib/libkse/thread/thr_attr_setscope.c Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/thread/thr_attr_setscope.c Tue Jun 9 15:09:10 2009 (r193835) @@ -31,8 +31,11 @@ * * $FreeBSD$ */ + +#include "namespace.h" #include #include +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_attr_setscope); Modified: stable/7/lib/libkse/thread/thr_attr_setstack.c ============================================================================== --- stable/7/lib/libkse/thread/thr_attr_setstack.c Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/thread/thr_attr_setstack.c Tue Jun 9 15:09:10 2009 (r193835) @@ -31,8 +31,11 @@ * * $FreeBSD$ */ + +#include "namespace.h" #include #include +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_attr_setstack); Modified: stable/7/lib/libkse/thread/thr_attr_setstackaddr.c ============================================================================== --- stable/7/lib/libkse/thread/thr_attr_setstackaddr.c Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/thread/thr_attr_setstackaddr.c Tue Jun 9 15:09:10 2009 (r193835) @@ -28,8 +28,11 @@ * * $FreeBSD$ */ + +#include "namespace.h" #include #include +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_attr_setstackaddr); Modified: stable/7/lib/libkse/thread/thr_attr_setstacksize.c ============================================================================== --- stable/7/lib/libkse/thread/thr_attr_setstacksize.c Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/thread/thr_attr_setstacksize.c Tue Jun 9 15:09:10 2009 (r193835) @@ -28,8 +28,11 @@ * * $FreeBSD$ */ + +#include "namespace.h" #include #include +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_attr_setstacksize); Modified: stable/7/lib/libkse/thread/thr_barrier.c ============================================================================== --- stable/7/lib/libkse/thread/thr_barrier.c Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/thread/thr_barrier.c Tue Jun 9 15:09:10 2009 (r193835) @@ -26,9 +26,9 @@ * $FreeBSD$ */ +#include "namespace.h" #include #include -#include "namespace.h" #include #include "un-namespace.h" #include "thr_private.h" @@ -65,7 +65,7 @@ _pthread_barrier_destroy(pthread_barrier int _pthread_barrier_init(pthread_barrier_t *barrier, - const pthread_barrierattr_t *attr, unsigned count) + const pthread_barrierattr_t *attr __unused, unsigned count) { pthread_barrier_t bar; int ret; Modified: stable/7/lib/libkse/thread/thr_barrierattr.c ============================================================================== --- stable/7/lib/libkse/thread/thr_barrierattr.c Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/thread/thr_barrierattr.c Tue Jun 9 15:09:10 2009 (r193835) @@ -28,9 +28,11 @@ * $FreeBSD$ */ +#include "namespace.h" #include #include #include +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_barrierattr_destroy); Modified: stable/7/lib/libkse/thread/thr_cancel.c ============================================================================== --- stable/7/lib/libkse/thread/thr_cancel.c Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/thread/thr_cancel.c Tue Jun 9 15:09:10 2009 (r193835) @@ -2,8 +2,10 @@ * David Leonard , 1999. Public domain. * $FreeBSD$ */ +#include "namespace.h" #include #include +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_cancel); @@ -53,7 +55,7 @@ testcancel(struct pthread *curthread) THR_THREAD_UNLOCK(curthread, curthread); _thr_exit_cleanup(); - pthread_exit(PTHREAD_CANCELED); + _pthread_exit(PTHREAD_CANCELED); PANIC("cancel"); } } @@ -214,7 +216,7 @@ _pthread_setcancelstate(int state, int * THR_THREAD_UNLOCK(curthread, curthread); if (need_exit != 0) { _thr_exit_cleanup(); - pthread_exit(PTHREAD_CANCELED); + _pthread_exit(PTHREAD_CANCELED); PANIC("cancel"); } if (ret == 0 && oldstate != NULL) @@ -252,7 +254,7 @@ _pthread_setcanceltype(int type, int *ol THR_THREAD_UNLOCK(curthread, curthread); if (need_exit != 0) { _thr_exit_cleanup(); - pthread_exit(PTHREAD_CANCELED); + _pthread_exit(PTHREAD_CANCELED); PANIC("cancel"); } if (ret == 0 && oldtype != NULL) @@ -293,7 +295,7 @@ _thr_cancel_leave(struct pthread *thread } void -_thr_finish_cancellation(void *arg) +_thr_finish_cancellation(void *arg __unused) { struct pthread *curthread = _get_curthread(); @@ -305,7 +307,7 @@ _thr_finish_cancellation(void *arg) curthread->cancelflags &= ~THR_CANCEL_NEEDED; THR_THREAD_UNLOCK(curthread, curthread); _thr_exit_cleanup(); - pthread_exit(PTHREAD_CANCELED); + _pthread_exit(PTHREAD_CANCELED); } THR_THREAD_UNLOCK(curthread, curthread); } Modified: stable/7/lib/libkse/thread/thr_clean.c ============================================================================== --- stable/7/lib/libkse/thread/thr_clean.c Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/thread/thr_clean.c Tue Jun 9 15:09:10 2009 (r193835) @@ -28,10 +28,13 @@ * * $FreeBSD$ */ + +#include "namespace.h" #include #include #include #include +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_cleanup_push); Modified: stable/7/lib/libkse/thread/thr_close.c ============================================================================== --- stable/7/lib/libkse/thread/thr_close.c Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/thread/thr_close.c Tue Jun 9 15:09:10 2009 (r193835) @@ -28,17 +28,22 @@ * * $FreeBSD$ */ + +#include "namespace.h" #include #include #include #include #include #include +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(__close); LT10_COMPAT_DEFAULT(close); +int __close(int fd); + __weak_reference(__close, close); int Modified: stable/7/lib/libkse/thread/thr_concurrency.c ============================================================================== --- stable/7/lib/libkse/thread/thr_concurrency.c Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/thread/thr_concurrency.c Tue Jun 9 15:09:10 2009 (r193835) @@ -26,10 +26,13 @@ * * $FreeBSD$ */ + +#include "namespace.h" #include #include #include #include +#include "un-namespace.h" #include "thr_private.h" Modified: stable/7/lib/libkse/thread/thr_cond.c ============================================================================== --- stable/7/lib/libkse/thread/thr_cond.c Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/thread/thr_cond.c Tue Jun 9 15:09:10 2009 (r193835) @@ -28,10 +28,13 @@ * * $FreeBSD$ */ + +#include "namespace.h" #include #include #include #include +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(__pthread_cond_wait); @@ -63,6 +66,10 @@ static void cond_wait_backout(void *); static inline void check_continuation(struct pthread *, struct pthread_cond *, pthread_mutex_t *); +int __pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex); +int __pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex, + const struct timespec *abstime); + /* * Double underscore versions are cancellation points. Single underscore * versions are not and are provided for libc internal usage (which @@ -197,7 +204,7 @@ _pthread_cond_wait(pthread_cond_t *cond, * perform the dynamic initialization: */ if (*cond == NULL && - (rval = pthread_cond_init(cond, NULL)) != 0) + (rval = _pthread_cond_init(cond, NULL)) != 0) return (rval); if (!_kse_isthreaded()) @@ -395,7 +402,7 @@ _pthread_cond_timedwait(pthread_cond_t * * If the condition variable is statically initialized, perform dynamic * initialization. */ - if (*cond == NULL && (rval = pthread_cond_init(cond, NULL)) != 0) + if (*cond == NULL && (rval = _pthread_cond_init(cond, NULL)) != 0) return (rval); if (!_kse_isthreaded()) @@ -596,7 +603,7 @@ _pthread_cond_signal(pthread_cond_t * co * If the condition variable is statically initialized, perform dynamic * initialization. */ - else if (*cond != NULL || (rval = pthread_cond_init(cond, NULL)) == 0) { + else if (*cond != NULL || (rval = _pthread_cond_init(cond, NULL)) == 0) { /* Lock the condition variable structure: */ THR_LOCK_ACQUIRE(curthread, &(*cond)->c_lock); @@ -665,7 +672,7 @@ _pthread_cond_broadcast(pthread_cond_t * * If the condition variable is statically initialized, perform dynamic * initialization. */ - else if (*cond != NULL || (rval = pthread_cond_init(cond, NULL)) == 0) { + else if (*cond != NULL || (rval = _pthread_cond_init(cond, NULL)) == 0) { /* Lock the condition variable structure: */ THR_LOCK_ACQUIRE(curthread, &(*cond)->c_lock); Modified: stable/7/lib/libkse/thread/thr_condattr_destroy.c ============================================================================== --- stable/7/lib/libkse/thread/thr_condattr_destroy.c Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/thread/thr_condattr_destroy.c Tue Jun 9 15:09:10 2009 (r193835) @@ -28,9 +28,12 @@ * * $FreeBSD$ */ + +#include "namespace.h" #include #include #include +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_condattr_destroy); Modified: stable/7/lib/libkse/thread/thr_condattr_init.c ============================================================================== --- stable/7/lib/libkse/thread/thr_condattr_init.c Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/thread/thr_condattr_init.c Tue Jun 9 15:09:10 2009 (r193835) @@ -28,10 +28,13 @@ * * $FreeBSD$ */ + +#include "namespace.h" #include #include #include #include +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_condattr_init); Modified: stable/7/lib/libkse/thread/thr_condattr_pshared.c ============================================================================== --- stable/7/lib/libkse/thread/thr_condattr_pshared.c Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/thread/thr_condattr_pshared.c Tue Jun 9 15:09:10 2009 (r193835) @@ -30,6 +30,9 @@ #include #include "thr_private.h" +int _pthread_condattr_getpshared(const pthread_condattr_t *attr, int *pshared); +int _pthread_condattr_setpshared(pthread_condattr_t *attr, int pshared); + __weak_reference(_pthread_condattr_getpshared, pthread_condattr_getpshared); __weak_reference(_pthread_condattr_setpshared, pthread_condattr_setpshared); Modified: stable/7/lib/libkse/thread/thr_connect.c ============================================================================== --- stable/7/lib/libkse/thread/thr_connect.c Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/thread/thr_connect.c Tue Jun 9 15:09:10 2009 (r193835) @@ -35,6 +35,8 @@ __FBSDID("$FreeBSD$"); LT10_COMPAT_PRIVATE(__connect); LT10_COMPAT_DEFAULT(connect); +int __connect(int fd, const struct sockaddr *name, socklen_t namelen); + __weak_reference(__connect, connect); int Modified: stable/7/lib/libkse/thread/thr_creat.c ============================================================================== --- stable/7/lib/libkse/thread/thr_creat.c Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/thread/thr_creat.c Tue Jun 9 15:09:10 2009 (r193835) @@ -29,8 +29,10 @@ * $FreeBSD$ */ +#include "namespace.h" #include #include +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(___creat); @@ -38,6 +40,8 @@ LT10_COMPAT_DEFAULT(creat); extern int __creat(const char *, mode_t); +int ___creat(const char *path, mode_t mode); + __weak_reference(___creat, creat); int Modified: stable/7/lib/libkse/thread/thr_create.c ============================================================================== --- stable/7/lib/libkse/thread/thr_create.c Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/thread/thr_create.c Tue Jun 9 15:09:10 2009 (r193835) @@ -29,6 +29,8 @@ * * $FreeBSD$ */ + +#include "namespace.h" #include #include #include @@ -38,6 +40,7 @@ #include #include #include +#include "un-namespace.h" #include "thr_private.h" #include "libc_private.h" @@ -334,11 +337,11 @@ free_stack(struct pthread_attr *pattr) } static void -thread_start(struct pthread *curthread, void *(*start_routine) (void *), +thread_start(struct pthread *curthread __unused, void *(*start_routine) (void *), void *arg) { /* Run the current thread's start routine with argument: */ - pthread_exit(start_routine(arg)); + _pthread_exit(start_routine(arg)); /* This point should never be reached. */ PANIC("Thread has resumed after exit"); Modified: stable/7/lib/libkse/thread/thr_detach.c ============================================================================== --- stable/7/lib/libkse/thread/thr_detach.c Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/thread/thr_detach.c Tue Jun 9 15:09:10 2009 (r193835) @@ -28,10 +28,12 @@ * * $FreeBSD$ */ +#include "namespace.h" #include #include #include #include +#include "un-namespace.h" #include "thr_private.h" LT10_COMPAT_PRIVATE(_pthread_detach); Modified: stable/7/lib/libkse/thread/thr_equal.c ============================================================================== --- stable/7/lib/libkse/thread/thr_equal.c Tue Jun 9 15:03:22 2009 (r193834) +++ stable/7/lib/libkse/thread/thr_equal.c Tue Jun 9 15:09:10 2009 (r193835) @@ -28,7 +28,10 @@ * * $FreeBSD$ */ + *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***