[prev in list] [next in list] [prev in thread] [next in thread] 

List:       uclibc-cvs
Subject:    [git commit] ldso: disable the implicit path search in stand-alone mode as well
From:       carmelo.amoroso () st ! com (Carmelo Amoroso)
Date:       2011-10-25 8:24:06
Message-ID: 20111025083100.EF30D8F0B5 () busybox ! osuosl ! org
[Download RAW message or body]

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

Honour LDSO_SEARCH_INTERP_PATH knob option also when running in
stand-alone mode.

Signed-off-by: Rune <u-uclibc-y2lt at aetey.se>
Signed-off-by: Carmelo Amoroso <carmelo.amoroso at st.com>
---
 ldso/ldso/ldso.c |   24 ++++++++++++++----------
 1 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c
index cbef0ee..39c1fbd 100644
--- a/ldso/ldso/ldso.c
+++ b/ldso/ldso/ldso.c
@@ -486,7 +486,6 @@ void *_dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr,
 
 #ifdef __LDSO_STANDALONE_SUPPORT__
 	if (_start == (void *) auxvt[AT_ENTRY].a_un.a_val) {
-		char *ptmp;
 		unsigned int *aux_dat = (unsigned int *) argv;
 		int argc = aux_dat[-1];
 
@@ -565,15 +564,20 @@ of this helper program; chances are you did not intend to run this program.\n\
 			}
 		}
 
-		/* 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';
+#ifdef __LDSO_SEARCH_INTERP_PATH__
+		{
+			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);
+			_dl_debug_early("Lib Loader: (%x) %s\n", (unsigned) DL_LOADADDR_BASE(tpnt->loadaddr), tpnt->libname);
+		}
+#endif
 	} else {
 #endif
 

[prev in list] [next in list] [prev in thread] [next in thread]