about summary refs log tree commit diff
path: root/nptl/pthreadP.h
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2021-05-11 11:38:46 +0200
committerFlorian Weimer <fweimer@redhat.com>2021-05-11 20:20:58 +0200
commit3ec8b1c7a921baa673ad9a33e0c63b4571915caa (patch)
tree6305b6505cef23c6bbffb2d44a92cb767c181445 /nptl/pthreadP.h
parent870218fb30a83c071b53b036d1eb33df7e30397e (diff)
downloadglibc-3ec8b1c7a921baa673ad9a33e0c63b4571915caa.tar.gz
glibc-3ec8b1c7a921baa673ad9a33e0c63b4571915caa.tar.xz
glibc-3ec8b1c7a921baa673ad9a33e0c63b4571915caa.zip
nptl: Move __pthread_register_cancel, __pthread_unregister_cancel to libc
The symbols were moved using scripts/move-symbol-to-libc.py.

Also clean up some unwinder linking leftover in the same spot
in nptl/pthreadP.h.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
Diffstat (limited to 'nptl/pthreadP.h')
-rw-r--r--nptl/pthreadP.h13
1 files changed, 2 insertions, 11 deletions
diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h
index 7e3cef4709..1692788528 100644
--- a/nptl/pthreadP.h
+++ b/nptl/pthreadP.h
@@ -277,21 +277,12 @@ extern void __pthread_unwind_next (__pthread_unwind_buf_t *__buf)
 /* NB: No hidden proto for __pthread_unwind_next: inside glibc, the
    legacy unwinding mechanism is used.  */
 
-#if IS_IN (libpthread)
 extern void __pthread_register_cancel (__pthread_unwind_buf_t *__buf)
      __cleanup_fct_attribute;
+libc_hidden_proto (__pthread_register_cancel)
 extern void __pthread_unregister_cancel (__pthread_unwind_buf_t *__buf)
      __cleanup_fct_attribute;
-hidden_proto (__pthread_register_cancel)
-hidden_proto (__pthread_unregister_cancel)
-# ifdef SHARED
-/* The difference from __libc_unwind_link_get is that here, errors
-   terminate the process.  */
-struct unwind_link ;
-struct unwind_link *__pthread_unwind_link_get (void) attribute_hidden;
-# endif
-#endif
-
+libc_hidden_proto (__pthread_unregister_cancel)
 
 /* Called when a thread reacts on a cancellation request.  */
 static inline void