diff options
| author | gfleury <gfleury@disroot.org> | 2024-12-19 22:37:25 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2024-12-22 23:34:28 +0100 |
| commit | a369d567d206d04a7c56b388b829424046309b95 (patch) | |
| tree | 1c7e0b0b7e1f4c0d32e0e18535a07c585f3a8b26 | |
| parent | f57a277c1696ebaee340a565c7440f81f1156ba6 (diff) | |
| download | glibc-a369d567d206d04a7c56b388b829424046309b95.zip glibc-a369d567d206d04a7c56b388b829424046309b95.tar.gz glibc-a369d567d206d04a7c56b388b829424046309b95.tar.bz2 | |
htl: move __pthread_timedblock, __pthread_timedblock_intr, __pthread_block, __pthread_block_intr into libc.
Signed-off-by: gfleury <gfleury@disroot.org>
Message-ID: <20241219203727.669825-7-gfleury@disroot.org>
| -rw-r--r-- | htl/Makefile | 8 | ||||
| -rw-r--r-- | htl/Versions | 4 | ||||
| -rw-r--r-- | htl/pt-internal.h | 6 | ||||
| -rw-r--r-- | sysdeps/mach/htl/pt-block.c | 1 | ||||
| -rw-r--r-- | sysdeps/mach/htl/pt-timedblock.c | 1 |
5 files changed, 14 insertions, 6 deletions
diff --git a/htl/Makefile b/htl/Makefile index 542f5ea..683ca4b 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -102,10 +102,6 @@ libpthread-routines := \ pt-startup \ pt-getconcurrency \ pt-setconcurrency \ - pt-block \ - pt-timedblock \ - pt-block-intr \ - pt-timedblock-intr \ pt-docancel \ pt-sysdep \ pt-setup \ @@ -191,6 +187,8 @@ routines := \ pt-attr-setstack \ pt-attr-setstackaddr \ pt-attr-setstacksize \ + pt-block \ + pt-block-intr \ pt-cond \ pt-cond-brdcast \ pt-cond-destroy \ @@ -210,6 +208,8 @@ routines := \ pt-sigmask \ pt-sigstate \ pt-sigstate-destroy \ + pt-timedblock \ + pt-timedblock-intr \ pt-wakeup \ # routines shared-only-routines = forward diff --git a/htl/Versions b/htl/Versions index 465db49..3fa6b93 100644 --- a/htl/Versions +++ b/htl/Versions @@ -89,6 +89,8 @@ libc { __pthread_cleanup_stack; __pthread_total; ___pthread_self; + __pthread_block; + __pthread_block_intr; __pthread_init_thread; __pthread_default_attr; __pthread_attr_init; @@ -107,6 +109,8 @@ libc { __pthread_sigstate; __pthread_sigstate_destroy; __pthread_sigmask; + __pthread_timedblock; + __pthread_timedblock_intr; __pthread_wakeup; } } diff --git a/htl/pt-internal.h b/htl/pt-internal.h index de459d7..1e4d92d 100644 --- a/htl/pt-internal.h +++ b/htl/pt-internal.h @@ -267,20 +267,22 @@ extern void __pthread_startup (void); /* Block THREAD. */ extern void __pthread_block (struct __pthread *thread); +libc_hidden_proto (__pthread_block) /* Block THREAD until *ABSTIME is reached. */ extern error_t __pthread_timedblock (struct __pthread *__restrict thread, const struct timespec *__restrict abstime, clockid_t clock_id); - +libc_hidden_proto (__pthread_timedblock) /* Block THREAD with interrupts. */ extern error_t __pthread_block_intr (struct __pthread *thread); +libc_hidden_proto (__pthread_block_intr) /* Block THREAD until *ABSTIME is reached, with interrupts. */ extern error_t __pthread_timedblock_intr (struct __pthread *__restrict thread, const struct timespec *__restrict abstime, clockid_t clock_id); - +libc_hidden_proto (__pthread_timedblock_intr) /* Wakeup THREAD. */ extern void __pthread_wakeup (struct __pthread *thread); libc_hidden_proto (__pthread_wakeup) diff --git a/sysdeps/mach/htl/pt-block.c b/sysdeps/mach/htl/pt-block.c index 7eb2bf0..1655ef8 100644 --- a/sysdeps/mach/htl/pt-block.c +++ b/sysdeps/mach/htl/pt-block.c @@ -51,3 +51,4 @@ __pthread_block (struct __pthread *thread) assert_perror (err); RETURN(0); } +libc_hidden_def (__pthread_block) diff --git a/sysdeps/mach/htl/pt-timedblock.c b/sysdeps/mach/htl/pt-timedblock.c index da1d47e..ddd0e03 100644 --- a/sysdeps/mach/htl/pt-timedblock.c +++ b/sysdeps/mach/htl/pt-timedblock.c @@ -69,3 +69,4 @@ __pthread_timedblock (struct __pthread *thread, assert_perror (err); return 0; } +libc_hidden_def (__pthread_timedblock) |