diff options
| author | Kurt Miller <kurt@cvs.openbsd.org> | 2005-09-28 18:17:43 +0000 |
|---|---|---|
| committer | Kurt Miller <kurt@cvs.openbsd.org> | 2005-09-28 18:17:43 +0000 |
| commit | 97c23e857f4f32ffbe66aa888618a747116f1d50 (patch) | |
| tree | 1e8a0f6e24fe7c64f9f85e124ef17c4a5b7f62a7 | |
| parent | 752d7e43426912f77d463a967422c99958a7ac2f (diff) | |
remove _dl_exiting dead code
| -rw-r--r-- | libexec/ld.so/library_subr.c | 4 | ||||
| -rw-r--r-- | libexec/ld.so/loader.c | 5 | ||||
| -rw-r--r-- | libexec/ld.so/resolve.h | 3 |
3 files changed, 3 insertions, 9 deletions
diff --git a/libexec/ld.so/library_subr.c b/libexec/ld.so/library_subr.c index 7f76eba742c..37bc24f55c6 100644 --- a/libexec/ld.so/library_subr.c +++ b/libexec/ld.so/library_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: library_subr.c,v 1.11 2005/09/28 15:41:06 drahn Exp $ */ +/* $OpenBSD: library_subr.c,v 1.12 2005/09/28 18:17:41 kurt Exp $ */ /* * Copyright (c) 2002 Dale Rahn @@ -389,8 +389,6 @@ _dl_unload_dlopen(void) while(node->data->opencount-- != 0) { _dl_notify_unload_shlib(node->data); _dl_run_all_dtors(); - if (_dl_exiting == 0) - _dl_unload_shlib(node->data); } TAILQ_REMOVE(&_dlopened_child_list, node, next_sib); diff --git a/libexec/ld.so/loader.c b/libexec/ld.so/loader.c index 4cefe7421e4..fa09b606f67 100644 --- a/libexec/ld.so/loader.c +++ b/libexec/ld.so/loader.c @@ -1,4 +1,4 @@ -/* $OpenBSD: loader.c,v 1.90 2005/09/22 22:33:40 drahn Exp $ */ +/* $OpenBSD: loader.c,v 1.91 2005/09/28 18:17:42 kurt Exp $ */ /* * Copyright (c) 1998 Per Fogelstrom, Opsycon AB @@ -71,8 +71,6 @@ struct r_debug *_dl_debug_map; void _dl_dopreload(char *paths); -int _dl_exiting; - void _dl_debug_state(void) { @@ -158,7 +156,6 @@ void _dl_dtors(void) { _dl_thread_kern_stop(); - _dl_exiting = 1; /* ORDER? */ _dl_unload_dlopen(); diff --git a/libexec/ld.so/resolve.h b/libexec/ld.so/resolve.h index 7254159bcee..b698d837206 100644 --- a/libexec/ld.so/resolve.h +++ b/libexec/ld.so/resolve.h @@ -1,4 +1,4 @@ -/* $OpenBSD: resolve.h,v 1.41 2005/09/28 15:41:06 drahn Exp $ */ +/* $OpenBSD: resolve.h,v 1.42 2005/09/28 18:17:42 kurt Exp $ */ /* * Copyright (c) 1998 Per Fogelstrom, Opsycon AB @@ -221,7 +221,6 @@ extern struct r_debug *_dl_debug_map; extern int _dl_pagesz; extern int _dl_errno; -extern int _dl_exiting; extern char *_dl_libpath; extern char *_dl_preload; |