1 files changed, 59 insertions, 76 deletions

diff --git a/include/pthread.h b/include/pthread.h
index 1a04da9149f1..c6356dea32b3 100644
--- a/include/pthread.h
+++ b/include/pthread.h
@@ -144,23 +144,19 @@ struct _pthread_cleanup_info {
  */
 __BEGIN_DECLS
 int		pthread_atfork(void (*)(void), void (*)(void), void (*)(void));
-int		pthread_attr_destroy(pthread_attr_t *) __nonnull(1);
+int		pthread_attr_destroy(pthread_attr_t *);
 int		pthread_attr_getstack(const pthread_attr_t * __restrict, 
-			void ** __restrict, size_t * __restrict)
-			__nonnull(1, 2, 3);
-int		pthread_attr_getstacksize(const pthread_attr_t *, size_t *)
-			__nonnull(1, 2);
+			void ** __restrict, size_t * __restrict);
+int		pthread_attr_getstacksize(const pthread_attr_t *, size_t *);
 int		pthread_attr_getguardsize(const pthread_attr_t *, size_t *);
 int		pthread_attr_getstackaddr(const pthread_attr_t *, void **);
-int		pthread_attr_getdetachstate(const pthread_attr_t *, int *)
-			__nonnull(1, 2);
-int		pthread_attr_init(pthread_attr_t *) __nonnull(1);
-int		pthread_attr_setstacksize(pthread_attr_t *, size_t) __nonnull(1);
-int		pthread_attr_setguardsize(pthread_attr_t *, size_t) __nonnull(1);
-int		pthread_attr_setstack(pthread_attr_t *, void *, size_t)
-			__nonnull(1);
+int		pthread_attr_getdetachstate(const pthread_attr_t *, int *);
+int		pthread_attr_init(pthread_attr_t *);
+int		pthread_attr_setstacksize(pthread_attr_t *, size_t);
+int		pthread_attr_setguardsize(pthread_attr_t *, size_t);
+int		pthread_attr_setstack(pthread_attr_t *, void *, size_t);
 int		pthread_attr_setstackaddr(pthread_attr_t *, void *);
-int		pthread_attr_setdetachstate(pthread_attr_t *, int) __nonnull(1);
+int		pthread_attr_setdetachstate(pthread_attr_t *, int);
 int		pthread_barrier_destroy(pthread_barrier_t *);
 int		pthread_barrier_init(pthread_barrier_t *,
 			const pthread_barrierattr_t *, unsigned);
@@ -168,7 +164,7 @@ int		pthread_barrier_wait(pthread_barrier_t *);
 int		pthread_barrierattr_destroy(pthread_barrierattr_t *);
 int		pthread_barrierattr_getpshared(const pthread_barrierattr_t *,
 			int *);
-int		pthread_barrierattr_init(pthread_barrierattr_t *) __nonnull(1);
+int		pthread_barrierattr_init(pthread_barrierattr_t *);
 int		pthread_barrierattr_setpshared(pthread_barrierattr_t *, int);
 
 #define		pthread_cleanup_push(cleanup_routine, cleanup_arg)		\
@@ -184,96 +180,85 @@ int		pthread_barrierattr_setpshared(pthread_barrierattr_t *, int);
 			__pthread_cleanup_pop_imp(execute);			\
 		}
 
-int		pthread_condattr_destroy(pthread_condattr_t *) __nonnull(1);
+int		pthread_condattr_destroy(pthread_condattr_t *);
 int		pthread_condattr_getclock(const pthread_condattr_t *,
-			clockid_t *) __nonnull(1, 2);
-int		pthread_condattr_getpshared(const pthread_condattr_t *, int *)
-			__nonnull(1, 2);
-int		pthread_condattr_init(pthread_condattr_t *) __nonnull(1);
-int		pthread_condattr_setclock(pthread_condattr_t *, clockid_t)
-			__nonnull(1);
-int		pthread_condattr_setpshared(pthread_condattr_t *, int)
-			__nonnull(1);
-int		pthread_cond_broadcast(pthread_cond_t *)
-			__nonnull(1);
-int		pthread_cond_destroy(pthread_cond_t *)
-			__nonnull(1);
+			clockid_t *);
+int		pthread_condattr_getpshared(const pthread_condattr_t *, int *);
+int		pthread_condattr_init(pthread_condattr_t *);
+int		pthread_condattr_setclock(pthread_condattr_t *, clockid_t);
+int		pthread_condattr_setpshared(pthread_condattr_t *, int);
+int		pthread_cond_broadcast(pthread_cond_t *);
+int		pthread_cond_destroy(pthread_cond_t *);
 int		pthread_cond_init(pthread_cond_t *,
-			const pthread_condattr_t *) __nonnull(1);
-int		pthread_cond_signal(pthread_cond_t *) __nonnull(1);
+			const pthread_condattr_t *);
+int		pthread_cond_signal(pthread_cond_t *);
 int		pthread_cond_timedwait(pthread_cond_t *,
 			pthread_mutex_t *__mutex, const struct timespec *)
-			__nonnull(1, 2, 3) __requires_exclusive(*__mutex);
+		    __requires_exclusive(*__mutex);
 int		pthread_cond_wait(pthread_cond_t *, pthread_mutex_t *__mutex)
-			__nonnull(1, 2) __requires_exclusive(*__mutex);
+		    __requires_exclusive(*__mutex);
 int		pthread_create(pthread_t *, const pthread_attr_t *,
-			void *(*) (void *), void *) __nonnull(1, 3);
+			void *(*) (void *), void *);
 int		pthread_detach(pthread_t);
 int		pthread_equal(pthread_t, pthread_t);
 void		pthread_exit(void *) __dead2;
 void		*pthread_getspecific(pthread_key_t);
-int		pthread_getcpuclockid(pthread_t, clockid_t *) __nonnull(2);
+int		pthread_getcpuclockid(pthread_t, clockid_t *);
 int		pthread_join(pthread_t, void **);
 int		pthread_key_create(pthread_key_t *,
-			void (*) (void *)) __nonnull(1);
+			void (*) (void *));
 int		pthread_key_delete(pthread_key_t);
-int		pthread_mutexattr_init(pthread_mutexattr_t *) __nonnull(1);
-int		pthread_mutexattr_destroy(pthread_mutexattr_t *) __nonnull(1);
+int		pthread_mutexattr_init(pthread_mutexattr_t *);
+int		pthread_mutexattr_destroy(pthread_mutexattr_t *);
 int		pthread_mutexattr_getpshared(const pthread_mutexattr_t *,
-			int *) __nonnull(1, 2);
-int		pthread_mutexattr_gettype(pthread_mutexattr_t *, int *)
-			__nonnull(1, 2);
-int		pthread_mutexattr_settype(pthread_mutexattr_t *, int)
-			__nonnull(1);
-int		pthread_mutexattr_setpshared(pthread_mutexattr_t *, int)
-			__nonnull(1);
+			int *);
+int		pthread_mutexattr_gettype(pthread_mutexattr_t *, int *);
+int		pthread_mutexattr_settype(pthread_mutexattr_t *, int);
+int		pthread_mutexattr_setpshared(pthread_mutexattr_t *, int);
 int		pthread_mutex_destroy(pthread_mutex_t *__mutex)
-		    __nonnull(1) __requires_unlocked(*__mutex);
+		    __requires_unlocked(*__mutex);
 int		pthread_mutex_init(pthread_mutex_t *__mutex,
 			const pthread_mutexattr_t *)
-		    __nonnull(1) __requires_unlocked(*__mutex);
+		    __requires_unlocked(*__mutex);
 int		pthread_mutex_lock(pthread_mutex_t *__mutex)
-                    __nonnull(1) __locks_exclusive(*__mutex);
+                    __locks_exclusive(*__mutex);
 int		pthread_mutex_trylock(pthread_mutex_t *__mutex)
-                    __nonnull(1) __trylocks_exclusive(0, *__mutex);
+                    __trylocks_exclusive(0, *__mutex);
 int		pthread_mutex_timedlock(pthread_mutex_t *__mutex,
 			const struct timespec *)
-                    __nonnull(1, 2) __trylocks_exclusive(0, *__mutex);
+                    __trylocks_exclusive(0, *__mutex);
 int		pthread_mutex_unlock(pthread_mutex_t *__mutex)
-		    __nonnull(1) __unlocks(*__mutex);
-int		pthread_once(pthread_once_t *, void (*) (void)) __nonnull(1, 2);
+		    __unlocks(*__mutex);
+int		pthread_once(pthread_once_t *, void (*) (void));
 int		pthread_rwlock_destroy(pthread_rwlock_t *__rwlock)
-		    __nonnull(1) __requires_unlocked(*__rwlock);
+		    __requires_unlocked(*__rwlock);
 int		pthread_rwlock_init(pthread_rwlock_t *__rwlock,
 			const pthread_rwlockattr_t *)
-		    __nonnull(1) __requires_unlocked(*__rwlock);
+		    __requires_unlocked(*__rwlock);
 int		pthread_rwlock_rdlock(pthread_rwlock_t *__rwlock)
-                    __nonnull(1) __locks_shared(*__rwlock);
+                    __locks_shared(*__rwlock);
 int		pthread_rwlock_timedrdlock(pthread_rwlock_t *__rwlock,
 			const struct timespec *)
-                    __nonnull(1, 2) __trylocks_shared(0, *__rwlock);
+                    __trylocks_shared(0, *__rwlock);
 int		pthread_rwlock_timedwrlock(pthread_rwlock_t *__rwlock,
 			const struct timespec *)
-                    __nonnull(1, 2) __trylocks_exclusive(0, *__rwlock);
+                    __trylocks_exclusive(0, *__rwlock);
 int		pthread_rwlock_tryrdlock(pthread_rwlock_t *__rwlock)
-                    __nonnull(1) __trylocks_shared(0, *__rwlock);
+                    __trylocks_shared(0, *__rwlock);
 int		pthread_rwlock_trywrlock(pthread_rwlock_t *__rwlock)
-                    __nonnull(1) __trylocks_exclusive(0, *__rwlock);
+                    __trylocks_exclusive(0, *__rwlock);
 int		pthread_rwlock_unlock(pthread_rwlock_t *__rwlock)
-		    __nonnull(1) __unlocks(*__rwlock);
+		    __unlocks(*__rwlock);
 int		pthread_rwlock_wrlock(pthread_rwlock_t *__rwlock)
-                    __nonnull(1) __locks_exclusive(*__rwlock);
-int		pthread_rwlockattr_destroy(pthread_rwlockattr_t *)
-		    __nonnull(1);
+                    __locks_exclusive(*__rwlock);
+int		pthread_rwlockattr_destroy(pthread_rwlockattr_t *);
 int		pthread_rwlockattr_getkind_np(const pthread_rwlockattr_t *,
 			int *);
 int		pthread_rwlockattr_getpshared(const pthread_rwlockattr_t *,
-			int *) __nonnull(1, 2);
-int		pthread_rwlockattr_init(pthread_rwlockattr_t *)
-		    __nonnull(1);
+			int *);
+int		pthread_rwlockattr_init(pthread_rwlockattr_t *);
 int		pthread_rwlockattr_setkind_np(pthread_rwlockattr_t *, int);
-int		pthread_rwlockattr_setpshared(pthread_rwlockattr_t *, int)
-		    __nonnull(1);
+int		pthread_rwlockattr_setpshared(pthread_rwlockattr_t *, int);
 pthread_t	pthread_self(void);
 int		pthread_setspecific(pthread_key_t, const void *);
 
@@ -310,20 +295,18 @@ int		pthread_mutexattr_setprotocol(pthread_mutexattr_t *, int);
 
 int		pthread_attr_getinheritsched(const pthread_attr_t *, int *);
 int		pthread_attr_getschedparam(const pthread_attr_t *,
-			struct sched_param *) __nonnull(1, 2);
-int		pthread_attr_getschedpolicy(const pthread_attr_t *, int *)
-			__nonnull(1, 2);
-int		pthread_attr_getscope(const pthread_attr_t *, int *)
-			__nonnull(1, 2);
+			struct sched_param *);
+int		pthread_attr_getschedpolicy(const pthread_attr_t *, int *);
+int		pthread_attr_getscope(const pthread_attr_t *, int *);
 int		pthread_attr_setinheritsched(pthread_attr_t *, int);
 int		pthread_attr_setschedparam(pthread_attr_t *,
-			const struct sched_param *) __nonnull(1, 2);
-int		pthread_attr_setschedpolicy(pthread_attr_t *, int) __nonnull(1);
-int		pthread_attr_setscope(pthread_attr_t *, int) __nonnull(1);
+			const struct sched_param *);
+int		pthread_attr_setschedpolicy(pthread_attr_t *, int);
+int		pthread_attr_setscope(pthread_attr_t *, int);
 int		pthread_getschedparam(pthread_t pthread, int *,
-			struct sched_param *) __nonnull(2, 3);
+			struct sched_param *);
 int		pthread_setschedparam(pthread_t, int,
-			const struct sched_param *) __nonnull(3);
+			const struct sched_param *);
 #if __XSI_VISIBLE
 int		pthread_getconcurrency(void);
 int		pthread_setconcurrency(int);