niansa-misc/glibc
1
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-03-06 20:58:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Revert "hppa: Drop 16-byte pthread lock alignment"

Browse source 
This change reverts commits c4468cd399
and ab991a3d1b.
This commit is contained in:
John David Anglin 2023-07-06 15:47:50 +00:00
parent 2fb12bbd09
commit 5000549746
2 changed files with 3 additions and 9 deletions

2
sysdeps/hppa/nptl/bits/pthreadtypes-arch.h
View file

@ -40,7 +40,7 @@
#define __SIZEOF_PTHREAD_RWLOCK_T 64 #define __SIZEOF_PTHREAD_RWLOCK_T 64
#define __SIZEOF_PTHREAD_RWLOCKATTR_T 8 #define __SIZEOF_PTHREAD_RWLOCKATTR_T 8
#define __LOCK_ALIGNMENT #define __LOCK_ALIGNMENT __attribute__ ((__aligned__(16)))
#define __ONCE_ALIGNMENT #define __ONCE_ALIGNMENT
#endif /* bits/pthreadtypes.h */ #endif /* bits/pthreadtypes.h */

10
sysdeps/hppa/nptl/bits/struct_rwlock.h
View file

@ -25,14 +25,8 @@ struct __pthread_rwlock_arch_t
/* In the old Linuxthreads pthread_rwlock_t, this is the /* In the old Linuxthreads pthread_rwlock_t, this is the
start of the 4-word 16-byte aligned lock structure. The start of the 4-word 16-byte aligned lock structure. The
next four words are all set to 1 by the Linuxthreads next four words are all set to 1 by the Linuxthreads
PTHREAD_RWLOCK_INITIALIZER. We ignore them in NPTL. PTHREAD_RWLOCK_INITIALIZER. We ignore them in NPTL. */
int __compat_padding[4] __attribute__ ((__aligned__(16)));
The 16-byte aligned lock structure is not needed for NPTL.
It causes some package builds to fail (e.g., protobuf) and
issues with dynamic memory allocation in C++ versions prior
to C++17. Removing it allows for more efficient allocators
and better compatibility with other architectures. */
int __compat_padding[4];
unsigned int __readers; unsigned int __readers;
unsigned int __writers; unsigned int __writers;
unsigned int __wrphase_futex; unsigned int __wrphase_futex;