Update.

	* pthread_create.c (deallocate_tsd): Mark as internal_function.
	Add some more __builtin_expect.

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index f92d80c4961574ac23bc327ebafb72b56f8a79f7..7f96519f644eb887f930c299522913e97fce811c 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,5 +1,8 @@
 2003-02-18  Ulrich Drepper  <drepper@redhat.com>
 
+       * pthread_create.c (deallocate_tsd): Mark as internal_function.
+       Add some more __builtin_expect.
+
        * pthreadP.h: Define dummy versio of DEBUGGING_P.
 
 2003-02-17  Ulrich Drepper  <drepper@redhat.com>

diff --git a/nptl/pthread_create.c b/nptl/pthread_create.c
index 172f002d9b1984a93d872cdeab12a9aa88c7d1de..74f3e9a82ab0c0a926f2017b9d997dd0846d7c51 100644 (file)
--- a/nptl/pthread_create.c
+++ b/nptl/pthread_create.c
@@ -107,6 +107,7 @@ __find_in_stack_list (pd)
 
 /* Deallocate POSIX thread-local-storage.  */
 static void
+internal_function
 deallocate_tsd (struct pthread *pd)
 {
   /* Maybe no data was ever allocated.  This happens often so we have
@@ -180,7 +181,8 @@ internal_function
 __free_tcb (struct pthread *pd)
 {
   /* The thread is exiting now.  */
-  if (atomic_bit_test_set (&pd->cancelhandling, TERMINATED_BIT) == 0)
+  if (__builtin_expect (atomic_bit_test_set (&pd->cancelhandling,
+                                            TERMINATED_BIT) == 0, 1))
     {
       /* Remove the descriptor from the list.  */
       if (DEBUGGING_P && __find_in_stack_list (pd) == NULL)