From 865bf7110936d46c01a673e3327a6bd8b2a06082 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sun, 9 Feb 2020 16:34:26 +0000
Subject: [PATCH] htl: Do not put spin_lock inlines in public headers

They were not getting used anyway.
Also do not make libsupport use them, it would make tests using it have
to be made to link against libmachuser for gsync_wait.
---
 sysdeps/htl/include/pthread.h | 36 +++++++++++++++++++++++++++++++++++
 sysdeps/htl/pthread.h         | 36 -----------------------------------
 2 files changed, 36 insertions(+), 36 deletions(-)
 create mode 100644 sysdeps/htl/include/pthread.h

diff --git a/sysdeps/htl/include/pthread.h b/sysdeps/htl/include/pthread.h
new file mode 100644
index 0000000000..173b1eb08d
--- /dev/null
+++ b/sysdeps/htl/include/pthread.h
@@ -0,0 +1,36 @@
+#ifndef	_PTHREAD_H
+#include_next <pthread.h>
+#if defined __USE_EXTERN_INLINES && defined _LIBC && !IS_IN (libsupport)
+# include <bits/spin-lock-inline.h>
+
+__extern_inline int
+pthread_spin_destroy (pthread_spinlock_t *__lock)
+{
+  return __pthread_spin_destroy (__lock);
+}
+
+__extern_inline int
+pthread_spin_init (pthread_spinlock_t *__lock, int __pshared)
+{
+  return __pthread_spin_init (__lock, __pshared);
+}
+
+__extern_inline int
+pthread_spin_lock (pthread_spinlock_t *__lock)
+{
+  return __pthread_spin_lock (__lock);
+}
+
+__extern_inline int
+pthread_spin_trylock (pthread_spinlock_t *__lock)
+{
+  return __pthread_spin_trylock (__lock);
+}
+
+__extern_inline int
+pthread_spin_unlock (pthread_spinlock_t *__lock)
+{
+  return __pthread_spin_unlock (__lock);
+}
+#endif
+#endif
diff --git a/sysdeps/htl/pthread.h b/sysdeps/htl/pthread.h
index 38c61e8da3..17f82e7180 100644
--- a/sysdeps/htl/pthread.h
+++ b/sysdeps/htl/pthread.h
@@ -549,42 +549,6 @@ extern int pthread_spin_trylock (pthread_spinlock_t *__lock)
 extern int pthread_spin_unlock (pthread_spinlock_t *__lock)
 	__nonnull ((1));
 
-# if defined __USE_EXTERN_INLINES && defined _LIBC
-
-# include <bits/spin-lock-inline.h>
-
-__extern_inline int
-pthread_spin_destroy (pthread_spinlock_t *__lock)
-{
-  return __pthread_spin_destroy (__lock);
-}
-
-__extern_inline int
-pthread_spin_init (pthread_spinlock_t *__lock, int __pshared)
-{
-  return __pthread_spin_init (__lock, __pshared);
-}
-
-__extern_inline int
-pthread_spin_lock (pthread_spinlock_t *__lock)
-{
-  return __pthread_spin_lock (__lock);
-}
-
-__extern_inline int
-pthread_spin_trylock (pthread_spinlock_t *__lock)
-{
-  return __pthread_spin_trylock (__lock);
-}
-
-__extern_inline int
-pthread_spin_unlock (pthread_spinlock_t *__lock)
-{
-  return __pthread_spin_unlock (__lock);
-}
-
-# endif /* Use extern inlines.  */
-
 #endif /* XPG6.  */
 
 
-- 
2.43.5