OSDN Git Service

libdl.c: hide dl_cleanup
[uclinux-h8/uClibc.git] / ldso / libdl / libdl.c
index add476b..214e699 100644 (file)
@@ -3,7 +3,7 @@
  * Program to load an ELF binary on a linux system, and run it
  * after resolving ELF shared library symbols
  *
- * Copyright (C) 2000-2004 by Erik Andersen <andersen@codepoet.org>
+ * Copyright (C) 2000-2006 by Erik Andersen <andersen@uclibc.org>
  * Copyright (c) 1994-2000 Eric Youngdale, Peter MacDonald,
  *                             David Engel, Hongjiu Lu and Mitch D'Souza
  *
  */
 
 
-#define _GNU_SOURCE
 #include <ldso.h>
 #include <stdio.h>
+#include <string.h>
+#include <stdbool.h>
+#include <bits/uClibc_mutex.h>
 
+#ifdef __UCLIBC_HAS_TLS__
+#include <tls.h>
+#endif
+
+#if defined(USE_TLS) && USE_TLS
+#include <ldsodefs.h>
+extern void _dl_add_to_slotinfo(struct link_map  *l);
+#endif
 
-#if defined (__LIBDL_SHARED__)
+/* TODO: get rid of global lock and use more finegrained locking, or
+ * perhaps RCU for the global structures */
+__UCLIBC_MUTEX_STATIC(_dl_mutex, PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP);
+
+#ifdef SHARED
+# if defined(USE_TLS) && USE_TLS
+# include <dl-tls.h>
+extern struct link_map *_dl_update_slotinfo(unsigned long int req_modid);
+# endif
 
 /* When libdl is loaded as a shared library, we need to load in
  * and use a pile of symbols from ldso... */
-
-extern char *_dl_find_hash(const char *, struct dyn_elf *, struct elf_resolve *, int);
-extern struct elf_resolve * _dl_load_shared_library(int, struct dyn_elf **,
+#include <dl-elf.h>
+#if 0
+extern struct elf_resolve * _dl_load_shared_library(unsigned, struct dyn_elf **,
        struct elf_resolve *, char *, int);
-extern int _dl_fixup(struct dyn_elf *rpnt, int lazy);
+extern int _dl_fixup(struct dyn_elf *rpnt, struct r_scope_elem *scope, int lazy);
 extern void _dl_protect_relro(struct elf_resolve * tpnt);
+#endif
 extern int _dl_errno;
 extern struct dyn_elf *_dl_symbol_tables;
 extern struct dyn_elf *_dl_handles;
 extern struct elf_resolve *_dl_loaded_modules;
+extern void _dl_free (void *__ptr);
 extern struct r_debug *_dl_debug_addr;
 extern unsigned long _dl_error_number;
 extern void *(*_dl_malloc_function)(size_t);
+extern void (*_dl_free_function) (void *p);
+extern void _dl_run_init_array(struct elf_resolve *);
+extern void _dl_run_fini_array(struct elf_resolve *);
 #ifdef __LDSO_CACHE_SUPPORT__
 int _dl_map_cache(void);
 int _dl_unmap_cache(void);
@@ -63,34 +86,57 @@ extern void _dl_perform_mips_global_got_relocations(struct elf_resolve *tpnt, in
 extern char *_dl_debug;
 #endif
 
+#else /* !SHARED */
 
-#else /* __LIBDL_SHARED__ */
+#define _dl_malloc malloc
+#define _dl_free free
 
 /* When libdl is linked as a static library, we need to replace all
  * the symbols that otherwise would have been loaded in from ldso... */
 
 #ifdef __SUPPORT_LD_DEBUG__
-char *_dl_debug  = 0;
+char *_dl_debug  = NULL;
+char *_dl_debug_symbols   = NULL;
+char *_dl_debug_move      = NULL;
+char *_dl_debug_reloc     = NULL;
+char *_dl_debug_detail    = NULL;
+char *_dl_debug_nofixups  = NULL;
+char *_dl_debug_bindings  = NULL;
+int   _dl_debug_file      = 2;
+#endif
+const char *_dl_progname       = "";        /* Program name */
+void *(*_dl_malloc_function)(size_t);
+void (*_dl_free_function) (void *p);
+#ifdef __LDSO_LD_LIBRARY_PATH__
+char *_dl_library_path         = NULL;         /* Where we look for libraries */
 #endif
-char *_dl_library_path         = 0;         /* Where we look for libraries */
-char *_dl_ldsopath             = 0;         /* Location of the shared lib loader */
 int _dl_errno                  = 0;         /* We can't use the real errno in ldso */
 size_t _dl_pagesize            = PAGE_SIZE; /* Store the page size for use later */
 /* This global variable is also to communicate with debuggers such as gdb. */
 struct r_debug *_dl_debug_addr = NULL;
-#define _dl_malloc malloc
+
+#include "../ldso/dl-array.c"
 #include "../ldso/dl-debug.c"
-#include "dl-progname.h"
+
+
+# if defined(USE_TLS) && USE_TLS
+/*
+ * Giving this initialized value preallocates some surplus bytes in the
+ * static TLS area, see __libc_setup_tls (libc-tls.c).
+ */
+size_t _dl_tls_static_size = 2048;
+# endif
+#include LDSO_ELFINTERP
 #include "../ldso/dl-hash.c"
 #define _dl_trace_loaded_objects    0
 #include "../ldso/dl-elf.c"
-#endif /* __LIBDL_SHARED__ */
+#endif /* SHARED */
 
 #ifdef __SUPPORT_LD_DEBUG__
 # define _dl_if_debug_print(fmt, args...) \
        do { \
        if (_dl_debug) \
-               fprintf(stderr, "%s():%i: " fmt, __FUNCTION__, __LINE__, ## args); \
+               fprintf(stderr, "%s():%i: " fmt, __func__, __LINE__, ## args); \
        } while (0)
 #else
 # define _dl_if_debug_print(fmt, args...)
@@ -99,7 +145,7 @@ struct r_debug *_dl_debug_addr = NULL;
 static int do_dlclose(void *, int need_fini);
 
 
-static const char *dl_error_names[] = {
+static const char *const dl_error_names[] = {
        "",
        "File not found",
        "Unable to open /dev/zero",
@@ -116,6 +162,7 @@ static const char *dl_error_names[] = {
        "Not an ELF shared library",
        "Unable to mmap file",
        "No dynamic section",
+       "Library contains unsupported TLS",
 #ifdef ELF_USES_RELOCA
        "Unable to process REL relocs",
 #else
@@ -125,39 +172,184 @@ static const char *dl_error_names[] = {
        "Unable to resolve symbol"
 };
 
-void __attribute__ ((destructor)) dl_cleanup(void)
+
+#if defined(USE_TLS) && USE_TLS
+#ifdef SHARED
+/*
+ * Systems which do not have tls_index also probably have to define
+ * DONT_USE_TLS_INDEX.
+ */
+
+# ifndef __TLS_GET_ADDR
+#  define __TLS_GET_ADDR __tls_get_addr
+# endif
+
+/*
+ * Return the symbol address given the map of the module it is in and
+ *  the symbol record.  This is used in dl-sym.c.
+ */
+static void *
+internal_function
+_dl_tls_symaddr(struct link_map *map, const Elf32_Addr st_value)
 {
-       struct dyn_elf *d;
-       for (d = _dl_handles; d; d = d->next_handle) {
-               do_dlclose(d, 1);
+# ifndef DONT_USE_TLS_INDEX
+       tls_index tmp =
+       {
+               .ti_module = map->l_tls_modid,
+               .ti_offset = st_value
+       };
+
+       return __TLS_GET_ADDR (&tmp);
+# else
+       return __TLS_GET_ADDR (map->l_tls_modid, st_value);
+# endif
+}
+#endif
+
+/* Returns true when a non-empty entry was found.  */
+static bool
+remove_slotinfo(size_t idx, struct dtv_slotinfo_list *listp, size_t disp,
+        bool should_be_there)
+{
+       if (idx - disp >= listp->len) {
+               if (listp->next == NULL) {
+                       /*
+                        * The index is not actually valid in the slotinfo list,
+                        * because this object was closed before it was fully set
+                        * up due to some error.
+                        */
+                       _dl_assert(!should_be_there);
+               } else {
+                       if (remove_slotinfo(idx, listp->next, disp + listp->len,
+                                       should_be_there))
+                               return true;
+
+                       /*
+                        * No non-empty entry. Search from the end of this element's
+                        * slotinfo array.
+                        */
+                       idx = disp + listp->len;
+               }
+       } else {
+               struct link_map *old_map = listp->slotinfo[idx - disp].map;
+
+               /*
+                * The entry might still be in its unused state if we are
+                * closing an object that wasn't fully set up.
+                */
+               if (__builtin_expect(old_map != NULL, 1)) {
+                       _dl_assert(old_map->l_tls_modid == idx);
+
+                       /* Mark the entry as unused. */
+                       listp->slotinfo[idx - disp].gen = _dl_tls_generation + 1;
+                       listp->slotinfo[idx - disp].map = NULL;
+               }
+
+               /*
+                * If this is not the last currently used entry no need to
+                * look further.
+                */
+               if (idx != _dl_tls_max_dtv_idx)
+                       return true;
+       }
+
+       while (idx - disp > (disp == 0 ? 1 + _dl_tls_static_nelem : 0)) {
+               --idx;
+
+               if (listp->slotinfo[idx - disp].map != NULL) {
+                       /* Found a new last used index.  */
+                       _dl_tls_max_dtv_idx = idx;
+                       return true;
+               }
        }
+
+       /* No non-entry in this list element.  */
+       return false;
 }
+#endif
 
-void *dlopen(const char *libname, int flag)
+#ifndef __LDSO_NO_CLEANUP__
+void dl_cleanup(void) attribute_hidden __attribute__ ((destructor));
+void dl_cleanup(void)
+{
+       struct dyn_elf *h, *n;
+
+       for (h = _dl_handles; h; h = n) {
+               n = h->next_handle;
+               do_dlclose(h, 1);
+       }
+}
+#endif
+
+static ptrdiff_t _dl_build_local_scope (struct elf_resolve **list,
+       struct elf_resolve *map)
+{
+       struct elf_resolve **p = list;
+       struct init_fini_list *q;
+
+       *p++ = map;
+       map->init_flag |= DL_RESERVED;
+       if (map->init_fini)
+               for (q = map->init_fini; q; q = q->next)
+                       if (! (q->tpnt->init_flag & DL_RESERVED))
+                               p += _dl_build_local_scope (p, q->tpnt);
+       return p - list;
+}
+
+static void *do_dlopen(const char *libname, int flag)
 {
        struct elf_resolve *tpnt, *tfrom;
        struct dyn_elf *dyn_chain, *rpnt = NULL, *dyn_ptr, *relro_ptr, *handle;
-       struct dyn_elf *dpnt;
        ElfW(Addr) from;
        struct elf_resolve *tpnt1;
        void (*dl_brk) (void);
        int now_flag;
        struct init_fini_list *tmp, *runp, *runp2, *dep_list;
-       int nlist, i;
+       unsigned int nlist, i;
        struct elf_resolve **init_fini_list;
+       static bool _dl_init;
+       struct elf_resolve **local_scope;
+       struct r_scope_elem *ls;
+#if defined(USE_TLS) && USE_TLS
+       bool any_tls = false;
+#endif
 
        /* A bit of sanity checking... */
-       if (!(flag & (RTLD_LAZY|RTLD_NOW))) {
+       if (!(flag & (RTLD_LAZY|RTLD_NOW|RTLD_NOLOAD))) {
                _dl_error_number = LD_BAD_HANDLE;
                return NULL;
        }
 
        from = (ElfW(Addr)) __builtin_return_address(0);
 
+       if (!_dl_init) {
+               _dl_init = true;
+               _dl_malloc_function = malloc;
+               _dl_free_function = free;
+       }
        /* Cover the trivial case first */
        if (!libname)
                return _dl_symbol_tables;
 
+#ifndef SHARED
+# ifdef __SUPPORT_LD_DEBUG__
+       _dl_debug = getenv("LD_DEBUG");
+       if (_dl_debug) {
+               if (_dl_strstr(_dl_debug, "all")) {
+                       _dl_debug_detail = _dl_debug_move = _dl_debug_symbols
+                               = _dl_debug_reloc = _dl_debug_bindings = _dl_debug_nofixups = (void*)1;
+               } else {
+                       _dl_debug_detail   = strstr(_dl_debug, "detail");
+                       _dl_debug_move     = strstr(_dl_debug, "move");
+                       _dl_debug_symbols  = strstr(_dl_debug, "sym");
+                       _dl_debug_reloc    = strstr(_dl_debug, "reloc");
+                       _dl_debug_nofixups = strstr(_dl_debug, "nofix");
+                       _dl_debug_bindings = strstr(_dl_debug, "bind");
+               }
+       }
+# endif
+#endif
+
        _dl_map_cache();
 
        /*
@@ -168,31 +360,40 @@ void *dlopen(const char *libname, int flag)
         * the application.  Thus this may go away at some time
         * in the future.
         */
-       tfrom = NULL;
-       for (dpnt = _dl_symbol_tables; dpnt; dpnt = dpnt->next) {
-               tpnt = dpnt->dyn;
-               if (tpnt->loadaddr < from
-                               && (tfrom == NULL || tfrom->loadaddr < tpnt->loadaddr))
-                       tfrom = tpnt;
+       {
+               struct dyn_elf *dpnt;
+               tfrom = NULL;
+               for (dpnt = _dl_symbol_tables; dpnt; dpnt = dpnt->next) {
+                       tpnt = dpnt->dyn;
+                       if (DL_ADDR_IN_LOADADDR(from, tpnt, tfrom))
+                               tfrom = tpnt;
+               }
        }
-       for(rpnt = _dl_symbol_tables; rpnt && rpnt->next; rpnt=rpnt->next);
+       for (rpnt = _dl_symbol_tables; rpnt && rpnt->next; rpnt = rpnt->next)
+               continue;
 
        relro_ptr = rpnt;
        now_flag = (flag & RTLD_NOW) ? RTLD_NOW : 0;
        if (getenv("LD_BIND_NOW"))
                now_flag = RTLD_NOW;
 
+#if !defined SHARED && defined __LDSO_LIBRARY_PATH__
+       /* When statically linked, the _dl_library_path is not yet initialized */
+       _dl_library_path = getenv("LD_LIBRARY_PATH");
+#endif
+
        /* Try to load the specified library */
        _dl_if_debug_print("Trying to dlopen '%s', RTLD_GLOBAL:%d RTLD_NOW:%d\n",
                        (char*)libname, (flag & RTLD_GLOBAL ? 1:0), (now_flag & RTLD_NOW ? 1:0));
-       tpnt = _dl_load_shared_library(0, &rpnt, tfrom, (char*)libname, 0);
 
+       tpnt = _dl_load_shared_library((flag & RTLD_NOLOAD) ? DL_RESOLVE_NOLOAD : 0,
+                                       &rpnt, tfrom, (char*)libname, 0);
        if (tpnt == NULL) {
                _dl_unmap_cache();
                return NULL;
        }
        dyn_chain = (struct dyn_elf *) malloc(sizeof(struct dyn_elf));
-       _dl_memset(dyn_chain, 0, sizeof(struct dyn_elf));
+       memset(dyn_chain, 0, sizeof(struct dyn_elf));
        dyn_chain->dyn = tpnt;
        tpnt->rtld_flags |= (flag & RTLD_GLOBAL);
 
@@ -206,25 +407,24 @@ void *dlopen(const char *libname, int flag)
                        if (handle->dyn == tpnt) {
                                dyn_chain->init_fini.init_fini = handle->init_fini.init_fini;
                                dyn_chain->init_fini.nlist = handle->init_fini.nlist;
-                               for(i=0; i < dyn_chain->init_fini.nlist; i++)
+                               for (i = 0; i < dyn_chain->init_fini.nlist; i++)
                                        dyn_chain->init_fini.init_fini[i]->rtld_flags |= (flag & RTLD_GLOBAL);
                                dyn_chain->next = handle->next;
                                break;
                        }
                }
                return dyn_chain;
-       } else {
-               tpnt->init_flag |= DL_OPENED;
        }
 
+       tpnt->init_flag |= DL_OPENED;
+
        _dl_if_debug_print("Looking for needed libraries\n");
        nlist = 0;
        runp = alloca(sizeof(*runp));
        runp->tpnt = tpnt;
        runp->next = NULL;
        dep_list = runp2 = runp;
-       for (; runp; runp = runp->next)
-       {
+       for (; runp; runp = runp->next) {
                ElfW(Dyn) *dpnt;
                char *lpntstr;
 
@@ -232,11 +432,8 @@ void *dlopen(const char *libname, int flag)
                runp->tpnt->init_fini = NULL; /* clear any previous dependcies */
                for (dpnt = (ElfW(Dyn) *) runp->tpnt->dynamic_addr; dpnt->d_tag; dpnt++) {
                        if (dpnt->d_tag == DT_NEEDED) {
-                               char *name;
-
                                lpntstr = (char*) (runp->tpnt->dynamic_info[DT_STRTAB] +
                                                dpnt->d_un.d_val);
-                               name = _dl_get_last_path_component(lpntstr);
                                _dl_if_debug_print("Trying to load '%s', needed by '%s'\n",
                                                lpntstr, runp->tpnt->libname);
                                tpnt1 = _dl_load_shared_library(0, &rpnt, runp->tpnt, lpntstr, 0);
@@ -245,36 +442,31 @@ void *dlopen(const char *libname, int flag)
 
                                tpnt1->rtld_flags |= (flag & RTLD_GLOBAL);
 
-                               if (tpnt1->usage_count == 1) {
-                                       tpnt1->init_flag |= DL_OPENED;
-                                       /* This list is for dlsym() and relocation */
-                                       dyn_ptr->next = (struct dyn_elf *) malloc(sizeof(struct dyn_elf));
-                                       _dl_memset (dyn_ptr->next, 0, sizeof (struct dyn_elf));
-                                       dyn_ptr = dyn_ptr->next;
-                                       dyn_ptr->dyn = tpnt1;
-                               }
-                               if (tpnt1->init_flag & DL_OPENED) {
-                                       /* Used to record RTLD_LOCAL scope */
-                                       tmp = alloca(sizeof(struct init_fini_list));
-                                       tmp->tpnt = tpnt1;
-                                       tmp->next = runp->tpnt->init_fini;
-                                       runp->tpnt->init_fini = tmp;
-
-                                       for (tmp=dep_list; tmp; tmp = tmp->next) {
-                                               if (tpnt1 == tmp->tpnt) { /* if match => cirular dependency, drop it */
-                                                       _dl_if_debug_print("Circular dependency, skipping '%s',\n",
-                                                                       tmp->tpnt->libname);
-                                                       tpnt1->usage_count--;
-                                                       break;
-                                               }
-                                       }
-                                       if (!tmp) { /* Don't add if circular dependency detected */
-                                               runp2->next = alloca(sizeof(*runp));
-                                               runp2 = runp2->next;
-                                               runp2->tpnt = tpnt1;
-                                               runp2->next = NULL;
+                               /* This list is for dlsym() and relocation */
+                               dyn_ptr->next = (struct dyn_elf *) malloc(sizeof(struct dyn_elf));
+                               memset (dyn_ptr->next, 0, sizeof (struct dyn_elf));
+                               dyn_ptr = dyn_ptr->next;
+                               dyn_ptr->dyn = tpnt1;
+                               /* Used to record RTLD_LOCAL scope */
+                               tmp = alloca(sizeof(struct init_fini_list));
+                               tmp->tpnt = tpnt1;
+                               tmp->next = runp->tpnt->init_fini;
+                               runp->tpnt->init_fini = tmp;
+
+                               for (tmp=dep_list; tmp; tmp = tmp->next) {
+                                       if (tpnt1 == tmp->tpnt) { /* if match => cirular dependency, drop it */
+                                               _dl_if_debug_print("Circular dependency, skipping '%s',\n",
+                                                                  tmp->tpnt->libname);
+                                               tpnt1->usage_count--;
+                                               break;
                                        }
                                }
+                               if (!tmp) { /* Don't add if circular dependency detected */
+                                       runp2->next = alloca(sizeof(*runp));
+                                       runp2 = runp2->next;
+                                       runp2->tpnt = tpnt1;
+                                       runp2->next = NULL;
+                               }
                        }
                }
        }
@@ -284,7 +476,7 @@ void *dlopen(const char *libname, int flag)
        i = 0;
        for (runp2 = dep_list; runp2; runp2 = runp2->next) {
                init_fini_list[i++] = runp2->tpnt;
-               for(runp = runp2->tpnt->init_fini; runp; runp = runp->next){
+               for (runp = runp2->tpnt->init_fini; runp; runp = runp->next) {
                        if (!(runp->tpnt->rtld_flags & RTLD_GLOBAL)) {
                                tmp = malloc(sizeof(struct init_fini_list));
                                tmp->tpnt = runp->tpnt;
@@ -294,16 +486,33 @@ void *dlopen(const char *libname, int flag)
                }
 
        }
+       /* Build the local scope for the dynamically loaded modules. */
+       local_scope = _dl_malloc(nlist * sizeof(struct elf_resolve *)); /* Could it allocated on stack? */
+       for (i = 0; i < nlist; i++)
+               if (init_fini_list[i]->symbol_scope.r_nlist == 0) {
+                       int k, cnt;
+                       cnt = _dl_build_local_scope(local_scope, init_fini_list[i]);
+                       init_fini_list[i]->symbol_scope.r_list = _dl_malloc(cnt * sizeof(struct elf_resolve *));
+                       init_fini_list[i]->symbol_scope.r_nlist = cnt;
+                       _dl_memcpy (init_fini_list[i]->symbol_scope.r_list, local_scope,
+                                       cnt * sizeof (struct elf_resolve *));
+                       /* Restoring the init_flag.*/
+                       for (k = 0; k < nlist; k++)
+                               init_fini_list[k]->init_flag &= ~DL_RESERVED;
+               }
+
+       _dl_free(local_scope);
+
        /* Sort the INIT/FINI list in dependency order. */
        for (runp2 = dep_list; runp2; runp2 = runp2->next) {
-               int j, k;
+               unsigned int j, k;
                for (j = 0; init_fini_list[j] != runp2->tpnt; ++j)
                        /* Empty */;
                for (k = j + 1; k < nlist; ++k) {
-                       struct init_fini_list *runp = init_fini_list[k]->init_fini;
+                       struct init_fini_list *ele = init_fini_list[k]->init_fini;
 
-                       for (; runp; runp = runp->next) {
-                               if (runp->tpnt == runp2->tpnt) {
+                       for (; ele; ele = ele->next) {
+                               if (ele->tpnt == runp2->tpnt) {
                                        struct elf_resolve *here = init_fini_list[k];
                                        _dl_if_debug_print("Move %s from pos %d to %d in INIT/FINI list.\n", here->libname, k, j);
                                        for (i = (k - j); i; --i)
@@ -316,14 +525,14 @@ void *dlopen(const char *libname, int flag)
                }
        }
 #ifdef __SUPPORT_LD_DEBUG__
-       if(_dl_debug) {
+       if (_dl_debug) {
                fprintf(stderr, "\nINIT/FINI order and dependencies:\n");
-               for (i=0;i < nlist;i++) {
+               for (i = 0; i < nlist; i++) {
                        fprintf(stderr, "lib: %s has deps:\n", init_fini_list[i]->libname);
                        runp = init_fini_list[i]->init_fini;
                        for (; runp; runp = runp->next)
-                               printf(" %s ", runp->tpnt->libname);
-                       printf("\n");
+                               fprintf(stderr, " %s ", runp->tpnt->libname);
+                       fprintf(stderr, "\n");
                }
        }
 #endif
@@ -334,6 +543,12 @@ void *dlopen(const char *libname, int flag)
         * Now we go through and look for REL and RELA records that indicate fixups
         * to the GOT tables.  We need to do this in reverse order so that COPY
         * directives work correctly */
+
+       /* Get the tail of the list */
+       for (ls = &_dl_loaded_modules->symbol_scope; ls && ls->next; ls = ls->next);
+
+       /* Extend the global scope by adding the local scope of the dlopened DSO. */
+       ls->next = &dyn_chain->dyn->symbol_scope;
 #ifdef __mips__
        /*
         * Relocation of the GOT entries for MIPS have to be done
@@ -342,7 +557,7 @@ void *dlopen(const char *libname, int flag)
        _dl_perform_mips_global_got_relocations(tpnt, !now_flag);
 #endif
 
-       if (_dl_fixup(dyn_chain, now_flag))
+       if (_dl_fixup(dyn_chain, &_dl_loaded_modules->symbol_scope, now_flag))
                goto oops;
 
        if (relro_ptr) {
@@ -354,6 +569,51 @@ void *dlopen(const char *libname, int flag)
        /* TODO:  Should we set the protections of all pages back to R/O now ? */
 
 
+#if defined(USE_TLS) && USE_TLS
+
+       for (i=0; i < nlist; i++) {
+               struct elf_resolve *tmp_tpnt = init_fini_list[i];
+               /* Only add TLS memory if this object is loaded now and
+                  therefore is not yet initialized.  */
+
+               if (!(tmp_tpnt->init_flag & INIT_FUNCS_CALLED)
+               /* Only if the module defines thread local data. */
+                       && __builtin_expect (tmp_tpnt->l_tls_blocksize > 0, 0)) {
+
+                       /* Now that we know the object is loaded successfully add
+                       modules containing TLS data to the slot info table.  We
+                       might have to increase its size.  */
+                       _dl_add_to_slotinfo ((struct link_map*)tmp_tpnt);
+
+                       /* It is the case in which we couldn't perform TLS static
+                          initialization at relocation time, and we delayed it until
+                          the relocation has been completed. */
+
+                       if (tmp_tpnt->l_need_tls_init) {
+                               tmp_tpnt->l_need_tls_init = 0;
+# ifdef SHARED
+                               /* Update the slot information data for at least the
+                               generation of the DSO we are allocating data for.  */
+                               _dl_update_slotinfo (tmp_tpnt->l_tls_modid);
+# endif
+
+                               _dl_init_static_tls((struct link_map*)tmp_tpnt);
+                               _dl_assert (tmp_tpnt->l_need_tls_init == 0);
+               }
+
+               /* We have to bump the generation counter. */
+               any_tls = true;
+               }
+       }
+
+       /* Bump the generation number if necessary.  */
+       if (any_tls && __builtin_expect (++_dl_tls_generation == 0, 0)) {
+               _dl_debug_early("TLS generation counter wrapped! Please report this.");
+               _dl_exit(30);
+       }
+
+#endif
+
        /* Notify the debugger we have added some objects. */
        if (_dl_debug_addr) {
                dl_brk = (void (*)(void)) _dl_debug_addr->r_brk;
@@ -366,7 +626,6 @@ void *dlopen(const char *libname, int flag)
                }
        }
 
-#if defined (__LIBDL_SHARED__)
        /* Run the ctors and setup the dtors */
        for (i = nlist; i; --i) {
                tpnt = init_fini_list[i-1];
@@ -376,15 +635,17 @@ void *dlopen(const char *libname, int flag)
 
                if (tpnt->dynamic_info[DT_INIT]) {
                        void (*dl_elf_func) (void);
-                       dl_elf_func = (void (*)(void)) (tpnt->loadaddr + tpnt->dynamic_info[DT_INIT]);
-                       if (dl_elf_func && *dl_elf_func != NULL) {
+                       dl_elf_func = (void (*)(void)) DL_RELOC_ADDR(tpnt->loadaddr, tpnt->dynamic_info[DT_INIT]);
+                       if (dl_elf_func) {
                                _dl_if_debug_print("running ctors for library %s at '%p'\n",
                                                tpnt->libname, dl_elf_func);
-                               (*dl_elf_func) ();
+                               DL_CALL_FUNC_AT_ADDR (dl_elf_func, tpnt->loadaddr, (void(*)(void)));
                        }
                }
+
+               _dl_run_init_array(tpnt);
        }
-#endif
+
        _dl_unmap_cache();
        return (void *) dyn_chain;
 
@@ -395,14 +656,41 @@ oops:
        return NULL;
 }
 
-void *dlsym(void *vhandle, const char *name)
+void *dlopen(const char *libname, int flag)
+{
+       void *ret;
+
+       __UCLIBC_MUTEX_CONDITIONAL_LOCK(_dl_mutex, 1);
+       ret = do_dlopen(libname, flag);
+       __UCLIBC_MUTEX_CONDITIONAL_UNLOCK(_dl_mutex, 1);
+
+       return ret;
+}
+
+static void *do_dlsym(void *vhandle, const char *name, void *caller_address)
 {
        struct elf_resolve *tpnt, *tfrom;
        struct dyn_elf *handle;
        ElfW(Addr) from;
        struct dyn_elf *rpnt;
        void *ret;
-
+       struct symbol_ref sym_ref = { NULL, NULL };
+       /* Nastiness to support underscore prefixes.  */
+#ifdef __UCLIBC_UNDERSCORES__
+       char tmp_buf[80];
+       char *name2 = tmp_buf;
+       size_t nlen = strlen (name) + 1;
+       if (nlen + 1 > sizeof (tmp_buf))
+               name2 = malloc (nlen + 1);
+       if (name2 == 0) {
+               _dl_error_number = LD_ERROR_MMAP_FAILED;
+               return 0;
+       }
+       name2[0] = '_';
+       memcpy (name2 + 1, name, nlen);
+#else
+       const char *name2 = name;
+#endif
        handle = (struct dyn_elf *) vhandle;
 
        /* First of all verify that we have a real handle
@@ -416,7 +704,8 @@ void *dlsym(void *vhandle, const char *name)
                                break;
                if (!rpnt) {
                        _dl_error_number = LD_BAD_HANDLE;
-                       return NULL;
+                       ret = NULL;
+                       goto out;
                }
        } else if (handle == RTLD_NEXT) {
                /*
@@ -426,40 +715,81 @@ void *dlsym(void *vhandle, const char *name)
                 * dynamic loader itself, as it doesn't know
                 * how to properly treat it.
                 */
-               from = (ElfW(Addr)) __builtin_return_address(0);
+               from = (ElfW(Addr)) caller_address;
 
                tfrom = NULL;
                for (rpnt = _dl_symbol_tables; rpnt; rpnt = rpnt->next) {
                        tpnt = rpnt->dyn;
-                       if (tpnt->loadaddr < from
-                                       && (tfrom == NULL || tfrom->loadaddr < tpnt->loadaddr)) {
+                       if (DL_ADDR_IN_LOADADDR(from, tpnt, tfrom)) {
                                tfrom = tpnt;
                                handle = rpnt->next;
                        }
                }
        }
-
-       ret = _dl_find_hash((char*)name, handle, NULL, 0);
+       tpnt = NULL;
+       if (handle == _dl_symbol_tables)
+               tpnt = handle->dyn; /* Only search RTLD_GLOBAL objs if global object */
+       ret = _dl_find_hash(name2, &handle->dyn->symbol_scope, tpnt, ELF_RTYPE_CLASS_DLSYM, &sym_ref);
+
+#if defined(USE_TLS) && USE_TLS && defined SHARED
+       if (sym_ref.sym && (ELF_ST_TYPE(sym_ref.sym->st_info) == STT_TLS) && (sym_ref.tpnt)) {
+               /* The found symbol is a thread-local storage variable.
+               Return its address for the current thread.  */
+               ret = _dl_tls_symaddr ((struct link_map *)sym_ref.tpnt, (Elf32_Addr)ret);
+       }
+#endif
 
        /*
         * Nothing found.
         */
        if (!ret)
                _dl_error_number = LD_NO_SYMBOL;
+out:
+#ifdef __UCLIBC_UNDERSCORES__
+       if (name2 != tmp_buf)
+               free (name2);
+#endif
+       return ret;
+}
+
+void *dlsym(void *vhandle, const char *name)
+{
+       void *ret;
+
+       __UCLIBC_MUTEX_CONDITIONAL_LOCK(_dl_mutex, 1);
+       ret = do_dlsym(vhandle, name, __builtin_return_address(0));
+       __UCLIBC_MUTEX_CONDITIONAL_UNLOCK(_dl_mutex, 1);
+
        return ret;
 }
 
+#if 0
+void *dlvsym(void *vhandle, const char *name, const char *version)
+{
+       return dlsym(vhandle, name);
+}
+#endif
+
 static int do_dlclose(void *vhandle, int need_fini)
 {
-       struct dyn_elf *rpnt, *rpnt1;
+       struct dyn_elf *rpnt, *rpnt1, *rpnt1_tmp;
        struct init_fini_list *runp, *tmp;
        ElfW(Phdr) *ppnt;
        struct elf_resolve *tpnt, *run_tpnt;
        int (*dl_elf_fini) (void);
        void (*dl_brk) (void);
        struct dyn_elf *handle;
-       unsigned int end;
-       int i = 0, j;
+       unsigned int end = 0, start = 0xffffffff;
+       unsigned int i, j;
+       struct r_scope_elem *ls, *ls_next = NULL;
+       struct elf_resolve **handle_rlist;
+
+#if defined(USE_TLS) && USE_TLS
+       bool any_tls = false;
+       size_t tls_free_start = NO_TLS_OFFSET;
+       size_t tls_free_end = NO_TLS_OFFSET;
+       struct link_map *tls_lmap;
+#endif
 
        handle = (struct dyn_elf *) vhandle;
        if (handle == _dl_symbol_tables)
@@ -481,22 +811,43 @@ static int do_dlclose(void *vhandle, int need_fini)
                _dl_handles = rpnt->next_handle;
        _dl_if_debug_print("%s: usage count: %d\n",
                        handle->dyn->libname, handle->dyn->usage_count);
-       if (handle->dyn->usage_count != 1) {
+       if (handle->dyn->usage_count != 1 || (handle->dyn->rtld_flags & RTLD_NODELETE)) {
                handle->dyn->usage_count--;
                free(handle);
                return 0;
        }
+
+       /* Store the handle's local scope array for later removal */
+       handle_rlist = handle->dyn->symbol_scope.r_list;
+
+       /* Store references to the local scope entries for later removal */
+       for (ls = &_dl_loaded_modules->symbol_scope; ls && ls->next; ls = ls->next)
+               if (ls->next->r_list[0] == handle->dyn) {
+                       break;
+               }
+       /* ls points to the previous local symbol scope */
+       if(ls && ls->next)
+               ls_next = ls->next->next;
+
        /* OK, this is a valid handle - now close out the file */
        for (j = 0; j < handle->init_fini.nlist; ++j) {
                tpnt = handle->init_fini.init_fini[j];
-               if (--tpnt->usage_count == 0) {
-                       if (tpnt->dynamic_info[DT_FINI] && need_fini &&
-                           !(tpnt->init_flag & FINI_FUNCS_CALLED)) {
+               tpnt->usage_count--;
+               if (tpnt->usage_count == 0 && !(tpnt->rtld_flags & RTLD_NODELETE)) {
+                       if ((tpnt->dynamic_info[DT_FINI]
+                            || tpnt->dynamic_info[DT_FINI_ARRAY])
+                        && need_fini
+                        && !(tpnt->init_flag & FINI_FUNCS_CALLED)
+                       ) {
                                tpnt->init_flag |= FINI_FUNCS_CALLED;
-                               dl_elf_fini = (int (*)(void)) (tpnt->loadaddr + tpnt->dynamic_info[DT_FINI]);
-                               _dl_if_debug_print("running dtors for library %s at '%p'\n",
-                                               tpnt->libname, dl_elf_fini);
-                               (*dl_elf_fini) ();
+                               _dl_run_fini_array(tpnt);
+
+                               if (tpnt->dynamic_info[DT_FINI]) {
+                                       dl_elf_fini = (int (*)(void)) DL_RELOC_ADDR(tpnt->loadaddr, tpnt->dynamic_info[DT_FINI]);
+                                       _dl_if_debug_print("running dtors for library %s at '%p'\n",
+                                                       tpnt->libname, dl_elf_fini);
+                                       DL_CALL_FUNC_AT_ADDR (dl_elf_fini, tpnt->loadaddr, (int (*)(void)));
+                               }
                        }
 
                        _dl_if_debug_print("unmapping: %s\n", tpnt->libname);
@@ -505,11 +856,118 @@ static int do_dlclose(void *vhandle, int need_fini)
                                        i < tpnt->n_phent; ppnt++, i++) {
                                if (ppnt->p_type != PT_LOAD)
                                        continue;
+                               if (ppnt->p_vaddr < start)
+                                       start = ppnt->p_vaddr;
                                if (end < ppnt->p_vaddr + ppnt->p_memsz)
                                        end = ppnt->p_vaddr + ppnt->p_memsz;
                        }
-                       _dl_munmap((void*)tpnt->loadaddr, end);
-                       /* Free elements in RTLD_LOCAL scope list */ 
+
+#if defined(USE_TLS) && USE_TLS
+                       /* Do the cast to make things easy. */
+                       tls_lmap = (struct link_map *) tpnt;
+
+                       /* Remove the object from the dtv slotinfo array if it uses TLS. */
+                       if (__builtin_expect (tls_lmap->l_tls_blocksize > 0, 0)) {
+                               any_tls = true;
+
+                               if (_dl_tls_dtv_slotinfo_list != NULL
+                                               && ! remove_slotinfo (tls_lmap->l_tls_modid,
+                                               _dl_tls_dtv_slotinfo_list, 0,
+                                               (tpnt->init_flag & INIT_FUNCS_CALLED)))
+                                       /* All dynamically loaded modules with TLS are unloaded. */
+                                       _dl_tls_max_dtv_idx = _dl_tls_static_nelem;
+
+                               if (tls_lmap->l_tls_offset != NO_TLS_OFFSET) {
+                                       /*
+                                        * Collect a contiguous chunk built from the objects in
+                                        * this search list, going in either direction.  When the
+                                        * whole chunk is at the end of the used area then we can
+                                        * reclaim it.
+                                        */
+# if defined(TLS_TCB_AT_TP)
+                                       if (tls_free_start == NO_TLS_OFFSET
+                                               || (size_t) tls_lmap->l_tls_offset == tls_free_start) {
+                                               /* Extend the contiguous chunk being reclaimed. */
+                                               tls_free_start
+                                                       = tls_lmap->l_tls_offset -
+                                                         tls_lmap->l_tls_blocksize;
+
+                                               if (tls_free_end == NO_TLS_OFFSET)
+                                                       tls_free_end = tls_lmap->l_tls_offset;
+                                       } else if (tls_lmap->l_tls_offset - tls_lmap->l_tls_blocksize
+                                                       == tls_free_end)
+                                               /* Extend the chunk backwards.  */
+                                               tls_free_end = tls_lmap->l_tls_offset;
+                                       else {
+                                               /*
+                                                * This isn't contiguous with the last chunk freed.
+                                                * One of them will be leaked unless we can free
+                                                * one block right away.
+                                                */
+                                               if (tls_free_end == _dl_tls_static_used) {
+                                                       _dl_tls_static_used = tls_free_start;
+                                                       tls_free_end = tls_lmap->l_tls_offset;
+                                                       tls_free_start
+                                                               = tls_free_end - tls_lmap->l_tls_blocksize;
+                                               } else if ((size_t) tls_lmap->l_tls_offset
+                                                               == _dl_tls_static_used)
+                                                       _dl_tls_static_used = tls_lmap->l_tls_offset -
+                                                               tls_lmap->l_tls_blocksize;
+                                               else if (tls_free_end < (size_t) tls_lmap->l_tls_offset) {
+                                                       /*
+                                                        * We pick the later block. It has a chance
+                                                        * to be freed.
+                                                        */
+                                                       tls_free_end = tls_lmap->l_tls_offset;
+                                                       tls_free_start = tls_free_end -
+                                                               tls_lmap->l_tls_blocksize;
+                                               }
+                                       }
+# elif defined(TLS_DTV_AT_TP)
+                                       if ((size_t) tls_lmap->l_tls_offset == tls_free_end)
+                                               /* Extend the contiguous chunk being reclaimed. */
+                                               tls_free_end -= tls_lmap->l_tls_blocksize;
+                                       else if (tls_lmap->l_tls_offset + tls_lmap->l_tls_blocksize
+                                                       == tls_free_start)
+                                               /* Extend the chunk backwards. */
+                                               tls_free_start = tls_lmap->l_tls_offset;
+                                       else {
+                                               /*
+                                                * This isn't contiguous with the last chunk
+                                                * freed. One of them will be leaked.
+                                                */
+                                               if (tls_free_end == _dl_tls_static_used)
+                                                       _dl_tls_static_used = tls_free_start;
+                                               tls_free_start = tls_lmap->l_tls_offset;
+                                               tls_free_end = tls_free_start +
+                                                       tls_lmap->l_tls_blocksize;
+                                       }
+# else
+#  error Either TLS_TCB_AT_TP or TLS_DTV_AT_TP must be defined
+# endif
+                               } else {
+
+#define TLS_DTV_UNALLOCATED    ((void *) -1l)
+
+                                       dtv_t *dtv = THREAD_DTV ();
+
+                                       _dl_assert(!(dtv[tls_lmap->l_tls_modid].pointer.is_static));
+                                       if (dtv[tls_lmap->l_tls_modid].pointer.val != TLS_DTV_UNALLOCATED) {
+                                               /* Note that free is called for NULL is well.  We
+                                               deallocate even if it is this dtv entry we are
+                                               supposed to load.  The reason is that we call
+                                               memalign and not malloc.  */
+                                               _dl_free (dtv[tls_lmap->l_tls_modid].pointer.val);
+                                               dtv[tls_lmap->l_tls_modid].pointer.val = TLS_DTV_UNALLOCATED;
+                                       }
+                               }
+                       }
+#endif
+
+                       end = (end + ADDR_ALIGN) & PAGE_ALIGN;
+                       start = start & ~ADDR_ALIGN;
+                       DL_LIB_UNMAP (tpnt, end - start);
+                       /* Free elements in RTLD_LOCAL scope list */
                        for (runp = tpnt->rtld_local; runp; runp = tmp) {
                                tmp = runp->next;
                                free(runp);
@@ -520,8 +978,8 @@ static int do_dlclose(void *vhandle, int need_fini)
                                _dl_loaded_modules = tpnt->next;
                                if (_dl_loaded_modules)
                                        _dl_loaded_modules->prev = 0;
-                       } else
-                               for (run_tpnt = _dl_loaded_modules; run_tpnt; run_tpnt = run_tpnt->next)
+                       } else {
+                               for (run_tpnt = _dl_loaded_modules; run_tpnt; run_tpnt = run_tpnt->next) {
                                        if (run_tpnt->next == tpnt) {
                                                _dl_if_debug_print("removing loaded_modules: %s\n", tpnt->libname);
                                                run_tpnt->next = run_tpnt->next->next;
@@ -529,6 +987,8 @@ static int do_dlclose(void *vhandle, int need_fini)
                                                        run_tpnt->next->prev = run_tpnt;
                                                break;
                                        }
+                               }
+                       }
 
                        /* Next, remove tpnt from the global symbol table list */
                        if (_dl_symbol_tables) {
@@ -536,25 +996,50 @@ static int do_dlclose(void *vhandle, int need_fini)
                                        _dl_symbol_tables = _dl_symbol_tables->next;
                                        if (_dl_symbol_tables)
                                                _dl_symbol_tables->prev = 0;
-                               } else
+                               } else {
                                        for (rpnt1 = _dl_symbol_tables; rpnt1->next; rpnt1 = rpnt1->next) {
                                                if (rpnt1->next->dyn == tpnt) {
                                                        _dl_if_debug_print("removing symbol_tables: %s\n", tpnt->libname);
+                                                       rpnt1_tmp = rpnt1->next->next;
                                                        free(rpnt1->next);
-                                                       rpnt1->next = rpnt1->next->next;
+                                                       rpnt1->next = rpnt1_tmp;
                                                        if (rpnt1->next)
                                                                rpnt1->next->prev = rpnt1;
                                                        break;
                                                }
                                        }
+                               }
                        }
                        free(tpnt->libname);
+                       if (handle->dyn != tpnt)
+                               free(tpnt->symbol_scope.r_list);
                        free(tpnt);
                }
        }
+       /* Unlink and release the handle's local scope from global one */
+       if(ls)
+               ls->next = ls_next;
+       free(handle_rlist);
+
+       for (rpnt1 = handle->next; rpnt1; rpnt1 = rpnt1_tmp) {
+               rpnt1_tmp = rpnt1->next;
+               free(rpnt1);
+       }
        free(handle->init_fini.init_fini);
        free(handle);
 
+#if defined(USE_TLS) && USE_TLS
+       /* If we removed any object which uses TLS bump the generation counter.  */
+       if (any_tls) {
+               if (__builtin_expect(++_dl_tls_generation == 0, 0)) {
+                       _dl_debug_early("TLS generation counter wrapped!  Please report to the uClibc mailing list.\n");
+                       _dl_exit(30);
+               }
+
+               if (tls_free_end == _dl_tls_static_used)
+                       _dl_tls_static_used = tls_free_start;
+       }
+#endif
 
        if (_dl_debug_addr) {
                dl_brk = (void (*)(void)) _dl_debug_addr->r_brk;
@@ -572,7 +1057,13 @@ static int do_dlclose(void *vhandle, int need_fini)
 
 int dlclose(void *vhandle)
 {
-       return do_dlclose(vhandle, 1);
+       int ret;
+
+       __UCLIBC_MUTEX_CONDITIONAL_LOCK(_dl_mutex, 1);
+       ret = do_dlclose(vhandle, 1);
+       __UCLIBC_MUTEX_CONDITIONAL_UNLOCK(_dl_mutex, 1);
+
+       return ret;
 }
 
 char *dlerror(void)
@@ -587,9 +1078,10 @@ char *dlerror(void)
 }
 
 /*
- * Dump information to stderrr about the current loaded modules
+ * Dump information to stderr about the current loaded modules
  */
-static char *type[] = { "Lib", "Exe", "Int", "Mod" };
+#ifdef __USE_GNU
+static const char type[][4] = { "Lib", "Exe", "Int", "Mod" };
 
 int dlinfo(void)
 {
@@ -600,7 +1092,7 @@ int dlinfo(void)
        /* First start with a complete list of all of the loaded files. */
        for (tpnt = _dl_loaded_modules; tpnt; tpnt = tpnt->next) {
                fprintf(stderr, "\t%p %p %p %s %d %s\n",
-                       tpnt->loadaddr, tpnt, tpnt->symbol_scope,
+                       DL_LOADADDR_BASE(tpnt->loadaddr), tpnt, tpnt->symbol_scope,
                        type[tpnt->libtype],
                        tpnt->usage_count, tpnt->libname);
        }
@@ -618,7 +1110,7 @@ int dlinfo(void)
        return 0;
 }
 
-int dladdr(const void *__address, Dl_info * __info)
+static int do_dladdr(const void *__address, Dl_info * __info)
 {
        struct elf_resolve *pelf;
        struct elf_resolve *rpnt;
@@ -630,22 +1122,20 @@ int dladdr(const void *__address, Dl_info * __info)
         */
        pelf = NULL;
 
-#if 0
-       fprintf(stderr, "dladdr( %p, %p )\n", __address, __info);
-#endif
+       _dl_if_debug_print("__address: %p  __info: %p\n", __address, __info);
+
+       __address = DL_LOOKUP_ADDRESS (__address);
 
        for (rpnt = _dl_loaded_modules; rpnt; rpnt = rpnt->next) {
                struct elf_resolve *tpnt;
 
                tpnt = rpnt;
-#if 0
-               fprintf(stderr, "Module \"%s\" at %p\n",
-                               tpnt->libname, tpnt->loadaddr);
-#endif
-               if (tpnt->loadaddr < (ElfW(Addr)) __address
-                               && (pelf == NULL || pelf->loadaddr < tpnt->loadaddr)) {
+
+               _dl_if_debug_print("Module \"%s\" at %p\n",
+                                  tpnt->libname, DL_LOADADDR_BASE(tpnt->loadaddr));
+
+               if (DL_ADDR_IN_LOADADDR((ElfW(Addr)) __address, tpnt, pelf))
                        pelf = tpnt;
-               }
        }
 
        if (!pelf) {
@@ -659,39 +1149,87 @@ int dladdr(const void *__address, Dl_info * __info)
        {
                char *strtab;
                ElfW(Sym) *symtab;
-               int hn, si;
-               int sf;
-               int sn = 0;
-               ElfW(Addr) sa;
+               unsigned int hn, si, sn, sf;
+               ElfW(Addr) sa = 0;
+
+               /* Set the info for the object the address lies in */
+               __info->dli_fname = pelf->libname;
+               __info->dli_fbase = (void *)pelf->mapaddr;
 
-               sa = 0;
                symtab = (ElfW(Sym) *) (pelf->dynamic_info[DT_SYMTAB]);
                strtab = (char *) (pelf->dynamic_info[DT_STRTAB]);
 
-               sf = 0;
+               sf = sn = 0;
+
+#ifdef __LDSO_GNU_HASH_SUPPORT__
+               if (pelf->l_gnu_bitmask) {
+                       for (hn = 0; hn < pelf->nbucket; hn++) {
+                               si = pelf->l_gnu_buckets[hn];
+                               if (!si)
+                                       continue;
+
+                               const Elf32_Word *hasharr = &pelf->l_gnu_chain_zero[si];
+                               do {
+                                       ElfW(Addr) symbol_addr;
+
+                                       symbol_addr = (ElfW(Addr)) DL_RELOC_ADDR(pelf->loadaddr, symtab[si].st_value);
+                                       if ((symtab[si].st_shndx != SHN_UNDEF
+                                                || symtab[si].st_value != 0)
+                                               && ELF_ST_TYPE(symtab[si].st_info) != STT_TLS
+                                               && DL_ADDR_SYM_MATCH(symbol_addr, &symtab[si], sa,
+                                                                                        (ElfW(Addr)) __address)) {
+                                               sa = symbol_addr;
+                                               sn = si;
+                                               sf = 1;
+                                       }
+                                       _dl_if_debug_print("Symbol \"%s\" at %p\n", strtab + symtab[si].st_name, symbol_addr);
+                                       ++si;
+                               } while ((*hasharr++ & 1u) == 0);
+                       }
+               } else
+#endif
                for (hn = 0; hn < pelf->nbucket; hn++) {
                        for (si = pelf->elf_buckets[hn]; si; si = pelf->chains[si]) {
                                ElfW(Addr) symbol_addr;
 
-                               symbol_addr = pelf->loadaddr + symtab[si].st_value;
-                               if (symbol_addr <= (ElfW(Addr))__address && (!sf || sa < symbol_addr)) {
+                               symbol_addr = (ElfW(Addr)) DL_RELOC_ADDR(pelf->loadaddr, symtab[si].st_value);
+                               if ((symtab[si].st_shndx != SHN_UNDEF
+                                        || symtab[si].st_value != 0)
+                                       && ELF_ST_TYPE(symtab[si].st_info) != STT_TLS
+                                       && DL_ADDR_SYM_MATCH(symbol_addr, &symtab[si], sa,
+                                                                                (ElfW(Addr)) __address)) {
                                        sa = symbol_addr;
                                        sn = si;
                                        sf = 1;
                                }
-#if 0
-                               fprintf(stderr, "Symbol \"%s\" at %p\n",
-                                               strtab + symtab[si].st_name, symbol_addr);
-#endif
+
+                               _dl_if_debug_print("Symbol \"%s\" at %p\n",
+                                                  strtab + symtab[si].st_name, symbol_addr);
                        }
                }
 
                if (sf) {
-                       __info->dli_fname = pelf->libname;
-                       __info->dli_fbase = (void *)pelf->loadaddr;
+                       /* A nearest symbol has been found; fill the entries */
                        __info->dli_sname = strtab + symtab[sn].st_name;
                        __info->dli_saddr = (void *)sa;
+               } else {
+                       /* No symbol found, fill entries with NULL value,
+                       only the containing object will be returned. */
+                       __info->dli_sname = NULL;
+                       __info->dli_saddr = NULL;
                }
                return 1;
        }
 }
+#endif
+
+int dladdr(const void *__address, Dl_info * __info)
+{
+       int ret;
+
+       __UCLIBC_MUTEX_CONDITIONAL_LOCK(_dl_mutex, 1);
+       ret = do_dladdr(__address, __info);
+       __UCLIBC_MUTEX_CONDITIONAL_UNLOCK(_dl_mutex, 1);
+
+       return ret;
+}