0c1386ccad
Prefer 0.9.33 by default Delete recipes for 0.9.32 (From OE-Core rev: 5d2c0b051072b3cee510dcad8d20fb26d3843f62) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
186 lines
5.3 KiB
Diff
186 lines
5.3 KiB
Diff
Patch is backported from
|
|
http://lists.busybox.net/pipermail/uclibc/2011-March/045003.html
|
|
|
|
Upstream-Status: Pending
|
|
|
|
Index: git/ldso/ldso/dl-elf.c
|
|
===================================================================
|
|
--- git.orig/ldso/ldso/dl-elf.c 2012-01-23 19:18:58.000000000 -0800
|
|
+++ git/ldso/ldso/dl-elf.c 2012-01-23 21:52:06.144646590 -0800
|
|
@@ -133,53 +133,60 @@
|
|
* in uClibc/ldso/util/ldd.c */
|
|
static struct elf_resolve *
|
|
search_for_named_library(const char *name, unsigned rflags, const char *path_list,
|
|
- struct dyn_elf **rpnt)
|
|
+ struct dyn_elf **rpnt, const char* origin)
|
|
{
|
|
- char *path, *path_n, *mylibname;
|
|
+ char *mylibname;
|
|
+ const char *p, *pn;
|
|
struct elf_resolve *tpnt;
|
|
- int done;
|
|
+ int plen;
|
|
|
|
if (path_list==NULL)
|
|
return NULL;
|
|
|
|
- /* We need a writable copy of this string, but we don't
|
|
- * need this allocated permanently since we don't want
|
|
- * to leak memory, so use alloca to put path on the stack */
|
|
- done = _dl_strlen(path_list);
|
|
- path = alloca(done + 1);
|
|
-
|
|
/* another bit of local storage */
|
|
mylibname = alloca(2050);
|
|
|
|
- _dl_memcpy(path, path_list, done+1);
|
|
-
|
|
/* Unlike ldd.c, don't bother to eliminate double //s */
|
|
|
|
/* Replace colons with zeros in path_list */
|
|
/* : at the beginning or end of path maps to CWD */
|
|
/* :: anywhere maps CWD */
|
|
/* "" maps to CWD */
|
|
- done = 0;
|
|
- path_n = path;
|
|
- do {
|
|
- if (*path == 0) {
|
|
- *path = ':';
|
|
- done = 1;
|
|
+ for (p = path_list; p != NULL; p = pn) {
|
|
+ pn = _dl_strchr(p + 1, ':');
|
|
+ if (pn != NULL) {
|
|
+ plen = pn - p;
|
|
+ pn++;
|
|
+ } else
|
|
+ plen = _dl_strlen(p);
|
|
+
|
|
+ if (plen >= 7 && _dl_memcmp(p, "$ORIGIN", 7) == 0) {
|
|
+ int olen;
|
|
+ if (rflags && plen != 7)
|
|
+ continue;
|
|
+ if (origin == NULL)
|
|
+ continue;
|
|
+ for (olen = _dl_strlen(origin) - 1; olen >= 0 && origin[olen] != '/'; olen--)
|
|
+ ;
|
|
+ if (olen <= 0)
|
|
+ continue;
|
|
+ _dl_memcpy(&mylibname[0], origin, olen);
|
|
+ _dl_memcpy(&mylibname[olen], p + 7, plen - 7);
|
|
+ mylibname[olen + plen - 7] = 0;
|
|
+ } else if (plen != 0) {
|
|
+ _dl_memcpy(mylibname, p, plen);
|
|
+ mylibname[plen] = 0;
|
|
+ } else {
|
|
+ _dl_strcpy(mylibname, ".");
|
|
}
|
|
- if (*path == ':') {
|
|
- *path = 0;
|
|
- if (*path_n)
|
|
- _dl_strcpy(mylibname, path_n);
|
|
- else
|
|
- _dl_strcpy(mylibname, "."); /* Assume current dir if empty path */
|
|
- _dl_strcat(mylibname, "/");
|
|
- _dl_strcat(mylibname, name);
|
|
- if ((tpnt = _dl_load_elf_shared_library(rflags, rpnt, mylibname)) != NULL)
|
|
- return tpnt;
|
|
- path_n = path+1;
|
|
- }
|
|
- path++;
|
|
- } while (!done);
|
|
+ _dl_strcat(mylibname, "/");
|
|
+ _dl_strcat(mylibname, name);
|
|
+
|
|
+ tpnt = _dl_load_elf_shared_library(rflags, rpnt, mylibname);
|
|
+ if (tpnt != NULL)
|
|
+ return tpnt;
|
|
+ }
|
|
+
|
|
return NULL;
|
|
}
|
|
|
|
@@ -231,8 +238,10 @@
|
|
if (pnt) {
|
|
pnt += (unsigned long) tpnt->dynamic_info[DT_STRTAB];
|
|
_dl_if_debug_dprint("\tsearching RPATH='%s'\n", pnt);
|
|
- if ((tpnt1 = search_for_named_library(libname, rflags, pnt, rpnt)) != NULL)
|
|
+ if ((tpnt1 = search_for_named_library(libname, rflags, pnt, rpnt,
|
|
+ tpnt->libname)) != NULL)
|
|
return tpnt1;
|
|
+
|
|
}
|
|
#endif
|
|
|
|
@@ -240,7 +249,7 @@
|
|
/* Check in LD_{ELF_}LIBRARY_PATH, if specified and allowed */
|
|
if (_dl_library_path) {
|
|
_dl_if_debug_dprint("\tsearching LD_LIBRARY_PATH='%s'\n", _dl_library_path);
|
|
- if ((tpnt1 = search_for_named_library(libname, rflags, _dl_library_path, rpnt)) != NULL)
|
|
+ if ((tpnt1 = search_for_named_library(libname, rflags, _dl_library_path, rpnt, NULL)) != NULL)
|
|
{
|
|
return tpnt1;
|
|
}
|
|
@@ -254,7 +263,7 @@
|
|
if (pnt) {
|
|
pnt += (unsigned long) tpnt->dynamic_info[DT_STRTAB];
|
|
_dl_if_debug_dprint("\tsearching RUNPATH='%s'\n", pnt);
|
|
- if ((tpnt1 = search_for_named_library(libname, rflags, pnt, rpnt)) != NULL)
|
|
+ if ((tpnt1 = search_for_named_library(libname, rflags, pnt, rpnt, NULL)) != NULL)
|
|
return tpnt1;
|
|
}
|
|
#endif
|
|
@@ -288,7 +297,7 @@
|
|
/* 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, rflags, _dl_ldsopath, rpnt);
|
|
+ tpnt1 = search_for_named_library(libname, rflags, _dl_ldsopath, rpnt, NULL);
|
|
if (tpnt1 != NULL)
|
|
return tpnt1;
|
|
#endif
|
|
@@ -301,7 +310,7 @@
|
|
#ifndef __LDSO_CACHE_SUPPORT__
|
|
":" UCLIBC_RUNTIME_PREFIX "usr/X11R6/lib"
|
|
#endif
|
|
- , rpnt);
|
|
+ , rpnt, NULL);
|
|
if (tpnt1 != NULL)
|
|
return tpnt1;
|
|
|
|
Index: git/ldso/ldso/ldso.c
|
|
===================================================================
|
|
--- git.orig/ldso/ldso/ldso.c 2012-01-23 19:18:58.000000000 -0800
|
|
+++ git/ldso/ldso/ldso.c 2012-01-23 21:34:11.152594621 -0800
|
|
@@ -407,6 +407,20 @@
|
|
return p - list;
|
|
}
|
|
|
|
+static void _dl_setup_progname(const char *argv0)
|
|
+{
|
|
+ char image[PATH_MAX];
|
|
+ ssize_t s;
|
|
+
|
|
+ s = _dl_readlink("/proc/self/exe", image, sizeof(image));
|
|
+ if (s > 0 && image[0] == '/') {
|
|
+ image[s] = 0;
|
|
+ _dl_progname = _dl_strdup(image);
|
|
+ } else if (argv0) {
|
|
+ _dl_progname = argv0;
|
|
+ }
|
|
+}
|
|
+
|
|
void *_dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr,
|
|
ElfW(auxv_t) auxvt[AT_EGID + 1], char **envp, char **argv
|
|
DL_GET_READY_TO_RUN_EXTRA_PARMS)
|
|
@@ -458,9 +472,7 @@
|
|
* been fixed up by now. Still no function calls outside of this
|
|
* library, since the dynamic resolver is not yet ready.
|
|
*/
|
|
- if (argv[0]) {
|
|
- _dl_progname = argv[0];
|
|
- }
|
|
+ _dl_setup_progname(argv[0]);
|
|
|
|
#ifndef __LDSO_STANDALONE_SUPPORT__
|
|
if (_start == (void *) auxvt[AT_ENTRY].a_un.a_val) {
|