Selaa lähdekoodia

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>
Carmelo Amoroso 12 vuotta sitten
vanhempi
commit
6d71db548d
2 muutettua tiedostoa jossa 3 lisäystä ja 1 poistoa
  1. 1 1
      ldso/ldso/dl-elf.c
  2. 2 0
      ldso/ldso/ldso.c

+ 1 - 1
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);

+ 2 - 0
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 */