htl: Add sem_clockwait support

* 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.

2 files changed, 1 insertions, 64 deletions

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/nptl/tst-sem5.c b/nptl/tst-sem5.c
deleted file mode 100644
index 766274e50d..0000000000
--- a/nptl/tst-sem5.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Copyright (C) 2002-2020 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <https://www.gnu.org/licenses/>.  */
-
-#include <errno.h>
-#include <semaphore.h>
-#include <time.h>
-#include <unistd.h>
-#include <sys/time.h>
-#include <support/check.h>
-#include <support/timespec.h>
-#include <support/xtime.h>
-
-/* A bogus clock value that tells run_test to use sem_timedwait rather than
-   sem_clockwait.  */
-#define CLOCK_USE_TIMEDWAIT (-1)
-
-static void
-do_test_clock (clockid_t clockid)
-{
-  const clockid_t clockid_for_get =
-    clockid == CLOCK_USE_TIMEDWAIT ? CLOCK_REALTIME : clockid;
-  sem_t s;
-  struct timespec ts;
-
-  TEST_COMPARE (sem_init (&s, 0, 1), 0);
-  TEST_COMPARE (TEMP_FAILURE_RETRY (sem_wait (&s)), 0);
-
-  /* We wait for half a second.  */
-  xclock_gettime (clockid_for_get, &ts);
-  ts = timespec_add (ts, make_timespec (0, TIMESPEC_HZ/2));
-
-  errno = 0;
-  TEST_COMPARE (TEMP_FAILURE_RETRY ((clockid == CLOCK_USE_TIMEDWAIT)
-                                    ? sem_timedwait (&s, &ts)
-                                    : sem_clockwait (&s, clockid, &ts)), -1);
-  TEST_COMPARE (errno, ETIMEDOUT);
-  TEST_TIMESPEC_NOW_OR_AFTER (clockid_for_get, ts);
-}
-
-static int do_test (void)
-{
-  do_test_clock (CLOCK_USE_TIMEDWAIT);
-  do_test_clock (CLOCK_REALTIME);
-  do_test_clock (CLOCK_MONOTONIC);
-  return 0;
-}
-
-#include <support/test-driver.c>