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 <[email protected]>

diff --git a/ldso/ldso/dl-elf.c b/ldso/ldso/dl-elf.c
index a3e0efc4056e69ae54c2f1114e84c42bfd35757a..db2872cd0a7f7f0212a50b1d56f1f5ced1e5eade 100644 (file)
--- 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 39c1fbdf9e0ae436adea90f2a7b483492a735514..14f2f766346ad18ec9fac68a6bfc342e668cd82c 100644 (file)
--- 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 */