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>

1 files changed, 4 insertions, 2 deletions

diff --git a/nptl/Versions b/nptl/Versions
index 0045780806..7a47f9bbca 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -151,6 +151,8 @@ libc {
   }
   GLIBC_2.3.3 {
     __pthread_cleanup_routine;
+    __pthread_register_cancel;
+    __pthread_unregister_cancel;
     __pthread_unwind_next;
     pthread_attr_getaffinity_np;
     pthread_attr_setaffinity_np;
@@ -234,6 +236,8 @@ libc {
     __pthread_key_create;
     __pthread_mutex_lock;
     __pthread_mutex_unlock;
+    __pthread_register_cancel;
+    __pthread_unregister_cancel;
     call_once;
     cnd_broadcast;
     cnd_destroy;
@@ -437,9 +441,7 @@ libpthread {
   }
 
   GLIBC_2.3.3 {
-    __pthread_register_cancel;
     __pthread_register_cancel_defer;
-    __pthread_unregister_cancel;
     __pthread_unregister_cancel_restore;
     pthread_setaffinity_np;
   }