conformtest: Clean up expectations for POSIX for pthread.h.

diff --git a/ChangeLog b/ChangeLog
index 8126706..9833df6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,18 @@
 2013-09-24  Joseph Myers  <joseph@codesourcery.com>
+
+       * conform/data/pthread.h-data [POSIX] (PTHREAD_MUTEX_INITIALIZER):
+       Expect macro.
+       [POSIX] (pthread_attr_t): Do not require type.
+       [POSIX] (pthread_cond_t): Likewise.
+       [POSIX] (pthread_condattr_t): Likewise.
+       [POSIX] (pthread_key_t): Likewise.
+       [POSIX] (pthread_mutex_t): Likewise.
+       [POSIX] (pthread_mutexattr_t): Likewise.
+       [POSIX] (pthread_once_t): Likewise.
+       [POSIX] (pthread_t): Likewise.
+       [POSIX-based standards] (pthread_atfork): Expect function.
+
+2013-09-24  Joseph Myers  <joseph@codesourcery.com>
            Richard Sandiford  <richard@codesourcery.com>
 
        * locale/programs/locfile.h: Include <byteswap.h> and <stdbool.h>.

diff --git a/conform/data/pthread.h-data b/conform/data/pthread.h-data
index 292b125..c1e32c8 100644 (file)
--- a/conform/data/pthread.h-data
+++ b/conform/data/pthread.h-data
@@ -17,11 +17,11 @@ constant PTHREAD_PROCESS_SHARED
 constant PTHREAD_PROCESS_PRIVATE
 constant PTHREAD_SCOPE_PROCESS
 constant PTHREAD_SCOPE_SYSTEM
+macro PTHREAD_MUTEX_INITIALIZER
 # ifndef POSIX
 constant PTHREAD_MUTEX_DEFAULT
 constant PTHREAD_MUTEX_ERRORCHECK
 constant PTHREAD_MUTEX_NORMAL
-macro PTHREAD_MUTEX_INITIALIZER
 constant PTHREAD_MUTEX_RECURSIVE
 macro PTHREAD_RWLOCK_INITIALIZER
 # endif
@@ -30,26 +30,27 @@ constant PTHREAD_MUTEX_ROBUST
 constant PTHREAD_MUTEX_STALLED
 # endif
 
+# ifndef POSIX
 type pthread_attr_t
-# if !defined POSIX && !defined UNIX98
+#  ifndef UNIX98
 type pthread_barrier_t
 type pthread_barrierattr_t
-# endif
+#  endif
 type pthread_cond_t
 type pthread_condattr_t
 type pthread_key_t
 type pthread_mutex_t
 type pthread_mutexattr_t
 type pthread_once_t
-# if !defined POSIX
 type pthread_rwlock_t
 type pthread_rwlockattr_t
-# endif
-# if !defined POSIX && !defined UNIX98
+#  ifndef UNIX98
 type pthread_spinlock_t
-# endif
+#  endif
 type pthread_t
+# endif
 
+function int pthread_atfork (void (*) (void), void (*) (void), void (*) (void))
 function int pthread_attr_destroy (pthread_attr_t*)
 function int pthread_attr_getdetachstate (const pthread_attr_t*, int*)
 # ifndef POSIX