lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00
Code Activity

nptl: Remove rwlock elision definitions

Browse Source 
The new rwlock implementation added by cc25c8b4c1 (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
This commit is contained in:
Adhemerval Zanella
2019-11-04 16:14:04 +00:00
parent 48dbce60cf
commit 0377a7fde6
17 changed files with 7 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sysdeps/aarch64/nptl/bits/pthreadtypes-arch.h
View File

@ -66,6 +66,4 @@ struct __pthread_rwlock_arch_t
unsigned int __flags; unsigned int __flags;
}; };
#define __PTHREAD_RWLOCK_ELISION_EXTRA 0
#endif /* bits/pthreadtypes.h */ #endif /* bits/pthreadtypes.h */

2
sysdeps/alpha/nptl/bits/pthreadtypes-arch.h
View File

@ -56,6 +56,4 @@ struct __pthread_rwlock_arch_t
unsigned int __flags; unsigned int __flags;
}; };
#define __PTHREAD_RWLOCK_ELISION_EXTRA 0
#endif /* bits/pthreadtypes.h */ #endif /* bits/pthreadtypes.h */

2
sysdeps/arm/nptl/bits/pthreadtypes-arch.h
View File

@ -66,6 +66,4 @@ struct __pthread_rwlock_arch_t
int __cur_writer; int __cur_writer;
}; };
#define __PTHREAD_RWLOCK_ELISION_EXTRA 0
#endif /* bits/pthreadtypes.h */ #endif /* bits/pthreadtypes.h */

2
sysdeps/csky/nptl/bits/pthreadtypes-arch.h
View File

@ -65,6 +65,4 @@ struct __pthread_rwlock_arch_t
int __cur_writer; int __cur_writer;
}; };
#define __PTHREAD_RWLOCK_ELISION_EXTRA 0
#endif #endif

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

@ -86,6 +86,4 @@ struct __pthread_rwlock_arch_t
int __reserved4; int __reserved4;
}; };
#define __PTHREAD_RWLOCK_ELISION_EXTRA 0
#endif /* bits/pthreadtypes.h */ #endif /* bits/pthreadtypes.h */

2
sysdeps/ia64/nptl/bits/pthreadtypes-arch.h
View File

@ -58,6 +58,4 @@ struct __pthread_rwlock_arch_t
unsigned int __flags; unsigned int __flags;
}; };
#define __PTHREAD_RWLOCK_ELISION_EXTRA 0
#endif /* bits/pthreadtypes.h */ #endif /* bits/pthreadtypes.h */

2
sysdeps/m68k/nptl/bits/pthreadtypes-arch.h
View File

@ -58,6 +58,4 @@ struct __pthread_rwlock_arch_t
int __cur_writer; int __cur_writer;
}; };
#define __PTHREAD_RWLOCK_ELISION_EXTRA 0
#endif /* bits/pthreadtypes.h */ #endif /* bits/pthreadtypes.h */

2
sysdeps/microblaze/nptl/bits/pthreadtypes-arch.h
View File

@ -67,6 +67,4 @@ struct __pthread_rwlock_arch_t
int __cur_writer; int __cur_writer;
}; };
# define __PTHREAD_RWLOCK_ELISION_EXTRA 0
#endif /* bits/pthreadtypes.h. */ #endif /* bits/pthreadtypes.h. */

2
sysdeps/mips/nptl/bits/pthreadtypes-arch.h
View File

@ -84,6 +84,4 @@ struct __pthread_rwlock_arch_t
#endif #endif
}; };
#define __PTHREAD_RWLOCK_ELISION_EXTRA 0
#endif /* bits/pthreadtypes.h */ #endif /* bits/pthreadtypes.h */

2
sysdeps/nios2/nptl/bits/pthreadtypes-arch.h
View File

@ -67,6 +67,4 @@ struct __pthread_rwlock_arch_t
int __cur_writer; int __cur_writer;
}; };
#define __PTHREAD_RWLOCK_ELISION_EXTRA 0
#endif /* bits/pthreadtypes.h */ #endif /* bits/pthreadtypes.h */

6
sysdeps/nptl/pthread.h
View File

@ -131,17 +131,17 @@ enum
/* Read-write lock initializers. */ /* Read-write lock initializers. */
# define PTHREAD_RWLOCK_INITIALIZER \ # define PTHREAD_RWLOCK_INITIALIZER \
{ { 0, 0, 0, 0, 0, 0, 0, 0, __PTHREAD_RWLOCK_ELISION_EXTRA, 0, 0 } } { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
# ifdef __USE_GNU # ifdef __USE_GNU
# ifdef __PTHREAD_RWLOCK_INT_FLAGS_SHARED # ifdef __PTHREAD_RWLOCK_INT_FLAGS_SHARED
# define PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP \ # define PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP \
{ { 0, 0, 0, 0, 0, 0, 0, 0, __PTHREAD_RWLOCK_ELISION_EXTRA, 0, \ { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP } } PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP } }
# else # else
# if __BYTE_ORDER == __LITTLE_ENDIAN # if __BYTE_ORDER == __LITTLE_ENDIAN
# define PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP \ # define PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP \
{ { 0, 0, 0, 0, 0, 0, PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP, \ { { 0, 0, 0, 0, 0, 0, PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP, \
0, __PTHREAD_RWLOCK_ELISION_EXTRA, 0, 0 } } 0, 0, 0, 0 } }
# else # else
# define PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP \ # define PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP \
{ { 0, 0, 0, 0, 0, 0, 0, 0, 0, PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP,\ { { 0, 0, 0, 0, 0, 0, 0, 0, 0, PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP,\

7
sysdeps/powerpc/nptl/bits/pthreadtypes-arch.h
View File

@ -59,22 +59,19 @@ struct __pthread_rwlock_arch_t
#if __WORDSIZE == 64 #if __WORDSIZE == 64
int __cur_writer; int __cur_writer;
int __shared; int __shared;
unsigned char __rwelision; unsigned long int __pad1;
unsigned char __pad1[7];
unsigned long int __pad2; unsigned long int __pad2;
/* FLAGS must stay at this position in the structure to maintain /* FLAGS must stay at this position in the structure to maintain
binary compatibility. */ binary compatibility. */
unsigned int __flags; unsigned int __flags;
# define __PTHREAD_RWLOCK_ELISION_EXTRA 0, {0, 0, 0, 0, 0, 0, 0 }
#else #else
unsigned char __rwelision; unsigned char __pad1;
unsigned char __pad2; unsigned char __pad2;
unsigned char __shared; unsigned char __shared;
/* FLAGS must stay at this position in the structure to maintain /* FLAGS must stay at this position in the structure to maintain
binary compatibility. */ binary compatibility. */
unsigned char __flags; unsigned char __flags;
int __cur_writer; int __cur_writer;
# define __PTHREAD_RWLOCK_ELISION_EXTRA 0
#endif #endif
}; };

2
sysdeps/riscv/nptl/bits/pthreadtypes-arch.h
View File

@ -63,6 +63,4 @@ struct __pthread_rwlock_arch_t
unsigned int __flags; unsigned int __flags;
}; };
#define __PTHREAD_RWLOCK_ELISION_EXTRA 0
#endif /* bits/pthreadtypes.h */ #endif /* bits/pthreadtypes.h */

2
sysdeps/s390/nptl/bits/pthreadtypes-arch.h
View File

@ -74,6 +74,4 @@ struct __pthread_rwlock_arch_t
#endif #endif
}; };
#define __PTHREAD_RWLOCK_ELISION_EXTRA 0
#endif /* bits/pthreadtypes.h */ #endif /* bits/pthreadtypes.h */

2
sysdeps/sh/nptl/bits/pthreadtypes-arch.h
View File

@ -66,6 +66,4 @@ struct __pthread_rwlock_arch_t
unsigned long int __cur_writer; unsigned long int __cur_writer;
}; };
#define __PTHREAD_RWLOCK_ELISION_EXTRA 0
#endif /* bits/pthreadtypes.h */ #endif /* bits/pthreadtypes.h */

2
sysdeps/sparc/nptl/bits/pthreadtypes-arch.h
View File

@ -76,6 +76,4 @@ struct __pthread_rwlock_arch_t
#endif #endif
}; };
#define __PTHREAD_RWLOCK_ELISION_EXTRA 0
#endif /* bits/pthreadtypes.h */ #endif /* bits/pthreadtypes.h */

12
sysdeps/x86/nptl/bits/pthreadtypes-arch.h
View File

@ -73,14 +73,7 @@ struct __pthread_rwlock_arch_t
#ifdef __x86_64__ #ifdef __x86_64__
int __cur_writer; int __cur_writer;
int __shared; int __shared;
signed char __rwelision; unsigned long int __pad1;
# 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 __pad2; unsigned long int __pad2;
/* FLAGS must stay at this position in the structure to maintain /* FLAGS must stay at this position in the structure to maintain
binary compatibility. */ binary compatibility. */
@ -91,8 +84,7 @@ struct __pthread_rwlock_arch_t
binary compatibility. */ binary compatibility. */
unsigned char __flags; unsigned char __flags;
unsigned char __shared; unsigned char __shared;
signed char __rwelision; unsigned char __pad1;
# define __PTHREAD_RWLOCK_ELISION_EXTRA 0
unsigned char __pad2; unsigned char __pad2;
int __cur_writer; int __cur_writer;
#endif #endif