|
@@ -486,19 +486,18 @@ void _dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr,
|
|
|
|
|
|
/* OK, fill this in - we did not have this before */
|
|
|
if (ppnt->p_type == PT_INTERP) {
|
|
|
- char *ptmp;
|
|
|
-
|
|
|
tpnt->libname = (char *) DL_RELOC_ADDR(app_tpnt->loadaddr, ppnt->p_vaddr);
|
|
|
-
|
|
|
#ifdef __LDSO_SEARCH_INTERP_PATH__
|
|
|
- /* Store the path where the shared lib loader was found
|
|
|
- * for later use
|
|
|
- */
|
|
|
- _dl_ldsopath = _dl_strdup(tpnt->libname);
|
|
|
- ptmp = _dl_strrchr(_dl_ldsopath, '/');
|
|
|
- if (ptmp != _dl_ldsopath)
|
|
|
- *ptmp = '\0';
|
|
|
-
|
|
|
+ {
|
|
|
+ char *ptmp;
|
|
|
+ /* Store the path where the shared lib loader was found
|
|
|
+ * for later use
|
|
|
+ */
|
|
|
+ _dl_ldsopath = _dl_strdup(tpnt->libname);
|
|
|
+ ptmp = _dl_strrchr(_dl_ldsopath, '/');
|
|
|
+ if (ptmp != _dl_ldsopath)
|
|
|
+ *ptmp = '\0';
|
|
|
+ }
|
|
|
_dl_debug_early("Lib Loader: (%x) %s\n", (unsigned) DL_LOADADDR_BASE(tpnt->loadaddr), tpnt->libname);
|
|
|
#endif
|
|
|
}
|