From a234e27dba9abdce3ba999479b024a4c7843422b Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 1 May 2003 07:38:32 +0000 Subject: Update. 2003-05-01 Ulrich Drepper * malloc/malloc.c (mSTATs): Call ptmalloc_init if necessary. 2003-04-29 Andreas Schwab * string/test-strcat.c (do_one_test): Fix attribute name. --- .../sysdeps/unix/sysv/linux/ia64/bits/pthreadtypes.h | 2 +- .../unix/sysv/linux/powerpc/bits/pthreadtypes.h | 20 +++++++++++++++++++- .../sysdeps/unix/sysv/linux/s390/bits/pthreadtypes.h | 4 ++-- 3 files changed, 22 insertions(+), 4 deletions(-) (limited to 'nptl/sysdeps') diff --git a/nptl/sysdeps/unix/sysv/linux/ia64/bits/pthreadtypes.h b/nptl/sysdeps/unix/sysv/linux/ia64/bits/pthreadtypes.h index 5b4127c76b..d3a5c91545 100644 --- a/nptl/sysdeps/unix/sysv/linux/ia64/bits/pthreadtypes.h +++ b/nptl/sysdeps/unix/sysv/linux/ia64/bits/pthreadtypes.h @@ -103,7 +103,7 @@ typedef int pthread_once_t; structure of the attribute type is not exposed on purpose. */ typedef union { -struct + struct { int __lock; unsigned int __nr_readers; diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h b/nptl/sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h index 728712a8c6..fb4533633d 100644 --- a/nptl/sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h +++ b/nptl/sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h @@ -95,7 +95,7 @@ typedef union unsigned long long int __woken_seq; } __data; char __size[__SIZEOF_PTHREAD_COND_T]; - long int __align; + long long int __align; } pthread_cond_t; typedef union @@ -118,6 +118,7 @@ typedef int pthread_once_t; structure of the attribute type is deliberately not exposed. */ typedef union { +# if __WORDSIZE == 64 struct { int __lock; @@ -127,10 +128,27 @@ typedef union unsigned int __nr_readers_queued; unsigned int __nr_writers_queued; pthread_t __writer; + unsigned long int __pad1; + unsigned long int __pad2; + /* FLAGS must stay at this position in the structure to maintain + binary compatibility. */ + unsigned int __flags; + } __data; +# else + struct + { + int __lock; + unsigned int __nr_readers; + unsigned int __readers_wakeup; + unsigned int __writer_wakeup; + unsigned int __nr_readers_queued; + unsigned int __nr_writers_queued; /* FLAGS must stay at this position in the structure to maintain binary compatibility. */ unsigned int __flags; + pthread_t __writer; } __data; +# endif char __size[__SIZEOF_PTHREAD_RWLOCK_T]; long int __align; } pthread_rwlock_t; diff --git a/nptl/sysdeps/unix/sysv/linux/s390/bits/pthreadtypes.h b/nptl/sysdeps/unix/sysv/linux/s390/bits/pthreadtypes.h index aae8e90cdc..13dccc66dc 100644 --- a/nptl/sysdeps/unix/sysv/linux/s390/bits/pthreadtypes.h +++ b/nptl/sysdeps/unix/sysv/linux/s390/bits/pthreadtypes.h @@ -94,7 +94,7 @@ typedef union unsigned long long int __woken_seq; } __data; char __size[__SIZEOF_PTHREAD_COND_T]; - long int __align; + long long int __align; } pthread_cond_t; typedef union @@ -118,7 +118,7 @@ typedef int pthread_once_t; typedef union { # if __WORDSIZE == 64 -struct + struct { int __lock; unsigned int __nr_readers; -- cgit v1.2.3