* stdlib/cxa_atexit.c (__new_exitfn_called): New variable.

	(__new_exitfn): Bump it in every successful call.
	* stdlib/cxa_finalize.c (__cxa_finalize): If destructor registered
	more exit handlers, call them right away.
	* stdlib/exit.h: Declare __new_exitfn_called.

ChangeLog

@@ -1,3 +1,11 @@
+2006-07-26  Gavin Romig-Koch  <gavin@redhat.com>
+
+	* stdlib/cxa_atexit.c (__new_exitfn_called): New variable.
+	(__new_exitfn): Bump it in every successful call.
+	* stdlib/cxa_finalize.c (__cxa_finalize): If destructor registered
+	more exit handlers, call them right away.
+	* stdlib/exit.h: Declare __new_exitfn_called.
+
 2006-07-25  Ulrich Drepper  <drepper@redhat.com>
 
 	* stdlib/cxa_finalize.c (__cxa_finalize): Fix race condition when

stdlib/cxa_atexit.c

@@ -1,4 +1,4 @@
-/* Copyright (C) 1999, 2001, 2002, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1999, 2001, 2002, 2005, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -56,6 +56,7 @@ __libc_lock_define_initialized (static, lock)
 
 static struct exit_function_list initial;
 struct exit_function_list *__exit_funcs = &initial;
+uint64_t __new_exitfn_called;
 
 struct exit_function *
 __new_exitfn (void)
@@ -111,7 +112,10 @@ __new_exitfn (void)
 
   /* Mark entry as used, but we don't know the flavor now.  */
   if (r != NULL)
-    r->flavor = ef_us;
+    {
+      r->flavor = ef_us;
+      ++__new_exitfn_called;
+    }
 
   __libc_lock_unlock (lock);
 

stdlib/cxa_finalize.c

@@ -31,24 +31,34 @@ __cxa_finalize (void *d)
 {
   struct exit_function_list *funcs;
 
+ restart:
   for (funcs = __exit_funcs; funcs; funcs = funcs->next)
     {
       struct exit_function *f;
 
       for (f = &funcs->fns[funcs->idx - 1]; f >= &funcs->fns[0]; --f)
 	{
 	  void (*cxafn) (void *arg, int status);
+	  void *cxaarg;
 
 	  if ((d == NULL || d == f->func.cxa.dso_handle)
 	      /* We don't want to run this cleanup more than once.  */
 	      && (cxafn = f->func.cxa.fn,
+		  cxaarg = f->func.cxa.arg,
 		  ! atomic_compare_and_exchange_bool_acq (&f->flavor, ef_free,
 							  ef_cxa)))
 	    {
+	      uint64_t check = __new_exitfn_called;
+
 #ifdef PTR_DEMANGLE
 	      PTR_DEMANGLE (cxafn);
 #endif
-	      cxafn (f->func.cxa.arg, 0);
+	      cxafn (cxaarg, 0);
+
+	      /* It is possible that that last exit function registered
+		 more exit functions.  Start the loop over.  */
+	      if (__builtin_expect (check != __new_exitfn_called, 0))
+		goto restart;
 	    }
 	}
     }

stdlib/exit.h

@@ -1,4 +1,5 @@
-/* Copyright (C) 1991,1996,1997,1999,2001,2002 Free Software Foundation, Inc.
+/* Copyright (C) 1991,1996,1997,1999,2001,2002,2006
+   Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -19,6 +20,7 @@
 #ifndef	_EXIT_H
 #define _EXIT_H 1
 
+#include <stdint.h>
 
 enum
 {
@@ -59,5 +61,6 @@ struct exit_function_list
 extern struct exit_function_list *__exit_funcs attribute_hidden;
 
 extern struct exit_function *__new_exitfn (void);
+extern uint64_t __new_exitfn_called attribute_hidden;
 
 #endif	/* exit.h  */