diff options
| -rw-r--r-- | ChangeLog | 37 | ||||
| -rw-r--r-- | conform/data/pthread.h-data | 20 | ||||
| -rw-r--r-- | conform/data/sys/types.h-data | 6 |
3 files changed, 55 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index 379daee9f2..e89b69a2f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,42 @@ 2012-11-07 Joseph Myers <joseph@codesourcery.com> + * conform/data/pthread.h-data [XPG3 || XPG4]: Disable all + expectations. + [UNIX98] (pthread_barrier_t): Do not expect. + [UNIX98] (pthread_barrierattr_t): Likewise. + [UNIX98] (pthread_spinlock_t): Likewise. + [UNIX98] (pthread_barrier_destroy): Likewise. + [UNIX98] (pthread_barrier_init): Likewise. + [UNIX98] (pthread_barrier_wait): Likewise. + [UNIX98] (pthread_barrierattr_destroy): Likewise. + [UNIX98] (pthread_barrierattr_getpshared): Likewise. + [UNIX98] (pthread_barrierattr_init): Likewise. + [UNIX98] (pthread_barrierattr_setpshared): Likewise. + [UNIX98] (pthread_getcpuclockid): Likewise. + [UNIX98] (pthread_mutex_timedlock): Likewise. + [UNIX98] (pthread_rwlock_timedrdlock): Likewise. + [UNIX98] (pthread_rwlock_timedwrlock): Likewise. + [UNIX98] (pthread_sigmask): Likewise. + [UNIX98] (pthread_spin_destroy): Likewise. + [UNIX98] (pthread_spin_init): Likewise. + [UNIX98] (pthread_spin_lock): Likewise. + [UNIX98] (pthread_spin_trylock): Likewise. + [UNIX98] (pthread_spin_unlock): Likewise. + * conform/data/sys/types.h-data [XPG3 || XPG4] (pthread_attr_t): + Do not expect. + [XPG3 || XPG4 || UNIX98] (pthread_barrier_t): Likewise. + [XPG3 || XPG4 || UNIX98] (pthread_barrierattr_t): Likewise. + [XPG3 || XPG4] (pthread_cond_t): Likewise. + [XPG3 || XPG4] (pthread_condattr_t): Likewise. + [XPG3 || XPG4] (pthread_key_t): Likewise. + [XPG3 || XPG4] (pthread_mutex_t): Likewise. + [XPG3 || XPG4] (pthread_mutexattr_t): Likewise. + [XPG3 || XPG4] (pthread_once_t): Likewise. + [XPG3 || XPG4] (pthread_rwlock_t): Likewise. + [XPG3 || XPG4] (pthread_rwlockattr_t): Likewise. + [XPG3 || XPG4 || UNIX98] (pthread_spinlock_t): Likewise. + [XPG3 || XPG4] (pthread_t): Likewise. + * conform/data/stdlib.h-data [XPG3 || XPG4 || UNIX98] (setenv): Do not expect. [XPG3 || XPG4 || UNIX98] (unsetenv): Likewise. diff --git a/conform/data/pthread.h-data b/conform/data/pthread.h-data index 4af4d05b5b..292b12520b 100644 --- a/conform/data/pthread.h-data +++ b/conform/data/pthread.h-data @@ -1,4 +1,4 @@ -#if !defined ISO && !defined ISO99 && !defined ISO11 +#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined XPG3 && !defined XPG4 constant PTHREAD_CANCEL_ASYNCHRONOUS constant PTHREAD_CANCEL_ENABLE constant PTHREAD_CANCEL_DEFERRED @@ -31,7 +31,7 @@ constant PTHREAD_MUTEX_STALLED # endif type pthread_attr_t -# if !defined POSIX +# if !defined POSIX && !defined UNIX98 type pthread_barrier_t type pthread_barrierattr_t # endif @@ -44,6 +44,8 @@ type pthread_once_t # if !defined POSIX type pthread_rwlock_t type pthread_rwlockattr_t +# endif +# if !defined POSIX && !defined UNIX98 type pthread_spinlock_t # endif type pthread_t @@ -70,7 +72,7 @@ function int pthread_attr_setschedpolicy (pthread_attr_t*, int) function int pthread_attr_setscope (pthread_attr_t*, int) function int pthread_attr_setstackaddr (pthread_attr_t*, void*) function int pthread_attr_setstacksize (pthread_attr_t*, size_t) -# if !defined POSIX +# if !defined POSIX && !defined UNIX98 function int pthread_barrier_destroy (pthread_barrier_t*) function int pthread_barrier_init (pthread_barrier_t*, const pthread_barrierattr_t*, unsigned int) function int pthread_barrier_wait (pthread_barrier_t*) @@ -107,7 +109,7 @@ function void pthread_exit (void*) # if !defined POSIX && !defined POSIX2008 function int pthread_getconcurrency (void) # endif -# if !defined POSIX +# if !defined POSIX && !defined UNIX98 function int pthread_getcpuclockid (pthread_t, clockid_t*) # endif function int pthread_getschedparam (pthread_t, int*, struct sched_param*) @@ -120,7 +122,7 @@ optional-function int pthread_mutex_getprioceiling (const pthread_mutex_t*, int* function int pthread_mutex_init (pthread_mutex_t*, const pthread_mutexattr_t*) function int pthread_mutex_lock (pthread_mutex_t*) optional-function int pthread_mutex_setprioceiling (pthread_mutex_t*, int, int*) -# if !defined POSIX +# if !defined POSIX && !defined UNIX98 function int pthread_mutex_timedlock (pthread_mutex_t*, const struct timespec*) # endif function int pthread_mutex_trylock (pthread_mutex_t*) @@ -143,8 +145,12 @@ function int pthread_once (pthread_once_t*, void (*) (void)) # if !defined POSIX function int pthread_rwlock_init (pthread_rwlock_t*, const pthread_rwlockattr_t*) function int pthread_rwlock_rdlock (pthread_rwlock_t*) +# endif +# if !defined POSIX && !defined UNIX98 function int pthread_rwlock_timedrdlock (pthread_rwlock_t*, const struct timespec*) function int pthread_rwlock_timedwrlock (pthread_rwlock_t*, const struct timespec*) +# endif +# if !defined POSIX function int pthread_rwlock_tryrdlock (pthread_rwlock_t*) function int pthread_rwlock_trywrlock (pthread_rwlock_t*) function int pthread_rwlock_unlock (pthread_rwlock_t*) @@ -162,10 +168,10 @@ function int pthread_setconcurrency (int) # endif function int pthread_setschedparam (pthread_t, int, const struct sched_param*) function int pthread_setspecific (pthread_key_t, const void*) -# if !defined POSIX && !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008 +# if !defined POSIX && !defined UNIX98 && !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX2008 function int pthread_sigmask (int, const sigset_t*, sigset_t*) # endif -# if !defined POSIX +# if !defined POSIX && !defined UNIX98 function int pthread_spin_destroy (pthread_spinlock_t*) function int pthread_spin_init (pthread_spinlock_t*, int) function int pthread_spin_lock (pthread_spinlock_t*) diff --git a/conform/data/sys/types.h-data b/conform/data/sys/types.h-data index 824392d498..cda19548a7 100644 --- a/conform/data/sys/types.h-data +++ b/conform/data/sys/types.h-data @@ -22,8 +22,9 @@ type mode_t type nlink_t type off_t type pid_t +#if !defined XPG3 && !defined XPG4 type pthread_attr_t -#if !defined POSIX +#if !defined POSIX && !defined UNIX98 type pthread_barrier_t type pthread_barrierattr_t #endif @@ -36,9 +37,12 @@ type pthread_once_t #if !defined POSIX type pthread_rwlock_t type pthread_rwlockattr_t +#endif +#if !defined POSIX && !defined UNIX98 type pthread_spinlock_t #endif type pthread_t +#endif type size_t type ssize_t # if !defined POSIX && !defined POSIX2008 |