diff options
| author | gfleury <gfleury@disroot.org> | 2024-11-26 22:53:23 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2024-12-09 01:49:40 +0100 |
| commit | c982918e3ed0277564b152ab07ab0fa6efc8cfbd (patch) | |
| tree | 0a13a6c06db48e37db1a44939bd21e310bec189c /sysdeps | |
| parent | 3a9b4b4aeb7d7d9a26166b6b23a9fd762e1ffaa4 (diff) | |
| download | glibc-c982918e3ed0277564b152ab07ab0fa6efc8cfbd.zip glibc-c982918e3ed0277564b152ab07ab0fa6efc8cfbd.tar.gz glibc-c982918e3ed0277564b152ab07ab0fa6efc8cfbd.tar.bz2 | |
htl: move pthread_condattr_destroy into libc.
Signed-off-by: gfleury <gfleury@disroot.org>
Message-ID: <20241126205329.2215295-2-gfleury@disroot.org>
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/htl/pt-condattr-destroy.c | 6 | ||||
| -rw-r--r-- | sysdeps/htl/pthread-functions.h | 2 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/i386/libc.abilist | 1 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/i386/libpthread.abilist | 1 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/x86_64/libpthread.abilist | 1 |
5 files changed, 6 insertions, 5 deletions
diff --git a/sysdeps/htl/pt-condattr-destroy.c b/sysdeps/htl/pt-condattr-destroy.c index dc6a667..ec7ee52 100644 --- a/sysdeps/htl/pt-condattr-destroy.c +++ b/sysdeps/htl/pt-condattr-destroy.c @@ -17,6 +17,7 @@ <https://www.gnu.org/licenses/>. */ #include <pthread.h> +#include <shlib-compat.h> #include <pt-internal.h> int @@ -24,5 +25,8 @@ __pthread_condattr_destroy (pthread_condattr_t *cond) { return 0; } +versioned_symbol (libc, __pthread_condattr_destroy, pthread_condattr_destroy, GLIBC_2_21); -weak_alias (__pthread_condattr_destroy, pthread_condattr_destroy); +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_21) +compat_symbol (libc, __pthread_condattr_destroy, pthread_condattr_destroy, GLIBC_2_12); +#endif diff --git a/sysdeps/htl/pthread-functions.h b/sysdeps/htl/pthread-functions.h index d380d17..6bd0168 100644 --- a/sysdeps/htl/pthread-functions.h +++ b/sysdeps/htl/pthread-functions.h @@ -21,7 +21,6 @@ #include <pthread.h> -int __pthread_condattr_destroy (pthread_condattr_t *); int __pthread_condattr_init (pthread_condattr_t *); int __pthread_cond_broadcast (pthread_cond_t *); int __pthread_cond_destroy (pthread_cond_t *); @@ -58,7 +57,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_destroy) (pthread_condattr_t *); int (*ptr_pthread_condattr_init) (pthread_condattr_t *); int (*ptr_pthread_cond_broadcast) (pthread_cond_t *); int (*ptr_pthread_cond_destroy) (pthread_cond_t *); diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist index 101d5b8..5069319 100644 --- a/sysdeps/mach/hurd/i386/libc.abilist +++ b/sysdeps/mach/hurd/i386/libc.abilist @@ -49,6 +49,7 @@ GLIBC_2.12 pthread_attr_setscope F GLIBC_2.12 pthread_attr_setstack F GLIBC_2.12 pthread_attr_setstackaddr F GLIBC_2.12 pthread_attr_setstacksize F +GLIBC_2.12 pthread_condattr_destroy F GLIBC_2.12 pthread_equal F GLIBC_2.12 pthread_getschedparam F GLIBC_2.12 pthread_self F diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist index 4e287c2..7000b00 100644 --- a/sysdeps/mach/hurd/i386/libpthread.abilist +++ b/sysdeps/mach/hurd/i386/libpthread.abilist @@ -36,7 +36,6 @@ GLIBC_2.12 pthread_cond_init F GLIBC_2.12 pthread_cond_signal F GLIBC_2.12 pthread_cond_timedwait F GLIBC_2.12 pthread_cond_wait F -GLIBC_2.12 pthread_condattr_destroy F GLIBC_2.12 pthread_condattr_getclock F GLIBC_2.12 pthread_condattr_getpshared F GLIBC_2.12 pthread_condattr_init F diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist index 3396ea9..91da561 100644 --- a/sysdeps/mach/hurd/x86_64/libpthread.abilist +++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist @@ -55,7 +55,6 @@ GLIBC_2.38 pthread_cond_init F GLIBC_2.38 pthread_cond_signal F GLIBC_2.38 pthread_cond_timedwait F GLIBC_2.38 pthread_cond_wait F -GLIBC_2.38 pthread_condattr_destroy F GLIBC_2.38 pthread_condattr_getclock F GLIBC_2.38 pthread_condattr_getpshared F GLIBC_2.38 pthread_condattr_init F |