From ae793cc20d80eec6ccffc31612b635b8c1b82e89 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon, 13 Jan 2020 01:33:21 +0100
Subject: htl: Avoid exposing unixoid functions

C11 threads should not expose them.
---
 htl/pt-create.c                   | 2 +-
 htl/pt-yield.c                    | 2 +-
 sysdeps/htl/pt-destroy-specific.c | 2 +-
 sysdeps/mach/htl/pt-timedblock.c  | 2 +-
 sysdeps/mach/hurd/Versions        | 3 +++
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/htl/pt-create.c b/htl/pt-create.c
index 59ba04d2a8..0b3237f46a 100644
--- a/htl/pt-create.c
+++ b/htl/pt-create.c
@@ -178,7 +178,7 @@ __pthread_create_internal (struct __pthread **thread,
      shall be empty."  If the currnet thread is not a pthread then we
      just inherit the process' sigmask.  */
   if (__pthread_num_threads == 1)
-    err = sigprocmask (0, 0, &sigset);
+    err = __sigprocmask (0, 0, &sigset);
   else
     err = __pthread_sigstate (_pthread_self (), 0, 0, &sigset, 0);
   assert_perror (err);
diff --git a/htl/pt-yield.c b/htl/pt-yield.c
index 29fda256cc..11aa852ed3 100644
--- a/htl/pt-yield.c
+++ b/htl/pt-yield.c
@@ -22,5 +22,5 @@
 int
 pthread_yield (void)
 {
-  return sched_yield ();
+  return __sched_yield ();
 }
diff --git a/sysdeps/htl/pt-destroy-specific.c b/sysdeps/htl/pt-destroy-specific.c
index 8430a5fb09..319aa4875f 100644
--- a/sysdeps/htl/pt-destroy-specific.c
+++ b/sysdeps/htl/pt-destroy-specific.c
@@ -68,7 +68,7 @@ __pthread_destroy_specific (struct __pthread *thread)
 
       /* This may take a very long time.  Let those blocking on
          pthread_key_create or pthread_key_delete make progress.  */
-      sched_yield ();
+      __sched_yield ();
     }
 
   free (thread->thread_specifics);
diff --git a/sysdeps/mach/htl/pt-timedblock.c b/sysdeps/mach/htl/pt-timedblock.c
index 3b8779367d..63af869c90 100644
--- a/sysdeps/mach/htl/pt-timedblock.c
+++ b/sysdeps/mach/htl/pt-timedblock.c
@@ -39,7 +39,7 @@ __pthread_timedblock (struct __pthread *thread,
   /* We have an absolute time and now we have to convert it to a
      relative time.  Arg.  */
 
-  err = clock_gettime (clock_id, &now);
+  err = __clock_gettime (clock_id, &now);
   assert (!err);
 
   if (now.tv_sec > abstime->tv_sec
diff --git a/sysdeps/mach/hurd/Versions b/sysdeps/mach/hurd/Versions
index 35257a0906..1d6633f782 100644
--- a/sysdeps/mach/hurd/Versions
+++ b/sysdeps/mach/hurd/Versions
@@ -14,6 +14,9 @@ libc {
 
     _dl_init_first;
     __close_nocancel_nostatus;
+
+    # functions used in other libraries
+    __sigprocmask;
   }
 }
 
-- 
cgit 1.4.1