mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-12-15 04:20:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

htl: move pthread_condattr_destroy into libc.

Browse Source 
Signed-off-by: gfleury <gfleury@disroot.org>
Message-ID: <20241126205329.2215295-2-gfleury@disroot.org>
This commit is contained in:
gfleury 2024-11-26 22:53:23 +02:00 committed by Samuel Thibault
parent 3a9b4b4aeb
commit c982918e3e
9 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htl/Makefile
View File

@ -94,7 +94,6 @@ libpthread-routines := \
pt-rwlock-unlock \ pt-rwlock-unlock \
pt-cond \ pt-cond \
pt-condattr-init \ pt-condattr-init \
pt-condattr-destroy \
pt-condattr-getclock \ pt-condattr-getclock \
pt-condattr-getpshared \ pt-condattr-getpshared \
pt-condattr-setclock \ pt-condattr-setclock \
@ -206,6 +205,7 @@ routines := \
pt-attr-setstack \ pt-attr-setstack \
pt-attr-setstackaddr \ pt-attr-setstackaddr \
pt-attr-setstacksize \ pt-attr-setstacksize \
pt-condattr-destroy \
pt-getschedparam \ pt-getschedparam \
pt-nthreads \ pt-nthreads \
pt-pthread_self \ pt-pthread_self \

3
htl/Versions
View File

@ -26,6 +26,7 @@ libc {
pthread_attr_setscope; pthread_attr_setscope;
pthread_attr_setschedparam; pthread_attr_setschedparam;
pthread_attr_init; pthread_attr_init;
pthread_condattr_destroy;
} }
GLIBC_2.21 { GLIBC_2.21 {
@ -119,7 +120,7 @@ libpthread {
pthread_cond_broadcast; pthread_cond_destroy; pthread_cond_init; pthread_cond_broadcast; pthread_cond_destroy; pthread_cond_init;
pthread_cond_signal; pthread_cond_timedwait; pthread_cond_wait; pthread_cond_signal; pthread_cond_timedwait; pthread_cond_wait;
pthread_condattr_destroy; pthread_condattr_getclock; pthread_condattr_getclock;
pthread_condattr_getpshared; pthread_condattr_init; pthread_condattr_getpshared; pthread_condattr_init;
pthread_condattr_setclock; pthread_condattr_setpshared; pthread_condattr_setclock; pthread_condattr_setpshared;

1
htl/forward.c
View File

@ -53,7 +53,6 @@ name decl \
#define FORWARD(name, decl, params, defretval) \ #define FORWARD(name, decl, params, defretval) \
FORWARD2 (name, int, decl, params, return defretval) FORWARD2 (name, int, decl, params, return defretval)
FORWARD (pthread_condattr_destroy, (pthread_condattr_t *attr), (attr), 0)
FORWARD (pthread_condattr_init, (pthread_condattr_t *attr), (attr), 0) FORWARD (pthread_condattr_init, (pthread_condattr_t *attr), (attr), 0)

1
htl/pt-initialize.c
View File

@ -27,7 +27,6 @@
#if IS_IN (libpthread) #if IS_IN (libpthread)
static const struct pthread_functions pthread_functions = { static const struct pthread_functions pthread_functions = {
.ptr_pthread_condattr_destroy = __pthread_condattr_destroy,
.ptr_pthread_condattr_init = __pthread_condattr_init, .ptr_pthread_condattr_init = __pthread_condattr_init,
.ptr_pthread_cond_broadcast = __pthread_cond_broadcast, .ptr_pthread_cond_broadcast = __pthread_cond_broadcast,
.ptr_pthread_cond_destroy = __pthread_cond_destroy, .ptr_pthread_cond_destroy = __pthread_cond_destroy,

6
sysdeps/htl/pt-condattr-destroy.c
View File

@ -17,6 +17,7 @@
<https://www.gnu.org/licenses/>. */ <https://www.gnu.org/licenses/>. */
#include <pthread.h> #include <pthread.h>
#include <shlib-compat.h>
#include <pt-internal.h> #include <pt-internal.h>
int int
@ -24,5 +25,8 @@ __pthread_condattr_destroy (pthread_condattr_t *cond)
{ {
return 0; 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

2
sysdeps/htl/pthread-functions.h
View File

@ -21,7 +21,6 @@
#include <pthread.h> #include <pthread.h>
int __pthread_condattr_destroy (pthread_condattr_t *);
int __pthread_condattr_init (pthread_condattr_t *); int __pthread_condattr_init (pthread_condattr_t *);
int __pthread_cond_broadcast (pthread_cond_t *); int __pthread_cond_broadcast (pthread_cond_t *);
int __pthread_cond_destroy (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. */ so if possible avoid breaking it and append new hooks to the end. */
struct pthread_functions struct pthread_functions
{ {
int (*ptr_pthread_condattr_destroy) (pthread_condattr_t *);
int (*ptr_pthread_condattr_init) (pthread_condattr_t *); int (*ptr_pthread_condattr_init) (pthread_condattr_t *);
int (*ptr_pthread_cond_broadcast) (pthread_cond_t *); int (*ptr_pthread_cond_broadcast) (pthread_cond_t *);
int (*ptr_pthread_cond_destroy) (pthread_cond_t *); int (*ptr_pthread_cond_destroy) (pthread_cond_t *);

1
sysdeps/mach/hurd/i386/libc.abilist
View File

@ -49,6 +49,7 @@ GLIBC_2.12 pthread_attr_setscope F
GLIBC_2.12 pthread_attr_setstack F GLIBC_2.12 pthread_attr_setstack F
GLIBC_2.12 pthread_attr_setstackaddr F GLIBC_2.12 pthread_attr_setstackaddr F
GLIBC_2.12 pthread_attr_setstacksize 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_equal F
GLIBC_2.12 pthread_getschedparam F GLIBC_2.12 pthread_getschedparam F
GLIBC_2.12 pthread_self F GLIBC_2.12 pthread_self F

1
sysdeps/mach/hurd/i386/libpthread.abilist
View File

@ -36,7 +36,6 @@ GLIBC_2.12 pthread_cond_init F
GLIBC_2.12 pthread_cond_signal F GLIBC_2.12 pthread_cond_signal F
GLIBC_2.12 pthread_cond_timedwait F GLIBC_2.12 pthread_cond_timedwait F
GLIBC_2.12 pthread_cond_wait 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_getclock F
GLIBC_2.12 pthread_condattr_getpshared F GLIBC_2.12 pthread_condattr_getpshared F
GLIBC_2.12 pthread_condattr_init F GLIBC_2.12 pthread_condattr_init F

1
sysdeps/mach/hurd/x86_64/libpthread.abilist
View File

@ -55,7 +55,6 @@ GLIBC_2.38 pthread_cond_init F
GLIBC_2.38 pthread_cond_signal F GLIBC_2.38 pthread_cond_signal F
GLIBC_2.38 pthread_cond_timedwait F GLIBC_2.38 pthread_cond_timedwait F
GLIBC_2.38 pthread_cond_wait 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_getclock F
GLIBC_2.38 pthread_condattr_getpshared F GLIBC_2.38 pthread_condattr_getpshared F
GLIBC_2.38 pthread_condattr_init F GLIBC_2.38 pthread_condattr_init F