diff --git a/htl/Makefile b/htl/Makefile index 542f5eadf0..683ca4bc4e 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 465db4960a..3fa6b936a2 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 de459d7380..1e4d92d0d7 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 7eb2bf09bf..1655ef8734 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 da1d47e3c2..ddd0e031e1 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)