From 4ce3cb5cddda7b4ee9643e1f75ee5b8f1f191906 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Mon, 6 Feb 2012 14:39:09 -0500 Subject: add support for init/finit (constructors and destructors) this is mainly in hopes of supporting c++ (not yet possible for other reasons) but will also help applications/libraries which use (and more often, abuse) the gcc __attribute__((__constructor__)) feature in "C" code. x86_64 and arm versions of the new startup asm are untested and may have minor problems. --- src/ldso/dynlink.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'src/ldso') diff --git a/src/ldso/dynlink.c b/src/ldso/dynlink.c index 057a4cd3..ca49f439 100644 --- a/src/ldso/dynlink.c +++ b/src/ldso/dynlink.c @@ -49,6 +49,7 @@ struct dso ino_t ino; int global; int relocated; + int constructed; struct dso **deps; char *name; char buf[]; @@ -471,6 +472,20 @@ static size_t find_dyn(Phdr *ph, size_t cnt, size_t stride) return 0; } +static void do_init_fini(struct dso *p) +{ + size_t dyn[DYN_CNT] = {0}; + for (; p; p=p->prev) { + if (p->constructed) return; + decode_vec(p->dynv, dyn, DYN_CNT); + if (dyn[0] & (1<base + dyn[DT_FINI])); + if (dyn[0] & (1<base + dyn[DT_INIT]))(); + p->constructed = 1; + } +} + void *__dynlink(int argc, char **argv) { size_t *auxv, aux[AUX_CNT] = {0}; @@ -520,6 +535,7 @@ void *__dynlink(int argc, char **argv) } app->name = argv[0]; app->global = 1; + app->constructed = 1; app->dynv = (void *)(app->base + find_dyn( (void *)aux[AT_PHDR], aux[AT_PHNUM], aux[AT_PHENT])); decode_dyn(app); @@ -577,6 +593,9 @@ void *__dynlink(int argc, char **argv) * error. If the dynamic loader (dlopen) will not be used, free * all memory used by the dynamic linker. */ runtime = 1; + + do_init_fini(tail); + if (!rtld_used) { free_all(head); free(sys_path); -- cgit v1.2.1