OSDN Git Service

Avoid warnings about shifting more bits than we have
[uclinux-h8/uClibc.git] / ldso / libdl / libdl.c
index d09210a..8646a74 100644 (file)
+/* vi: set sw=4 ts=4: */
 /*
- * libdl.c
- * 
- * Functions required for dlopen et. al.
+ * Program to load an ELF binary on a linux system, and run it
+ * after resolving ELF shared library symbols
+ *
+ * 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
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. The name of the above contributors may not be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
  */
 
-#include <ldso.h>
-
-
-/* The public interfaces */
-void *dlopen(const char *, int) __attribute__ ((__weak__, __alias__ ("_dlopen")));
-int dlclose(void *) __attribute__ ((__weak__, __alias__ ("_dlclose")));
-void *dlsym(void *, const char *) __attribute__ ((__weak__, __alias__ ("_dlsym")));
-const char *dlerror(void) __attribute__ ((__weak__, __alias__ ("_dlerror")));
-int dladdr(void *, Dl_info *) __attribute__ ((__weak__, __alias__ ("_dladdr")));
-void _dlinfo(void);
 
-
-#ifdef __PIC__
-/* This is a real hack.  We need access to the dynamic linker, but we
-also need to make it possible to link against this library without any
-unresolved externals.  We provide these weak symbols to make the link
-possible, but at run time the normal symbols are accessed. */
-static void __attribute__ ((unused)) foobar(void)
-{
-       const char msg[]="libdl library not correctly linked\n";
-       _dl_write(2, msg, _dl_strlen(msg));
-       _dl_exit(1);
-}
-
-static int __attribute__ ((unused)) foobar1 = (int) foobar;    /* Use as pointer */
-extern void _dl_dprintf(int, const char *, ...) __attribute__ ((__weak__, __alias__ ("foobar")));
-extern char *_dl_find_hash(const char *, struct dyn_elf *, struct elf_resolve *, enum caller_type)
-       __attribute__ ((__weak__, __alias__ ("foobar")));
-extern struct elf_resolve * _dl_load_shared_library(int, struct dyn_elf **, struct elf_resolve *, char *)
-       __attribute__ ((__weak__, __alias__ ("foobar")));
-extern struct elf_resolve * _dl_check_if_named_library_is_loaded(const char *full_libname)
-       __attribute__ ((__weak__, __alias__ ("foobar")));
-extern int _dl_fixup(struct dyn_elf *rpnt, int lazy)
-        __attribute__ ((__weak__, __alias__ ("foobar")));
+#include <ldso.h>
+#include <stdio.h>
+#include <string.h> /* Needed for 'strstr' prototype' */
+#include <stdbool.h>
+
+
+#ifdef SHARED
+
+/* 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 **,
+       struct elf_resolve *, char *, int);
+extern int _dl_fixup(struct dyn_elf *rpnt, int lazy);
+extern void _dl_protect_relro(struct elf_resolve * tpnt);
+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 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);
+#endif
 #ifdef __mips__
-extern void _dl_perform_mips_global_got_relocations(struct elf_resolve *tpnt)
-       __attribute__ ((__weak__, __alias__ ("foobar")));
+extern void _dl_perform_mips_global_got_relocations(struct elf_resolve *tpnt, int lazy);
 #endif
-#ifdef USE_CACHE
-int _dl_map_cache(void) __attribute__ ((__weak__, __alias__ ("foobar")));
-int _dl_unmap_cache(void) __attribute__ ((__weak__, __alias__ ("foobar")));
-#endif 
-
-extern struct dyn_elf *_dl_symbol_tables __attribute__ ((__weak__, __alias__ ("foobar1")));
-extern struct dyn_elf *_dl_handles __attribute__ ((__weak__, __alias__ ("foobar1")));
-extern struct elf_resolve *_dl_loaded_modules __attribute__ ((__weak__, __alias__ ("foobar1")));
-extern struct r_debug *_dl_debug_addr __attribute__ ((__weak__, __alias__ ("foobar1")));
-extern unsigned long _dl_error_number __attribute__ ((__weak__, __alias__ ("foobar1")));
-extern void *(*_dl_malloc_function)(size_t) __attribute__ ((__weak__, __alias__ ("foobar1")));
 #ifdef __SUPPORT_LD_DEBUG__
-extern char *_dl_debug __attribute__ ((__weak__, __alias__ ("foobar1")));
-extern char *_dl_debug_symbols __attribute__ ((__weak__, __alias__ ("foobar1")));
-extern char *_dl_debug_move __attribute__ ((__weak__, __alias__ ("foobar1")));
-extern char *_dl_debug_reloc __attribute__ ((__weak__, __alias__ ("foobar1")));
-extern char *_dl_debug_detail __attribute__ ((__weak__, __alias__ ("foobar1")));
-extern char *_dl_debug_nofixups __attribute__ ((__weak__, __alias__ ("foobar1")));
-extern char *_dl_debug_bindings __attribute__ ((__weak__, __alias__ ("foobar1")));
-extern int   _dl_debug_file __attribute__ ((__weak__, __alias__ ("foobar1")));
+extern char *_dl_debug;
 #endif
 
-#else  /* __PIC__ */
+#else /* !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_symbols = 0;
-char *_dl_debug_move    = 0;
-char *_dl_debug_reloc   = 0;
-char *_dl_debug_detail  = 0;
-char *_dl_debug_nofixups  = 0;
-char *_dl_debug_bindings  = 0;
-int   _dl_debug_file = 2;
+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      = NULL;
 #endif
-char *_dl_library_path = 0;
-char *_dl_ldsopath = 0;
+const char *_dl_progname       = "";        /* Program name */
+void *(*_dl_malloc_function)(size_t);
+void (*_dl_free_function) (void *p);
+char *_dl_library_path         = NULL;         /* Where we look for libraries */
+char *_dl_ldsopath             = NULL;         /* 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;
-static char *_dl_malloc_addr, *_dl_mmap_zero;
-#include "../ldso/_dl_progname.h"               /* Pull in the name of ld.so */
-#include "../ldso/hash.c"
+
+#include "../ldso/dl-array.c"
+#include "../ldso/dl-debug.c"
+#include LDSO_ELFINTERP
+#include "../ldso/dl-hash.c"
 #define _dl_trace_loaded_objects    0
-#include "../ldso/readelflib1.c"
-void *(*_dl_malloc_function) (size_t size);
-int _dl_fixup(struct dyn_elf *rpnt, int lazy);
+#include "../ldso/dl-elf.c"
+#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); \
+       } while (0)
+#else
+# define _dl_if_debug_print(fmt, args...)
 #endif
 
 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",
@@ -117,26 +142,29 @@ static const char *dl_error_names[] = {
        "Unable to resolve symbol"
 };
 
-static void __attribute__ ((destructor)) dl_cleanup(void)
+void dl_cleanup(void) __attribute__ ((destructor));
+void dl_cleanup(void)
 {
-       struct dyn_elf *d;
+       struct dyn_elf *h, *n;
 
-       for (d = _dl_handles; d; d = d->next_handle)
-               if (d->dyn->libtype == loaded_file && d->dyn->dynamic_info[DT_FINI]) {
-                       (* ((int (*)(void)) (d->dyn->loadaddr + d->dyn->dynamic_info[DT_FINI]))) ();
-                       d->dyn->dynamic_info[DT_FINI] = 0;
-               }
+       for (h = _dl_handles; h; h = n) {
+               n = h->next_handle;
+               do_dlclose(h, 1);
+       }
 }
 
-void *_dlopen(const char *libname, int flag)
+void *dlopen(const char *libname, int flag)
 {
-       struct elf_resolve *tpnt, *tfrom, *tcurr;
-       struct dyn_elf *dyn_chain, *rpnt = NULL;
-       struct dyn_elf *dpnt;
-       static int dl_init = 0;
+       struct elf_resolve *tpnt, *tfrom;
+       struct dyn_elf *dyn_chain, *rpnt = NULL, *dyn_ptr, *relro_ptr, *handle;
        ElfW(Addr) from;
        struct elf_resolve *tpnt1;
        void (*dl_brk) (void);
+       int now_flag;
+       struct init_fini_list *tmp, *runp, *runp2, *dep_list;
+       unsigned int nlist, i;
+       struct elf_resolve **init_fini_list;
+       static bool _dl_init;
 
        /* A bit of sanity checking... */
        if (!(flag & (RTLD_LAZY|RTLD_NOW))) {
@@ -146,135 +174,228 @@ void *_dlopen(const char *libname, int flag)
 
        from = (ElfW(Addr)) __builtin_return_address(0);
 
-       /* Have the dynamic linker use the regular malloc function now */
-       if (!dl_init) {
-               dl_init++;
+       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();
 
        /*
         * Try and locate the module we were called from - we
-        * need this so that we get the correct RPATH.  Note that
+        * need this so that we get the correct RPATH/RUNPATH.  Note that
         * this is the current behavior under Solaris, but the
         * ABI+ specifies that we should only use the RPATH from
         * 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)
+               continue;
 
-       /* Try to load the specified library */
-#ifdef __SUPPORT_LD_DEBUG__
-       if(_dl_debug) 
-       _dl_dprintf(_dl_debug_file, "Trying to dlopen '%s'\n", (char*)libname);
+       relro_ptr = rpnt;
+       now_flag = (flag & RTLD_NOW) ? RTLD_NOW : 0;
+       if (getenv("LD_BIND_NOW"))
+               now_flag = RTLD_NOW;
+
+#ifndef SHARED
+       /* When statically linked, the _dl_library_path is not yet initialized */
+       _dl_library_path = getenv("LD_LIBRARY_PATH");
 #endif
-       tpnt = _dl_load_shared_library(0, &rpnt, tfrom, (char*)libname);
+
+       /* 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);
+
        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));
        dyn_chain->dyn = tpnt;
-       dyn_chain->flags = flag;
-       if (!tpnt->symbol_scope)
-               tpnt->symbol_scope = dyn_chain;
+       tpnt->rtld_flags |= (flag & RTLD_GLOBAL);
 
        dyn_chain->next_handle = _dl_handles;
-       _dl_handles = rpnt = dyn_chain;
-
-       if (tpnt->init_flag & INIT_FUNCS_CALLED) {
-           /* If the init and fini stuff has already been run, that means
-            * the dlopen'd library has already been loaded, and nothing
-            * further needs to be done. */
-           return (void *) dyn_chain;
+       _dl_handles = dyn_ptr = dyn_chain;
+
+       if (tpnt->usage_count > 1) {
+               _dl_if_debug_print("Lib: %s already opened\n", libname);
+               /* see if there is a handle from a earlier dlopen */
+               for (handle = _dl_handles->next_handle; handle; handle = handle->next_handle) {
+                       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++)
+                                       dyn_chain->init_fini.init_fini[i]->rtld_flags |= (flag & RTLD_GLOBAL);
+                               dyn_chain->next = handle->next;
+                               break;
+                       }
+               }
+               return dyn_chain;
        }
 
+       tpnt->init_flag |= DL_OPENED;
 
-#ifdef __SUPPORT_LD_DEBUG__
-       if(_dl_debug) 
-       _dl_dprintf(_dl_debug_file, "Looking for needed libraries\n");
-#endif
-
-       for (tcurr = tpnt; tcurr; tcurr = tcurr->next)
-       {
-               Elf32_Dyn *dpnt;
+       _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) {
+               ElfW(Dyn) *dpnt;
                char *lpntstr;
-               for (dpnt = (Elf32_Dyn *) tcurr->dynamic_addr; dpnt->d_tag; dpnt++) {
-                       if (dpnt->d_tag == DT_NEEDED) {
 
-                               char *name;
-                               lpntstr = (char*) (tcurr->loadaddr + tcurr->dynamic_info[DT_STRTAB] + 
-                                       dpnt->d_un.d_val);
-                               name = _dl_get_last_path_component(lpntstr);
-
-#ifdef __SUPPORT_LD_DEBUG__
-                               if(_dl_debug) 
-                               _dl_dprintf(_dl_debug_file, "Trying to load '%s', needed by '%s'\n", 
-                                               lpntstr, tcurr->libname);
-#endif
-
-                               if (!(tpnt1 = _dl_load_shared_library(0, &rpnt, tcurr, lpntstr))) {
+               nlist++;
+               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) {
+                               lpntstr = (char*) (runp->tpnt->dynamic_info[DT_STRTAB] +
+                                               dpnt->d_un.d_val);
+                               _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);
+                               if (!tpnt1)
                                        goto oops;
-                               }
 
-#if 1
-//FIXME:  Enabling this is _so_ wrong....
-                               /* We need global symbol resolution for everything
-                                * in the dependent chain */
-                               dyn_chain->flags |= RTLD_GLOBAL;
-#endif
-
-                               rpnt->next = (struct dyn_elf *) malloc(sizeof(struct dyn_elf));
-                               _dl_memset (rpnt->next, 0, sizeof (struct dyn_elf));
-                               rpnt = rpnt->next;
-                               if (!tpnt1->symbol_scope) tpnt1->symbol_scope = rpnt;
-                               rpnt->dyn = tpnt1;
+                               tpnt1->rtld_flags |= (flag & RTLD_GLOBAL);
+
+                               /* 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;
+                               /* 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;
+                               }
+                       }
+               }
+       }
+       init_fini_list = malloc(nlist * sizeof(struct elf_resolve *));
+       dyn_chain->init_fini.init_fini = init_fini_list;
+       dyn_chain->init_fini.nlist = nlist;
+       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) {
+                       if (!(runp->tpnt->rtld_flags & RTLD_GLOBAL)) {
+                               tmp = malloc(sizeof(struct init_fini_list));
+                               tmp->tpnt = runp->tpnt;
+                               tmp->next = runp2->tpnt->rtld_local;
+                               runp2->tpnt->rtld_local = tmp;
+                       }
+               }
 
+       }
+       /* Sort the INIT/FINI list in dependency order. */
+       for (runp2 = dep_list; runp2; runp2 = runp2->next) {
+               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 *ele = init_fini_list[k]->init_fini;
+
+                       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)
+                                               init_fini_list[i+j] = init_fini_list[i+j-1];
+                                       init_fini_list[j] = here;
+                                       ++j;
+                                       break;
+                               }
                        }
                }
        }
+#ifdef __SUPPORT_LD_DEBUG__
+       if (_dl_debug) {
+               fprintf(stderr, "\nINIT/FINI order and dependencies:\n");
+               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)
+                               fprintf(stderr, " %s ", runp->tpnt->libname);
+                       fprintf(stderr, "\n");
+               }
+       }
+#endif
 
+       _dl_if_debug_print("Beginning dlopen relocation fixups\n");
        /*
-        * OK, now attach the entire chain at the end
-        */
-       rpnt->next = _dl_symbol_tables;
-
+        * OK, now all of the kids are tucked into bed in their proper addresses.
+        * 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 */
 #ifdef __mips__
        /*
         * Relocation of the GOT entries for MIPS have to be done
         * after all the libraries have been loaded.
         */
-       _dl_perform_mips_global_got_relocations(tpnt);
+       _dl_perform_mips_global_got_relocations(tpnt, !now_flag);
 #endif
 
-#ifdef __SUPPORT_LD_DEBUG__
-       if(_dl_debug) 
-       _dl_dprintf(_dl_debug_file, "Beginning dlopen relocation fixups\n");
-#endif
-       /*
-        * OK, now all of the kids are tucked into bed in their proper addresses.
-        * 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 */
-       if (_dl_fixup(dyn_chain, dyn_chain->flags))
+       if (_dl_fixup(dyn_chain, now_flag))
                goto oops;
 
+       if (relro_ptr) {
+               for (rpnt = relro_ptr->next; rpnt; rpnt = rpnt->next) {
+                       if (rpnt->dyn->relro_size)
+                               _dl_protect_relro(rpnt->dyn);
+               }
+       }
        /* TODO:  Should we set the protections of all pages back to R/O now ? */
 
-
        /* Notify the debugger we have added some objects. */
        if (_dl_debug_addr) {
                dl_brk = (void (*)(void)) _dl_debug_addr->r_brk;
@@ -287,54 +408,27 @@ void *_dlopen(const char *libname, int flag)
                }
        }
 
-#if 0 //def __SUPPORT_LD_DEBUG__
-       if(_dl_debug) 
-       _dlinfo();
-#endif
-
-#ifdef __PIC__
-       /* Find the last library so we can run things in the right order */
-       for (tpnt = dyn_chain->dyn; tpnt->next!=NULL; tpnt = tpnt->next)
-           ;
-
-       /* Run the ctors and set up the dtors */
-       for (; tpnt != dyn_chain->dyn->prev; tpnt=tpnt->prev)
-       {
-               /* Apparently crt1 for the application is responsible for handling this.
-                * We only need to run the init/fini for shared libraries
-                */
-               if (tpnt->libtype == program_interpreter)
-                       continue;
-               if (tpnt->libtype == elf_executable)
-                       continue;
+       /* Run the ctors and setup the dtors */
+       for (i = nlist; i; --i) {
+               tpnt = init_fini_list[i-1];
                if (tpnt->init_flag & INIT_FUNCS_CALLED)
                        continue;
                tpnt->init_flag |= INIT_FUNCS_CALLED;
 
                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) {
-#ifdef __SUPPORT_LD_DEBUG__
-                       if(_dl_debug) 
-                       _dl_dprintf(2, "running ctors for library %s at '%x'\n", tpnt->libname, dl_elf_func);
-#endif
-                       (*dl_elf_func) ();
-                   }
-               }
-               if (tpnt->dynamic_info[DT_FINI]) {
-                   void (*dl_elf_func) (void);
-                   dl_elf_func = (void (*)(void)) (tpnt->loadaddr + tpnt->dynamic_info[DT_FINI]);
-                   if (dl_elf_func && *dl_elf_func != NULL) {
-#ifdef __SUPPORT_LD_DEBUG__
-                       if(_dl_debug) 
-                       _dl_dprintf(2, "setting up dtors for library %s at '%x'\n", tpnt->libname, dl_elf_func);
-#endif
-                       atexit(dl_elf_func);
-                   }
+                       void (*dl_elf_func) (void);
+                       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_CALL_FUNC_AT_ADDR (dl_elf_func, tpnt->loadaddr, (void(*)(void)));
+                       }
                }
+
+               _dl_run_init_array(tpnt);
        }
-#endif
+
+       _dl_unmap_cache();
        return (void *) dyn_chain;
 
 oops:
@@ -344,14 +438,29 @@ oops:
        return NULL;
 }
 
-void *_dlsym(void *vhandle, const char *name)
+void *dlsym(void *vhandle, const char *name)
 {
        struct elf_resolve *tpnt, *tfrom;
        struct dyn_elf *handle;
        ElfW(Addr) from;
        struct dyn_elf *rpnt;
        void *ret;
-
+       /* 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
@@ -365,7 +474,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) {
                /*
@@ -380,47 +490,56 @@ void *_dlsym(void *vhandle, const char *name)
                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, copyrel);
+       tpnt = NULL;
+       if (handle == _dl_symbol_tables)
+               tpnt = handle->dyn; /* Only search RTLD_GLOBAL objs if global object */
+       ret = _dl_find_hash(name2, handle, tpnt, ELF_RTYPE_CLASS_DLSYM);
 
        /*
         * Nothing found.
         */
        if (!ret)
                _dl_error_number = LD_NO_SYMBOL;
+out:
+#ifdef __UCLIBC_UNDERSCORES__
+       if (name2 != tmp_buf)
+               free (name2);
+#endif
        return ret;
 }
 
-int _dlclose(void *vhandle)
+#if 0
+void *dlvsym(void *vhandle, const char *name, const char *version)
 {
-       return do_dlclose(vhandle, 1);
+       return dlsym(vhandle, name);
 }
+#endif
 
 static int do_dlclose(void *vhandle, int need_fini)
 {
-       struct dyn_elf *rpnt, *rpnt1;
-       struct dyn_elf *spnt, *spnt1;
+       struct dyn_elf *rpnt, *rpnt1, *rpnt1_tmp;
+       struct init_fini_list *runp, *tmp;
        ElfW(Phdr) *ppnt;
-       struct elf_resolve *tpnt;
+       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;
+       unsigned int i, j;
 
        handle = (struct dyn_elf *) vhandle;
+       if (handle == _dl_symbol_tables)
+               return 0;
        rpnt1 = NULL;
        for (rpnt = _dl_handles; rpnt; rpnt = rpnt->next_handle) {
-               if (rpnt == handle) {
+               if (rpnt == handle)
                        break;
-               }
                rpnt1 = rpnt;
        }
 
@@ -428,106 +547,117 @@ static int do_dlclose(void *vhandle, int need_fini)
                _dl_error_number = LD_BAD_HANDLE;
                return 1;
        }
-
-       /* OK, this is a valid handle - now close out the file.
-        * We check if we need to call fini () on the handle. */
-       spnt = need_fini ? handle : handle->next;
-       for (; spnt; spnt = spnt1) {
-               spnt1 = spnt->next;
-
-               /* We appended the module list to the end - when we get back here, 
-                  quit. The access counts were not adjusted to account for being here. */
-               if (spnt == _dl_symbol_tables)
-                       break;
-               if (spnt->dyn->usage_count == 1
-                       && spnt->dyn->libtype == loaded_file) {
-                       tpnt = spnt->dyn;
-                       /* Apparently crt1 for the application is responsible for handling this.
-                        * We only need to run the init/fini for shared libraries
-                        */
-
-                       if (tpnt->dynamic_info[DT_FINI]) {
-                               dl_elf_fini = (int (*)(void)) (tpnt->loadaddr + 
-                                       tpnt->dynamic_info[DT_FINI]);
-                               (*dl_elf_fini) ();
-                       }
-               }
-       }
        if (rpnt1)
                rpnt1->next_handle = rpnt->next_handle;
        else
                _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) {
+               handle->dyn->usage_count--;
+               free(handle);
+               return 0;
+       }
        /* OK, this is a valid handle - now close out the file */
-       for (rpnt = handle; rpnt; rpnt = rpnt1) {
-               rpnt1 = rpnt->next;
-
-               /* We appended the module list to the end - when we get back here, 
-                  quit. The access counts were not adjusted to account for being here. */
-               if (rpnt == _dl_symbol_tables)
-                       break;
-
-               rpnt->dyn->usage_count--;
-               if (rpnt->dyn->usage_count == 0
-                       && rpnt->dyn->libtype == loaded_file) {
-                       tpnt = rpnt->dyn;
-                       /* Apparently crt1 for the application is responsible for handling this.
-                        * We only need to run the init/fini for shared libraries
-                        */
-#if 0
-
-                       /* We have to do this above, before we start closing objects.  
-                        * Otherwise when the needed symbols for _fini handling are 
-                        * resolved a coredump would occur. Rob Ryan (robr@cmu.edu)*/ 
-                       if (tpnt->dynamic_info[DT_FINI]) { 
-                           dl_elf_fini = (int (*)(void)) (tpnt->loadaddr + tpnt->dynamic_info[DT_FINI]);
-                               (*dl_elf_fini) ();
+       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]
+                            || tpnt->dynamic_info[DT_FINI_ARRAY])
+                        && need_fini
+                        && !(tpnt->init_flag & FINI_FUNCS_CALLED)
+                       ) {
+                               tpnt->init_flag |= FINI_FUNCS_CALLED;
+                               _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)));
+                               }
                        }
-#endif
+
+                       _dl_if_debug_print("unmapping: %s\n", tpnt->libname);
                        end = 0;
-                       for (i = 0, ppnt = rpnt->dyn->ppnt;
-                                i < rpnt->dyn->n_phent; ppnt++, i++) {
+                       for (i = 0, ppnt = tpnt->ppnt;
+                                       i < tpnt->n_phent; ppnt++, i++) {
                                if (ppnt->p_type != PT_LOAD)
                                        continue;
                                if (end < ppnt->p_vaddr + ppnt->p_memsz)
                                        end = ppnt->p_vaddr + ppnt->p_memsz;
                        }
-                       _dl_munmap((void*)rpnt->dyn->loadaddr, end);
-                       /* Next, remove rpnt->dyn from the loaded_module list */
-                       if (_dl_loaded_modules == rpnt->dyn) {
-                               _dl_loaded_modules = rpnt->dyn->next;
+                       DL_LIB_UNMAP (tpnt, end);
+                       /* Free elements in RTLD_LOCAL scope list */
+                       for (runp = tpnt->rtld_local; runp; runp = tmp) {
+                               tmp = runp->next;
+                               free(runp);
+                       }
+
+                       /* Next, remove tpnt from the loaded_module list */
+                       if (_dl_loaded_modules == tpnt) {
+                               _dl_loaded_modules = tpnt->next;
                                if (_dl_loaded_modules)
                                        _dl_loaded_modules->prev = 0;
-                       } else
-                               for (tpnt = _dl_loaded_modules; tpnt; tpnt = tpnt->next)
-                                       if (tpnt->next == rpnt->dyn) {
-                                               tpnt->next = tpnt->next->next;
-                                               if (tpnt->next)
-                                                       tpnt->next->prev = tpnt;
+                       } 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;
+                                               if (run_tpnt->next)
+                                                       run_tpnt->next->prev = run_tpnt;
                                                break;
                                        }
-                       free(rpnt->dyn->libname);
-                       free(rpnt->dyn);
+                               }
+                       }
+
+                       /* Next, remove tpnt from the global symbol table list */
+                       if (_dl_symbol_tables) {
+                               if (_dl_symbol_tables->dyn == tpnt) {
+                                       _dl_symbol_tables = _dl_symbol_tables->next;
+                                       if (_dl_symbol_tables)
+                                               _dl_symbol_tables->prev = 0;
+                               } 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_tmp;
+                                                       if (rpnt1->next)
+                                                               rpnt1->next->prev = rpnt1;
+                                                       break;
+                                               }
+                                       }
+                               }
+                       }
+                       free(tpnt->libname);
+                       free(tpnt);
                }
-               free(rpnt);
        }
-
+       free(handle->init_fini.init_fini);
+       free(handle);
 
        if (_dl_debug_addr) {
-           dl_brk = (void (*)(void)) _dl_debug_addr->r_brk;
-           if (dl_brk != NULL) {
-               _dl_debug_addr->r_state = RT_DELETE;
-               (*dl_brk) ();
-
-               _dl_debug_addr->r_state = RT_CONSISTENT;
-               (*dl_brk) ();
-           }
+               dl_brk = (void (*)(void)) _dl_debug_addr->r_brk;
+               if (dl_brk != NULL) {
+                       _dl_debug_addr->r_state = RT_DELETE;
+                       (*dl_brk) ();
+
+                       _dl_debug_addr->r_state = RT_CONSISTENT;
+                       (*dl_brk) ();
+               }
        }
 
        return 0;
 }
 
-const char *_dlerror(void)
+int dlclose(void *vhandle)
+{
+       return do_dlclose(vhandle, 1);
+}
+
+char *dlerror(void)
 {
        const char *retval;
 
@@ -535,44 +665,43 @@ const char *_dlerror(void)
                return NULL;
        retval = dl_error_names[_dl_error_number];
        _dl_error_number = 0;
-       return retval;
+       return (char *)retval;
 }
 
 /*
- * 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" };
 
-void _dlinfo(void)
+int dlinfo(void)
 {
        struct elf_resolve *tpnt;
        struct dyn_elf *rpnt, *hpnt;
 
-       _dl_dprintf(2, "List of loaded modules\n");
+       fprintf(stderr, "List of loaded modules\n");
        /* First start with a complete list of all of the loaded files. */
-       for (tpnt = _dl_loaded_modules; tpnt; tpnt = tpnt->next) { 
-               _dl_dprintf(2, "\t%x %x %x %s %d %s\n", 
-                       (unsigned) tpnt->loadaddr, (unsigned) tpnt,
-                       (unsigned) tpnt->symbol_scope,
-                       type[tpnt->libtype],
-                       tpnt->usage_count, tpnt->libname);
+       for (tpnt = _dl_loaded_modules; tpnt; tpnt = tpnt->next) {
+               fprintf(stderr, "\t%p %p %p %s %d %s\n",
+                       DL_LOADADDR_BASE(tpnt->loadaddr), tpnt, tpnt->symbol_scope,
+                       type[tpnt->libtype],
+                       tpnt->usage_count, tpnt->libname);
        }
 
        /* Next dump the module list for the application itself */
-       _dl_dprintf(2, "\nModules for application (%x):\n",
-                                (unsigned) _dl_symbol_tables);
+       fprintf(stderr, "\nModules for application (%p):\n", _dl_symbol_tables);
        for (rpnt = _dl_symbol_tables; rpnt; rpnt = rpnt->next)
-               _dl_dprintf(2, "\t%x %s\n", (unsigned) rpnt->dyn, rpnt->dyn->libname);
+               fprintf(stderr, "\t%p %s\n", rpnt->dyn, rpnt->dyn->libname);
 
        for (hpnt = _dl_handles; hpnt; hpnt = hpnt->next_handle) {
-               _dl_dprintf(2, "Modules for handle %x\n", (unsigned) hpnt);
+               fprintf(stderr, "Modules for handle %p\n", hpnt);
                for (rpnt = hpnt; rpnt; rpnt = rpnt->next)
-                       _dl_dprintf(2, "\t%x %s\n", (unsigned) rpnt->dyn, 
-                               rpnt->dyn->libname);
+                       fprintf(stderr, "\t%p %s\n", rpnt->dyn, rpnt->dyn->libname);
        }
+       return 0;
 }
 
-int _dladdr(void *__address, Dl_info * __dlip)
+int dladdr(const void *__address, Dl_info * __info)
 {
        struct elf_resolve *pelf;
        struct elf_resolve *rpnt;
@@ -584,22 +713,20 @@ int _dladdr(void *__address, Dl_info * __dlip)
         */
        pelf = NULL;
 
-#if 0
-       _dl_dprintf(2, "dladdr( %x, %x )\n", __address, __dlip);
-#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
-               _dl_dprintf(2, "Module \"%s\" at %x\n", 
-                       tpnt->libname, tpnt->loadaddr);
-#endif
-               if (tpnt->loadaddr < (ElfW(Addr)) __address
-                       && (pelf == NULL || pelf->loadaddr < tpnt->loadaddr)) {
-                   pelf = tpnt;
-               }
+
+               _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) {
@@ -612,40 +739,69 @@ int _dladdr(void *__address, Dl_info * __dlip)
 
        {
                char *strtab;
-               Elf32_Sym *symtab;
-               int hn, si;
-               int sf;
-               int sn = 0;
-               ElfW(Addr) sa;
+               ElfW(Sym) *symtab;
+               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;
+
+               symtab = (ElfW(Sym) *) (pelf->dynamic_info[DT_SYMTAB]);
+               strtab = (char *) (pelf->dynamic_info[DT_STRTAB]);
 
-               sa = 0;
-               symtab = (Elf32_Sym *) (pelf->dynamic_info[DT_SYMTAB] + pelf->loadaddr);
-               strtab = (char *) (pelf->dynamic_info[DT_STRTAB] + pelf->loadaddr);
+               sf = sn = 0;
 
-               sf = 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 (symbol_addr <= (ElfW(Addr))__address && (!sf || sa < symbol_addr)) {
+                                               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;
+                               symbol_addr = (ElfW(Addr)) DL_RELOC_ADDR(pelf->loadaddr, symtab[si].st_value);
                                if (symbol_addr <= (ElfW(Addr))__address && (!sf || sa < symbol_addr)) {
                                        sa = symbol_addr;
                                        sn = si;
                                        sf = 1;
                                }
-#if 0
-                               _dl_dprintf(2, "Symbol \"%s\" at %x\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) {
-                       __dlip->dli_fname = pelf->libname;
-                       __dlip->dli_fbase = (void *)pelf->loadaddr;
-                       __dlip->dli_sname = strtab + symtab[sn].st_name;
-                       __dlip->dli_saddr = (void *)sa;
+                       /* 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