From aaf1b2f5652e2f658383d432dd1b65a6a719f849 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 9 Apr 2018 02:23:07 +0100 Subject: Revert "libdl: fix dlclose() issue" This reverts commit bf4c2d242f587700e3eb2ffd5721ddaf3cdbc7e5. --- ldso/libdl/libdl.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'ldso') diff --git a/ldso/libdl/libdl.c b/ldso/libdl/libdl.c index 8f036b991..d102a48ab 100644 --- a/ldso/libdl/libdl.c +++ b/ldso/libdl/libdl.c @@ -792,7 +792,7 @@ static int do_dlclose(void *vhandle, int need_fini) struct dyn_elf *handle; ElfW(Addr) end = 0, start = (ElfW(Addr))(~0ULL); unsigned int i, j; - struct r_scope_elem *ls, *ls_next = NULL, *run_scope; + struct r_scope_elem *ls, *ls_next = NULL; struct elf_resolve **handle_rlist; #if defined(USE_TLS) && USE_TLS @@ -999,18 +999,6 @@ static int do_dlclose(void *vhandle, int need_fini) break; } } - for (run_scope = &_dl_loaded_modules->symbol_scope; run_scope; run_scope = run_scope->next) { - for (i = 0; i < run_scope->r_nlist; ++i) { - if (run_scope->r_list[i] == tpnt) { - _dl_if_debug_print("removed from symbol_scope: %s\n", tpnt->libname); - for (j = i; j < run_scope->r_nlist - 1; ++j) { - run_scope->r_list[j] = run_scope->r_list[j + 1]; - } - --run_scope->r_nlist; - break; - } - } - } } /* Next, remove tpnt from the global symbol table list */ -- cgit v1.2.3