Update.

2001-01-11  Ulrich Drepper  <drepper@redhat.com>

	* stdlib/Makefile (routines): Add cxa_on_exit.
	* stdlib/Versions [libc] (GLIBC_2.2.1): Add __cxa_on_exit.
	* stdlib/cxa_on_exit.c: New file.
	* include/stdlib.h: Add prototype for __cxa_on_exit.
	* stdlib/exit.c: Handle ef_cxa2.
	* stdlib/exit.h (enum): Add ef_cxa2.
	(struct exit_function): Add cxa2.

	* Versions.def [ld]: Add GLIBC_2.2.1.

5 files changed, 57 insertions, 5 deletions

diff --git a/stdlib/Makefile b/stdlib/Makefile
index e9cef42f2c..61d2059e55 100644
--- a/stdlib/Makefile
+++ b/stdlib/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991,92,93,94,95,96,97,98,99,2000 Free Software Foundation, Inc.
+# Copyright (C) 1991-1999, 2000, 2001 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
@@ -29,7 +29,7 @@ routines	:=							      \
 	abort								      \
 	bsearch qsort msort						      \
 	getenv putenv setenv secure-getenv				      \
-	exit on_exit atexit cxa_atexit cxa_finalize			      \
+	exit on_exit atexit cxa_atexit cxa_on_exit cxa_finalize		      \
 	abs labs llabs							      \
 	div ldiv lldiv							      \
 	mblen mbstowcs mbtowc wcstombs wctomb				      \
diff --git a/stdlib/Versions b/stdlib/Versions
index 034125a200..d189f4bdbd 100644
--- a/stdlib/Versions
+++ b/stdlib/Versions
@@ -94,4 +94,8 @@ libc {
     # used by new G++ ABI
     __cxa_atexit; __cxa_finalize;
   }
+  GLIBC_2.2.1 {
+    # used in the thread library
+    __cxa_on_exit;
+  }
 }
diff --git a/stdlib/cxa_on_exit.c b/stdlib/cxa_on_exit.c
new file mode 100644
index 0000000000..c24fa1e983
--- /dev/null
+++ b/stdlib/cxa_on_exit.c
@@ -0,0 +1,38 @@
+/* Copyright (C) 2001 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
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <stdlib.h>
+#include "exit.h"
+
+/* Register a function to be called by exit or when a shared library
+   is unloaded.  This function is only called from code generated by
+   the C++ compiler.  */
+int
+__cxa_on_exit (void (*func) (int, void *), void *arg, void *d)
+{
+  struct exit_function *new = __new_exitfn ();
+
+  if (new == NULL)
+    return -1;
+
+  new->flavor = ef_cxa2;
+  new->func.cxa2.fn = func;
+  new->func.cxa2.arg = arg;
+  new->func.cxa2.dso_handle = d;
+  return 0;
+}
diff --git a/stdlib/exit.c b/stdlib/exit.c
index 904c225336..5714999117 100644
--- a/stdlib/exit.c
+++ b/stdlib/exit.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1996, 1997, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1991,1995,1996,1997,1999,2001 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
@@ -59,6 +59,9 @@ exit (int status)
 	    case ef_cxa:
 	      (*f->func.cxa.fn) (f->func.cxa.arg);
 	      break;
+	    case ef_cxa2:
+	      (*f->func.cxa2.fn) (status, f->func.cxa2.arg);
+	      break;
 	    }
 	}
 
diff --git a/stdlib/exit.h b/stdlib/exit.h
index 9b6c1c3d4e..66819dd045 100644
--- a/stdlib/exit.h
+++ b/stdlib/exit.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1996, 1997, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1996, 1997, 1999, 2001 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
@@ -26,7 +26,8 @@ enum
   ef_us,
   ef_on,
   ef_at,
-  ef_cxa
+  ef_cxa,
+  ef_cxa2
 };
 
 struct exit_function
@@ -48,6 +49,12 @@ struct exit_function
 	    void *arg;
 	    void *dso_handle;
 	  } cxa;
+	struct
+	  {
+	    void (*fn) (int status, void *arg);
+	    void *arg;
+	    void *dso_handle;
+	  } cxa2;
       } func;
   };
 struct exit_function_list