about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2013-09-24 22:09:04 +0000
committerJoseph Myers <joseph@codesourcery.com>2013-09-24 22:09:04 +0000
commita03d8ea77f9b8292efb8f8fc49a573c637124e49 (patch)
tree734edbbc220ea501b563b8c2a126971ed1166588
parent6055173a0f2733ea4fc2825afd295156143fca79 (diff)
downloadglibc-a03d8ea77f9b8292efb8f8fc49a573c637124e49.tar.gz
glibc-a03d8ea77f9b8292efb8f8fc49a573c637124e49.tar.xz
glibc-a03d8ea77f9b8292efb8f8fc49a573c637124e49.zip
conformtest: Clean up expectations for POSIX for pthread.h.
-rw-r--r--ChangeLog14
-rw-r--r--conform/data/pthread.h-data15
2 files changed, 22 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 8126706d91..9833df6c7c 100644
--- 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 292b12520b..c1e32c8d01 100644
--- 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