Update.

	* Makefile (tests): Add tst-cleanup1.
	* tst-cleanup1.c: New file.
	* cancellation.c (__cleanup_thread): Removed.
	(__do_cancel): Remove call to __cleanup_thread.
	* pthreadP.h: Remove __cleanup_thread prorotype.

1 files changed, 0 insertions, 41 deletions

diff --git a/nptl/cancellation.c b/nptl/cancellation.c
index 3cdc574880..0d0af1c647 100644
--- a/nptl/cancellation.c
+++ b/nptl/cancellation.c
@@ -42,9 +42,6 @@ __do_cancel (char *currentframe)
 {
   struct pthread *self = THREAD_SELF;
 
-  /* Cleanup the thread-local storage.  */
-  __cleanup_thread (self, currentframe);
-
   /* Throw an exception.  */
   // XXX TBI
 
@@ -55,44 +52,6 @@ __do_cancel (char *currentframe)
 }
 
 
-void
-__cleanup_thread (struct pthread *self, char *currentframe)
-{
-  struct _pthread_cleanup_buffer *cleanups;
-
-  /* Call all registered cleanup handlers.  */
-  cleanups = THREAD_GETMEM (self, cleanup);
-  if (__builtin_expect (cleanups != NULL, 0))
-    {
-      struct _pthread_cleanup_buffer *last;
-
-      while (FRAME_LEFT (currentframe, cleanups))
-	{
-	  last = cleanups;
-	  cleanups = cleanups->__prev;
-
-	  if (cleanups == NULL || FRAME_LEFT (last, cleanups))
-	    {
-	      cleanups = NULL;
-	      break;
-	    }
-	}
-
-      while (cleanups != NULL)
-	{
-	  /* Call the registered cleanup function.  */
-	  cleanups->__routine (cleanups->__arg);
-
-	  last = cleanups;
-	  cleanups = cleanups->__prev;
-
-	  if (FRAME_LEFT (last, cleanups))
-	    break;
-	}
-    }
-}
-
-
 /* The next two functions are similar to pthread_setcanceltype() but
    more specialized for the use in the cancelable functions like write().
    They do not need to check parameters etc.  */