diff options
| author | gfleury <gfleury@disroot.org> | 2024-11-26 22:53:27 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2024-12-09 02:03:18 +0100 |
| commit | ebd85cdc4ad93a7dfff17fcffaf84336fdd676ce (patch) | |
| tree | 7e39145f90a2c327ed533a2b1221f4361ff12584 /sysdeps/htl | |
| parent | 25699c4c3ab7617fc3506ee0a6123881c78812ea (diff) | |
| download | glibc-ebd85cdc4ad93a7dfff17fcffaf84336fdd676ce.tar.xz glibc-ebd85cdc4ad93a7dfff17fcffaf84336fdd676ce.zip | |
htl: move pthread_condattr_init into libc.
Signed-off-by: gfleury <gfleury@disroot.org>
Message-ID: <20241126205329.2215295-6-gfleury@disroot.org>
Diffstat (limited to 'sysdeps/htl')
| -rw-r--r-- | sysdeps/htl/pt-condattr-init.c | 7 | ||||
| -rw-r--r-- | sysdeps/htl/pthread-functions.h | 2 | ||||
| -rw-r--r-- | sysdeps/htl/pthreadP.h | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/sysdeps/htl/pt-condattr-init.c b/sysdeps/htl/pt-condattr-init.c index 4f7486a2f5..7ffa1622b5 100644 --- a/sysdeps/htl/pt-condattr-init.c +++ b/sysdeps/htl/pt-condattr-init.c @@ -17,6 +17,7 @@ <https://www.gnu.org/licenses/>. */ #include <pthread.h> +#include <shlib-compat.h> #include <pt-internal.h> int @@ -27,5 +28,9 @@ __pthread_condattr_init (pthread_condattr_t *attr) *attr = __pthread_default_condattr; return 0; } +libc_hidden_def (__pthread_condattr_init) +versioned_symbol (libc, __pthread_condattr_init, pthread_condattr_init, GLIBC_2_21); -weak_alias (__pthread_condattr_init, pthread_condattr_init); +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_21) +compat_symbol (libc, __pthread_condattr_init, pthread_condattr_init, GLIBC_2_12); +#endif diff --git a/sysdeps/htl/pthread-functions.h b/sysdeps/htl/pthread-functions.h index 6bd01682bb..8ee01d3ff4 100644 --- a/sysdeps/htl/pthread-functions.h +++ b/sysdeps/htl/pthread-functions.h @@ -21,7 +21,6 @@ #include <pthread.h> -int __pthread_condattr_init (pthread_condattr_t *); int __pthread_cond_broadcast (pthread_cond_t *); int __pthread_cond_destroy (pthread_cond_t *); int __pthread_cond_init (pthread_cond_t *, @@ -57,7 +56,6 @@ int _cthreads_ftrylockfile (FILE *); so if possible avoid breaking it and append new hooks to the end. */ struct pthread_functions { - int (*ptr_pthread_condattr_init) (pthread_condattr_t *); int (*ptr_pthread_cond_broadcast) (pthread_cond_t *); int (*ptr_pthread_cond_destroy) (pthread_cond_t *); int (*ptr_pthread_cond_init) (pthread_cond_t *, diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h index 68e6cf17b0..afdf2cbd9f 100644 --- a/sysdeps/htl/pthreadP.h +++ b/sysdeps/htl/pthreadP.h @@ -98,11 +98,13 @@ int __pthread_attr_getstack (const pthread_attr_t *, void **, size_t *); libc_hidden_proto (__pthread_attr_getstack) void __pthread_testcancel (void); int __pthread_attr_init (pthread_attr_t *attr); +int __pthread_condattr_init (pthread_condattr_t *attr); #define __pthread_raise_internal(__sig) raise (__sig) libc_hidden_proto (__pthread_self) libc_hidden_proto (__pthread_attr_init) +libc_hidden_proto (__pthread_condattr_init) #if IS_IN (libpthread) hidden_proto (__pthread_create) |