summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarmelo Amoroso <carmelo.amoroso@st.com>2011-10-25 11:26:50 +0200
committerCarmelo Amoroso <carmelo.amoroso@st.com>2011-10-25 11:26:50 +0200
commit6d71db548d1186a9215bebafaee8e38b6cb7d513 (patch)
tree8a367c9be6922a709086520a11b6c8b569e2a3ff
parent7846b17d4c623d9ad1962300f95b9c539ecc149a (diff)
ldso: minor fixes to implicit search path
Do not defined _dl_ldsopatch if implicit search path if not enabled, and avoid to call search_for_named_library (even if it is able to handle NULL search path). Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
-rw-r--r--ldso/ldso/dl-elf.c2
-rw-r--r--ldso/ldso/ldso.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/ldso/ldso/dl-elf.c b/ldso/ldso/dl-elf.c
index a3e0efc40..db2872cd0 100644
--- a/ldso/ldso/dl-elf.c
+++ b/ldso/ldso/dl-elf.c
@@ -283,7 +283,7 @@ struct elf_resolve *_dl_load_shared_library(int secure, struct dyn_elf **rpnt,
}
}
#endif
-#ifdef SHARED
+#if defined SHARED && defined __LDSO_SEARCH_INTERP_PATH__
/* Look for libraries wherever the shared library loader
* was installed */
_dl_if_debug_dprint("\tsearching ldso dir='%s'\n", _dl_ldsopath);
diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c
index 39c1fbdf9..14f2f7663 100644
--- a/ldso/ldso/ldso.c
+++ b/ldso/ldso/ldso.c
@@ -50,7 +50,9 @@ char *_dl_library_path = NULL; /* Where we look for libraries */
#ifdef __LDSO_PRELOAD_ENV_SUPPORT__
char *_dl_preload = NULL; /* Things to be loaded before the libs */
#endif
+#ifdef __LDSO_SEARCH_INTERP_PATH__
char *_dl_ldsopath = NULL; /* Location of the shared lib loader */
+#endif
int _dl_errno = 0; /* We can't use the real errno in ldso */
size_t _dl_pagesize = 0; /* Store the page size for use later */
struct r_debug *_dl_debug_addr = NULL; /* Used to communicate with the gdb debugger */