[hurd,commited] htl: Add sem_clockwait support

[Samuel Thibault]

* sysdeps/htl/sem-timedwait.c (__sem_timedwait_internal): Add clock_id
parameter instead of hardcoding CLOCK_REALTIME.
(__sem_clockwait): New function.
(sem_clockwait): New weak alias.
* sysdeps/htl/sem-wait.c (__sem_timedwait_internal): Update declaration.
(__sem_wait): Update call to __sem_timedwait_internal.
* htl/Versions (GLIBC_2.32): Add sem_clockwait.
* sysdeps/mach/hurd/i386/libpthread.abilist (sem_clockwait): Add symbol.
* nptl/Makefile (tests): Move tst-sem5 to...
* sysdeps/pthread/Makefile (tests): ... here.
---
 htl/Versions                              |  4 +++-
 nptl/Makefile                             |  2 +-
 sysdeps/htl/sem-timedwait.c               | 12 ++++++++++--
 sysdeps/htl/sem-wait.c                    |  3 ++-
 sysdeps/mach/hurd/i386/libpthread.abilist |  1 +
 sysdeps/pthread/Makefile                  |  2 +-
 {nptl => sysdeps/pthread}/tst-sem5.c      |  0
 7 files changed, 18 insertions(+), 6 deletions(-)
 rename {nptl => sysdeps/pthread}/tst-sem5.c (100%)

diff --git a/htl/Versions b/htl/Versions
index 5fa9ef637c..fd9eefbaee 100644
--- a/htl/Versions
+++ b/htl/Versions
@@ -143,8 +143,8 @@ libpthread {
     pthread_hurd_cond_timedwait_np;
   }
 
-  # C11 thread symbols.
   GLIBC_2.32 {
+    # C11 thread symbols.
     thrd_create; thrd_detach; thrd_exit; thrd_join;
     mtx_init; mtx_lock; mtx_timedlock; mtx_trylock; mtx_unlock; mtx_destroy;
     call_once;
@@ -162,6 +162,8 @@ libpthread {
     pthread_rwlock_clockrdlock; pthread_rwlock_clockwrlock;
 
     pthread_tryjoin_np; pthread_timedjoin_np; pthread_clockjoin_np;
+
+    sem_clockwait;
   }
 
   GLIBC_PRIVATE {
diff --git a/nptl/Makefile b/nptl/Makefile
index b017cb855b..0e835ae83f 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -275,7 +275,7 @@ tests = tst-attr2 tst-attr3 tst-default-attr \
        tst-rwlock9 tst-rwlock10 tst-rwlock11 \
        tst-rwlock15 tst-rwlock17 tst-rwlock18 \
        tst-once5 \
-       tst-sem5 tst-sem17 \
+       tst-sem17 \
        tst-align tst-align3 \
        tst-kill1 tst-kill2 tst-kill3 tst-kill4 tst-kill5 tst-kill6 \
        tst-raise1 \
diff --git a/sysdeps/htl/sem-timedwait.c b/sysdeps/htl/sem-timedwait.c
index 2d8cf25328..0b1b6d0961 100644
--- a/sysdeps/htl/sem-timedwait.c
+++ b/sysdeps/htl/sem-timedwait.c
@@ -25,12 +25,12 @@
 
 int
 __sem_timedwait_internal (sem_t *restrict sem,
+                         clockid_t clock_id,
                          const struct timespec *restrict timeout)
 {
   error_t err;
   int drain;
   struct __pthread *self;
-  clockid_t clock_id = CLOCK_REALTIME;
 
   __pthread_spin_wait (&sem->__lock);
   if (sem->__value > 0)
@@ -88,10 +88,18 @@ __sem_timedwait_internal (sem_t *restrict sem,
   return 0;
 }
 
+int
+__sem_clockwait (sem_t *sem, clockid_t clockid,
+                const struct timespec *restrict timeout)
+{
+  return __sem_timedwait_internal (sem, clockid, timeout);
+}
+weak_alias (__sem_clockwait, sem_clockwait);
+
 int
 __sem_timedwait (sem_t *restrict sem, const struct timespec *restrict timeout)
 {
-  return __sem_timedwait_internal (sem, timeout);
+  return __sem_timedwait_internal (sem, CLOCK_REALTIME, timeout);
 }
 
 weak_alias (__sem_timedwait, sem_timedwait);
diff --git a/sysdeps/htl/sem-wait.c b/sysdeps/htl/sem-wait.c
index 1db2d9005c..74b39d5b75 100644
--- a/sysdeps/htl/sem-wait.c
+++ b/sysdeps/htl/sem-wait.c
@@ -20,12 +20,13 @@
 #include <pt-internal.h>
 
 extern int __sem_timedwait_internal (sem_t *restrict sem,
+                                    clockid_t clockid,
                                     const struct timespec *restrict timeout);
 
 int
 __sem_wait (sem_t *sem)
 {
-  return __sem_timedwait_internal (sem, 0);
+  return __sem_timedwait_internal (sem, CLOCK_REALTIME, 0);
 }
 
 strong_alias (__sem_wait, sem_wait);
diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist 
b/sysdeps/mach/hurd/i386/libpthread.abilist
index a1026f0d1e..a1e0a7183b 100644
--- a/sysdeps/mach/hurd/i386/libpthread.abilist
+++ b/sysdeps/mach/hurd/i386/libpthread.abilist
@@ -168,6 +168,7 @@ GLIBC_2.32 pthread_rwlock_clockrdlock F
 GLIBC_2.32 pthread_rwlock_clockwrlock F
 GLIBC_2.32 pthread_timedjoin_np F
 GLIBC_2.32 pthread_tryjoin_np F
+GLIBC_2.32 sem_clockwait F
 GLIBC_2.32 thrd_create F
 GLIBC_2.32 thrd_detach F
 GLIBC_2.32 thrd_exit F
diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile
index 3dc88274a7..1d1ddeb099 100644
--- a/sysdeps/pthread/Makefile
+++ b/sysdeps/pthread/Makefile
@@ -64,7 +64,7 @@ tests += tst-cnd-basic tst-mtx-trylock tst-cnd-broadcast \
         tst-rwlock1 tst-rwlock4 tst-rwlock5 tst-rwlock12 \
         tst-rwlock13 tst-rwlock14 tst-rwlock16 \
         tst-rwlock-tryrdlock-stall tst-rwlock-trywrlock-stall \
-        tst-sem1 tst-sem2 tst-sem3 tst-sem4 tst-sem6 tst-sem7 \
+        tst-sem1 tst-sem2 tst-sem3 tst-sem4 tst-sem5 tst-sem6 tst-sem7 \
         tst-sem8 tst-sem9 tst-sem10 tst-sem14 tst-sem15 tst-sem16 \
         tst-spin1 tst-spin2 tst-spin3 tst-spin4 \
         tst-abstime
diff --git a/nptl/tst-sem5.c b/sysdeps/pthread/tst-sem5.c
similarity index 100%
rename from nptl/tst-sem5.c
rename to sysdeps/pthread/tst-sem5.c
-- 
2.26.2