diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-06-28 09:51:01 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-06-28 09:51:01 +0200 |
| commit | 30639e79d3370243ee5ef3a029204a4c71e15856 (patch) | |
| tree | 4e3f8d5501fbcb5ab1155a3a6cd7f8161863055c /sysdeps/unix/sysv/linux/timer_routines.c | |
| parent | 477910b83e5ef3b3aa78b11808433846989461c8 (diff) | |
| download | glibc-30639e79d3370243ee5ef3a029204a4c71e15856.tar glibc-30639e79d3370243ee5ef3a029204a4c71e15856.tar.gz glibc-30639e79d3370243ee5ef3a029204a4c71e15856.tar.bz2 glibc-30639e79d3370243ee5ef3a029204a4c71e15856.zip | |
Linux: Cleanups after librt move
librt.so is no longer installed for PTHREAD_IN_LIBC, and tests
are not linked against it. $(librt) is introduced globally for
shared tests that need to be linked for both PTHREAD_IN_LIBC
and !PTHREAD_IN_LIBC.
GLIBC_PRIVATE symbols that were needed during the transition are
removed again.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'sysdeps/unix/sysv/linux/timer_routines.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/timer_routines.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sysdeps/unix/sysv/linux/timer_routines.c b/sysdeps/unix/sysv/linux/timer_routines.c index e0bb169370..30ad32b4fc 100644 --- a/sysdeps/unix/sysv/linux/timer_routines.c +++ b/sysdeps/unix/sysv/linux/timer_routines.c @@ -26,13 +26,10 @@ /* List of active SIGEV_THREAD timers. */ -struct timer *__timer_active_sigev_thread __attribute__ ((nocommon)); -libc_hidden_data_def (__timer_active_sigev_thread) +struct timer *__timer_active_sigev_thread; /* Lock for _timer_active_sigev_thread. */ -pthread_mutex_t __timer_active_sigev_thread_lock __attribute__ ((nocommon)) - = PTHREAD_MUTEX_INITIALIZER; -libc_hidden_data_def (__timer_active_sigev_thread_lock) +pthread_mutex_t __timer_active_sigev_thread_lock = PTHREAD_MUTEX_INITIALIZER; struct thread_start_data { @@ -112,12 +109,10 @@ timer_helper_thread (void *arg) /* Control variable for helper thread creation. */ pthread_once_t __timer_helper_once __attribute__ ((nocommon)) = PTHREAD_ONCE_INIT; -libc_hidden_data_def (__timer_helper_once) /* TID of the helper thread. */ pid_t __timer_helper_tid __attribute__ ((nocommon)); -libc_hidden_data_def (__timer_helper_tid) /* Reset variables so that after a fork a new helper thread gets started. */ @@ -159,4 +154,3 @@ __timer_start_helper_thread (void) /* No need for the attribute anymore. */ __pthread_attr_destroy (&attr); } -libc_hidden_def (__timer_start_helper_thread) |