[git commit] libdl: remove _dl_ldsopath from libdl.a

Carmelo Amoroso carmelo.amoroso at st.com
Wed Oct 19 14:30:57 UTC 2011


commit: http://git.uclibc.org/uClibc/commit/?id=54a1c7691bfbfa166e6140260d2f750580f54908
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/master

Signed-off-by: Carmelo Amoroso <carmelo.amoroso at st.com>
---
 ldso/ldso/dl-elf.c |    4 ++--
 ldso/libdl/libdl.c |    1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ldso/ldso/dl-elf.c b/ldso/ldso/dl-elf.c
index 5cf50d4..a3e0efc 100644
--- a/ldso/ldso/dl-elf.c
+++ b/ldso/ldso/dl-elf.c
@@ -283,14 +283,14 @@ struct elf_resolve *_dl_load_shared_library(int secure, struct dyn_elf **rpnt,
 		}
 	}
 #endif
-
+#ifdef SHARED
 	/* Look for libraries wherever the shared library loader
 	 * was installed */
 	_dl_if_debug_dprint("\tsearching ldso dir='%s'\n", _dl_ldsopath);
 	tpnt1 = search_for_named_library(libname, secure, _dl_ldsopath, rpnt);
 	if (tpnt1 != NULL)
 		return tpnt1;
-
+#endif
 	/* Lastly, search the standard list of paths for the library.
 	   This list must exactly match the list in uClibc/ldso/util/ldd.c */
 	_dl_if_debug_dprint("\tsearching full lib path list\n");
diff --git a/ldso/libdl/libdl.c b/ldso/libdl/libdl.c
index 2c8dfbb..5b519e6 100644
--- a/ldso/libdl/libdl.c
+++ b/ldso/libdl/libdl.c
@@ -101,7 +101,6 @@ 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. */


More information about the uClibc-cvs mailing list