+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.
+
2001-01-10 H.J. Lu <hjl@gnu.org>
* elf/dl-libc.c (do_dlopen): Call DL_STATIC_INIT for static binaries.
GLIBC_2.1
GLIBC_2.1.1
GLIBC_2.2
+ GLIBC_2.2.1
}
libthread_db {
GLIBC_2.1.3
size_t size, __compar_fn_t cmp);
extern int __cxa_atexit (void (*func) (void *), void *arg, void *d);
+extern int __cxa_on_exit (void (*func) (int, void *), void *arg, void *d);
extern void __cxa_finalize (void *d);
--- /dev/null
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <pthread.h>
+#include <unistd.h>
+
+static void *
+worker (void *dummy)
+{
+ exit (26);
+}
+
+#define TEST_FUNCTION do_test ()
+#define TIMEOUT 10
+static int
+do_test (void)
+{
+ pthread_t th;
+ pid_t pid;
+ int status;
+
+ switch ((pid = fork ()))
+ {
+ case -1:
+ puts ("Could not fork");
+ exit (1);
+ case 0:
+ if (pthread_create(&th, NULL, worker, NULL) != 0)
+ {
+ puts ("Failed to start thread");
+ exit (1);
+ }
+ for (;;);
+ exit (1);
+ default:
+ break;
+ }
+
+ if (waitpid (pid, &status, 0) != pid)
+ {
+ puts ("waitpid failed");
+ exit (1);
+ }
+
+ if (!WIFEXITED (status) || WEXITSTATUS (status) != 26)
+ {
+ printf ("Wrong exit code %d\n", status);
+ exit (1);
+ }
+
+ puts ("All OK");
+ return 0;
+}
+
+#include "../../test-skeleton.c"
-# Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+# Copyright (C) 1996,1997,1998,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
librt-tests = ex10 ex11
tests = ex1 ex2 ex3 ex4 ex5 ex6 ex7 ex8 ex9 $(librt-tests) ex12 ex13 joinrace \
- tststack $(tests-nodelete-$(have-z-nodelete)) ecmutex ex14
+ tststack $(tests-nodelete-$(have-z-nodelete)) ecmutex ex14 ex15
ifeq (yes,$(build-shared))
tests-nodelete-yes = unload
/* Do it early so that user-registered atexit functions are called
before pthread_exit_process. */
if (__builtin_expect (&__dso_handle != NULL, 1))
- /* The cast is a bit unclean. The function expects two arguments but
- we can only pass one. Fortunately this is not a problem since the
- second argument of `pthread_exit_process' is simply ignored. */
- __cxa_atexit((void (*) (void *)) pthread_exit_process, NULL, __dso_handle);
+ __cxa_on_exit((void (*) (void *)) pthread_exit_process, NULL,
+ __dso_handle);
else
__on_exit (pthread_exit_process, NULL);
/* How many processors. */
-# 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
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 \
# used by new G++ ABI
__cxa_atexit; __cxa_finalize;
}
+ GLIBC_2.2.1 {
+ # used in the thread library
+ __cxa_on_exit;
+ }
}
--- /dev/null
+/* 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;
+}
-/* 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
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;
}
}
-/* 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
ef_us,
ef_on,
ef_at,
- ef_cxa
+ ef_cxa,
+ ef_cxa2
};
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
projects / thirdparty / glibc.git / commitdiff
