diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2019-11-04 16:14:04 +0000 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2019-11-26 13:53:36 +0000 |
| commit | 0377a7fde6dfcc078dda29a1225d7720a0931357 (patch) | |
| tree | b8e4201c1c67042d6187ccdb1a7b4d02f5c7958a /sysdeps/x86 | |
| parent | 48dbce60cfdd328b671aaa9ee0c54ded3246ece9 (diff) | |
| download | glibc-0377a7fde6dfcc078dda29a1225d7720a0931357.tar.gz glibc-0377a7fde6dfcc078dda29a1225d7720a0931357.tar.xz glibc-0377a7fde6dfcc078dda29a1225d7720a0931357.zip | |
nptl: Remove rwlock elision definitions
The new rwlock implementation added by cc25c8b4c1196 (2.25) removed support for lock-elision. This patch removes remaining the arch-specific unused definitions. Checked with a build against all affected ABIs. Change-Id: I5dec8af50e3cd56d7351c52ceff4aa3771b53cd6
Diffstat (limited to 'sysdeps/x86')
| -rw-r--r-- | sysdeps/x86/nptl/bits/pthreadtypes-arch.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/sysdeps/x86/nptl/bits/pthreadtypes-arch.h b/sysdeps/x86/nptl/bits/pthreadtypes-arch.h index 97361b0a80..1f05ca088c 100644 --- a/sysdeps/x86/nptl/bits/pthreadtypes-arch.h +++ b/sysdeps/x86/nptl/bits/pthreadtypes-arch.h @@ -73,14 +73,7 @@ struct __pthread_rwlock_arch_t #ifdef __x86_64__ int __cur_writer; int __shared; - signed char __rwelision; -# ifdef __ILP32__ - unsigned char __pad1[3]; -# define __PTHREAD_RWLOCK_ELISION_EXTRA 0, { 0, 0, 0 } -# else - unsigned char __pad1[7]; -# define __PTHREAD_RWLOCK_ELISION_EXTRA 0, { 0, 0, 0, 0, 0, 0, 0 } -# endif + unsigned long int __pad1; unsigned long int __pad2; /* FLAGS must stay at this position in the structure to maintain binary compatibility. */ @@ -91,8 +84,7 @@ struct __pthread_rwlock_arch_t binary compatibility. */ unsigned char __flags; unsigned char __shared; - signed char __rwelision; -# define __PTHREAD_RWLOCK_ELISION_EXTRA 0 + unsigned char __pad1; unsigned char __pad2; int __cur_writer; #endif |