summaryrefslogtreecommitdiff
path: root/dlfcn
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-02-26 17:53:15 +0000
committerUlrich Drepper <drepper@redhat.com>2001-02-26 17:53:15 +0000
commitc08bc50a60a92e8d32f302ea411312bc438f05ef (patch)
tree3d385b90c8a5fc7879d4a840f60edc1eb148308a /dlfcn
parentd9e77f3d6ebeee8ba1ee31d46d592530f7c37ba7 (diff)
Update.
2001-02-26 Ulrich Drepper <drepper@redhat.com> * dlfcn/Makefile (distribute): Add modatexit.c and modcxaatexit.c. (tests): Add tstatexit and tstcxaatexit. (module-names): Add modatexit and modcxaatexit. Add rules to build and run tstatexit and tstcxaatexit. * dlfcn/modatexit.c: New file. * dlfcn/modcxaatexit.c: New file. * dlfcn/tstatexit.c: New file. * dlfcn/tstcxaatexit.c: New file. * io/Makefile: Pass -DHAVE_DOT_HIDDEN to stat and mknod functions if .hidden is available. * io/stat.c: If .hidden is available use it to avoid exporting functions. * io/fstat.c: Likewise. * io/lstat.c: Likewise. * io/stat64.c: Likewise. * io/fstat64.c: Likewise. * io/lstat64.c: Likewise. * sysdeps/generic/mknod.c: Likewise. * malloc/mtrace.c: Use __cxa_atexit and not atexit. * sysdeps/generic/bb_init_func.c: Likewise. * sysdeps/generic/libc-start.c: Likewise. * stdlib/atexit.c (__new_exitfn): Move to cxa_atexit.c. (atexit): Implement using __cxa_atexit. Use .hidden if availble to avoid exporting atexit. * stdlib/cxa_atexit.c (__new_exitfn): Moved to here from atexit.c. * stdlib/Versions: Export __new_exitfn for GLIBC_2.2.3. * stdlib/Makefile (routines): Add old_atexit. (static-only-routines): Add atexit. Pass -DHAVE_DOT_HIDDEN for atexit.c if .hidden is available. * stdlib/old_atexit.c: New file. * intl/Makefile: Remove bogus endif.
Diffstat (limited to 'dlfcn')
-rw-r--r--dlfcn/Makefile15
-rw-r--r--dlfcn/modatexit.c41
-rw-r--r--dlfcn/modcxaatexit.c39
-rw-r--r--dlfcn/tstatexit.c63
-rw-r--r--dlfcn/tstcxaatexit.c63
5 files changed, 218 insertions, 3 deletions
diff --git a/dlfcn/Makefile b/dlfcn/Makefile
index 1bcce2fd1b..87dc60a1b2 100644
--- a/dlfcn/Makefile
+++ b/dlfcn/Makefile
@@ -21,7 +21,8 @@ headers := bits/dlfcn.h dlfcn.h
extra-libs := libdl
libdl-routines := dlopen dlclose dlsym dlvsym dlerror dladdr eval
distribute := dlopenold.c glreflib1.c glreflib2.c failtestmod.c eval.c \
- defaultmod1.c defaultmod2.c errmsg1mod.c
+ defaultmod1.c defaultmod2.c errmsg1mod.c modatexit.c \
+ modcxaatexit.c
extra-libs-others := libdl
@@ -34,10 +35,10 @@ endif
libdl-shared-only-routines += eval
ifeq (yes,$(build-shared))
-tests = glrefmain failtest tst-dladdr default errmsg1
+tests = glrefmain failtest tst-dladdr default errmsg1 tstatexit tstcxaatexit
endif
modules-names = glreflib1 glreflib2 failtestmod defaultmod1 defaultmod2 \
- errmsg1mod
+ errmsg1mod modatexit modcxaatexit
extra-objs += $(modules-names:=.os) eval.os
generated := $(modules-names:=.so)
@@ -67,3 +68,11 @@ $(objpfx)defaultmod2.so: $(libdl)
$(objpfx)errmsg1: $(libdl)
$(objpfx)errmsg1.out: $(objpfx)errmsg1 $(objpfx)errmsg1mod.so
+
+$(objpfx)tstatexit: $(libdl)
+$(objpfx)tstatexit.out: $(objpfx)tstatexit $(objpfx)modatexit.so
+
+$(objpfx)tstcxaatexit: $(libdl)
+$(objpfx)tstcxaatexit.out: $(objpfx)tstcxaatexit $(objpfx)modcxaatexit.so
+
+$(objpfx)modatexit.so: $(common-objpfx)libc.so $(common-objpfx)libc_nonshared.a
diff --git a/dlfcn/modatexit.c b/dlfcn/modatexit.c
new file mode 100644
index 0000000000..110feadad8
--- /dev/null
+++ b/dlfcn/modatexit.c
@@ -0,0 +1,41 @@
+/* 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 <stdio.h>
+#include <stdlib.h>
+
+int global;
+int *ip;
+
+void
+dummy (void)
+{
+ printf ("This is %s\n", __FUNCTION__);
+ *ip = global = 1;
+}
+
+
+void
+foo (void *p)
+{
+ extern void *__dso_handle __attribute__ ((__weak__));
+ printf ("This is %s\n", __FUNCTION__);
+ atexit (dummy);
+ if (&__dso_handle) puts ("have dso handle"); else puts ("no dso handle");
+ ip = p;
+}
diff --git a/dlfcn/modcxaatexit.c b/dlfcn/modcxaatexit.c
new file mode 100644
index 0000000000..1ff2d57ecc
--- /dev/null
+++ b/dlfcn/modcxaatexit.c
@@ -0,0 +1,39 @@
+/* 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 <stdio.h>
+#include <stdlib.h>
+
+int global;
+
+
+void
+fluffy (void *p)
+{
+ printf ("This is %s\n", __FUNCTION__);
+ *(int *) p = global = 1;
+}
+
+
+void
+bar (void *p)
+{
+ extern void *__dso_handle;
+ printf ("This is %s\n", __FUNCTION__);
+ __cxa_atexit (fluffy, p, __dso_handle);
+}
diff --git a/dlfcn/tstatexit.c b/dlfcn/tstatexit.c
new file mode 100644
index 0000000000..e3dfe4bd08
--- /dev/null
+++ b/dlfcn/tstatexit.c
@@ -0,0 +1,63 @@
+/* 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 <dlfcn.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+
+int
+main (void)
+{
+ const char fname[] = "modatexit.so";
+ void *h;
+ void (*fp) (void *);
+ int v = 0;
+
+ h = dlopen (fname, RTLD_NOW);
+ if (h == NULL)
+ {
+ printf ("cannot open \"%s\": %s\n", fname, dlerror ());
+ exit (1);
+ }
+
+ fp = dlsym (h, "foo");
+ if (fp == NULL)
+ {
+ printf ("cannot find \"foo\": %s\n", dlerror ());
+ exit (1);
+ }
+
+ fp (&v);
+
+ if (dlclose (h) != 0)
+ {
+ printf ("cannot close \"%s\": %s\n", fname, dlerror ());
+ exit (1);
+ }
+
+ if (v != 1)
+ {
+ puts ("module unload didn't change `v'");
+ exit (1);
+ }
+
+ puts ("finishing now");
+
+ return 0;
+}
diff --git a/dlfcn/tstcxaatexit.c b/dlfcn/tstcxaatexit.c
new file mode 100644
index 0000000000..9ae86d0275
--- /dev/null
+++ b/dlfcn/tstcxaatexit.c
@@ -0,0 +1,63 @@
+/* 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 <dlfcn.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+
+int
+main (void)
+{
+ const char fname[] = "modcxaatexit.so";
+ void *h;
+ void (*fp) (void *);
+ int v = 0;
+
+ h = dlopen (fname, RTLD_LAZY);
+ if (h == NULL)
+ {
+ printf ("cannot open \"%s\": %s\n", fname, dlerror ());
+ exit (1);
+ }
+
+ fp = dlsym (h, "bar");
+ if (fp == NULL)
+ {
+ printf ("cannot find \"bar\": %s\n", dlerror ());
+ exit (1);
+ }
+
+ fp (&v);
+
+ if (dlclose (h) != 0)
+ {
+ printf ("cannot close \"%s\": %s\n", fname, dlerror ());
+ exit (1);
+ }
+
+ if (v != 1)
+ {
+ puts ("module unload didn't change `v'");
+ exit (1);
+ }
+
+ puts ("finishing now");
+
+ return 0;
+}