[COMMITTED 4/4] nptl: Fix __pthread_clockjoin_np64 __pthread_timedjoin_np64 hidden proto

Adhemerval Zanella adhemerval.zanella@linaro.org
Fri Mar 5 11:49:06 GMT 2021


They are both implemented in libpthread instead of libc.
---
 nptl/pthreadP.h          | 4 ++--
 nptl/pthread_clockjoin.c | 2 +-
 nptl/pthread_timedjoin.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h
index 93f3cef00f..c8538de44f 100644
--- a/nptl/pthreadP.h
+++ b/nptl/pthreadP.h
@@ -469,10 +469,10 @@ extern int __pthread_cond_wait (pthread_cond_t *cond, pthread_mutex_t *mutex);
 extern int __pthread_clockjoin_np64 (pthread_t threadid, void **thread_return,
                                      clockid_t clockid,
                                      const struct __timespec64 *abstime);
-libc_hidden_proto (__pthread_clockjoin_np64)
+libpthread_hidden_proto (__pthread_clockjoin_np64)
 extern int __pthread_timedjoin_np64 (pthread_t threadid, void **thread_return,
                                      const struct __timespec64 *abstime);
-libc_hidden_proto (__pthread_timedjoin_np64)
+libpthread_hidden_proto (__pthread_timedjoin_np64)
 extern int __pthread_cond_timedwait64 (pthread_cond_t *cond,
                                        pthread_mutex_t *mutex,
                                        const struct __timespec64 *abstime);
diff --git a/nptl/pthread_clockjoin.c b/nptl/pthread_clockjoin.c
index c55ab8bd09..7457c187fe 100644
--- a/nptl/pthread_clockjoin.c
+++ b/nptl/pthread_clockjoin.c
@@ -32,7 +32,7 @@ __pthread_clockjoin_np64 (pthread_t threadid, void **thread_return,
 }
 
 #if __TIMESIZE != 64
-libc_hidden_def (__pthread_clockjoin_np64)
+libpthread_hidden_def (__pthread_clockjoin_np64)
 
 int
 __pthread_clockjoin_np (pthread_t threadid, void **thread_return,
diff --git a/nptl/pthread_timedjoin.c b/nptl/pthread_timedjoin.c
index 282483cc49..f5d0d3d6ce 100644
--- a/nptl/pthread_timedjoin.c
+++ b/nptl/pthread_timedjoin.c
@@ -28,7 +28,7 @@ __pthread_timedjoin_np64 (pthread_t threadid, void **thread_return,
 }
 
 #if __TIMESIZE != 64
-libc_hidden_def (__pthread_timedjoin_np64)
+libpthread_hidden_def (__pthread_timedjoin_np64)
 
 int
 __pthread_timedjoin_np (pthread_t threadid, void **thread_return,
-- 
2.25.1



More information about the Libc-alpha mailing list