aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2006-08-17 14:34:00 -0500
committerMark Hatle <mark.hatle@windriver.com>2010-07-22 16:13:39 -0500
commitb71ac62a56bd0a9256c9fd0a37dd332efb1f5424 (patch)
treea9e07134be5e0e4e221888a37043ab9de2fa736a
parentdcf432ba1a68b571aad7372beaa5fa6d796f6d14 (diff)
downloadprelink-cross-b71ac62a56bd0a9256c9fd0a37dd332efb1f5424.tar.gz
prelink-cross-b71ac62a56bd0a9256c9fd0a37dd332efb1f5424.tar.bz2
prelink-cross-b71ac62a56bd0a9256c9fd0a37dd332efb1f5424.zip
Import from: prelink-endian-swap2.patch
Source: Wind River Systems Follow on to the prelink-endian-swap patch. This includes files added for cross-prelinking. Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-rw-r--r--src/dso-readonly.c2
-rw-r--r--src/ld-libs.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/dso-readonly.c b/src/dso-readonly.c
index 4d10f18..9845761 100644
--- a/src/dso-readonly.c
+++ b/src/dso-readonly.c
@@ -514,7 +514,7 @@ fdopen_dso (int fd, const char *name)
const char *soname;
soname = get_data (dso, dso->info[DT_STRTAB] + dso->info[DT_SONAME],
- NULL);
+ NULL, NULL);
if (soname && soname[0] != '\0')
dso->soname = (const char *) strdup (soname);
}
diff --git a/src/ld-libs.c b/src/ld-libs.c
index d4a7f6e..ec8dc57 100644
--- a/src/ld-libs.c
+++ b/src/ld-libs.c
@@ -426,7 +426,7 @@ find_lib_by_soname (const char *soname, struct dso_list *loader,
const char *rpath = get_data (loader_p->dso,
loader_p->dso->info[DT_STRTAB]
+ loader_p->dso->info[DT_RPATH],
- NULL);
+ NULL, NULL);
memset (&r_path, 0, sizeof (r_path));
string_to_path (&r_path, rpath);
ret = find_lib_in_path (&r_path, soname, elfclass);
@@ -448,7 +448,7 @@ find_lib_by_soname (const char *soname, struct dso_list *loader,
const char *rpath = get_data (loader->dso,
loader->dso->info[DT_STRTAB]
+ loader->dso->info[DT_RUNPATH],
- NULL);
+ NULL, NULL);
memset (&r_path, 0, sizeof (r_path));
string_to_path (&r_path, rpath);
ret = find_lib_in_path (&r_path, soname, elfclass);
@@ -511,7 +511,7 @@ load_dsos (DSO *dso)
const char *soname = get_data (cur_dso,
cur_dso->info[DT_STRTAB]
+ dyn.d_un.d_val,
- NULL);
+ NULL, NULL);
new_dso_ent = in_dso_list (dso_list, soname, NULL);
if (new_dso_ent == NULL)
{