nptl: Move __default_pthread_attr, __default_pthread_attr_lock into libc

The GLIBC_PRIVATE exports for these symbols are expected to be
temporary.

Tested-by: Carlos O'Donell <carlos@redhat.com>
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
This commit is contained in:
Florian Weimer 2021-05-10 10:31:42 +02:00
parent 652c7c6fe7
commit 8c1c0da3a8
4 changed files with 14 additions and 6 deletions

View File

@ -170,6 +170,7 @@ routines = \
sem_wait \
tpp \
unwind \
vars \
shared-only-routines = forward
static-only-routines = pthread_atfork
@ -212,7 +213,6 @@ libpthread-routines = \
pthread_sigqueue \
pthread_timedjoin \
pthread_tryjoin \
vars \
version \
libpthread-shared-only-routines = \

View File

@ -298,6 +298,8 @@ libc {
tss_set;
}
GLIBC_PRIVATE {
__default_pthread_attr;
__default_pthread_attr_lock;
__futex_abstimed_wait64;
__futex_abstimed_wait_cancelable64;
__init_sched_fifo_prio;

View File

@ -198,9 +198,11 @@ enum
/* Default pthread attributes. */
extern union pthread_attr_transparent __default_pthread_attr attribute_hidden;
extern int __default_pthread_attr_lock attribute_hidden;
/* Called from __libpthread_freeres to deallocate the default attribute. */
extern union pthread_attr_transparent __default_pthread_attr;
libc_hidden_proto (__default_pthread_attr)
extern int __default_pthread_attr_lock;
libc_hidden_proto (__default_pthread_attr_lock)
/* Called from __libc_freeres to deallocate the default attribute. */
extern void __default_pthread_attr_freeres (void) attribute_hidden;
/* Size and alignment of static TLS block. */

View File

@ -22,7 +22,11 @@
/* Default thread attributes for the case when the user does not
provide any. */
union pthread_attr_transparent __default_pthread_attr attribute_hidden;
union pthread_attr_transparent __default_pthread_attr
__attribute__ ((nocommon));
libc_hidden_data_def (__default_pthread_attr)
/* Mutex protecting __default_pthread_attr. */
int __default_pthread_attr_lock = LLL_LOCK_INITIALIZER;
int __default_pthread_attr_lock __attribute__ ((nocommon))
= LLL_LOCK_INITIALIZER;
libc_hidden_data_def (__default_pthread_attr_lock)