aboutsummaryrefslogtreecommitdiff
path: root/elf
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-05-23 23:56:31 +0000
committerUlrich Drepper <drepper@redhat.com>2001-05-23 23:56:31 +0000
commit64b7897d6d453e67afe3f9d81c8fc37c26f8d483 (patch)
tree8ba245ec72d14cb2dd1ca5adcd89d4f0589f2c78 /elf
parent2210704803b8ed0181109021488119f76b9868a1 (diff)
downloadglibc-64b7897d6d453e67afe3f9d81c8fc37c26f8d483.zip
glibc-64b7897d6d453e67afe3f9d81c8fc37c26f8d483.tar.gz
glibc-64b7897d6d453e67afe3f9d81c8fc37c26f8d483.tar.bz2
Update.
2001-05-23 kaz Kojima <kkojima@rr.iij4u.or.jp> * sysdeps/sh/dl-machine.h (_dl_runtime_resolve): Handle newer PLT. (_dl_runtime_profile): Likewise.. 2001-05-23 Thorsten Kukuk <kukuk@suse.de> * sysdeps/posix/getaddrinfo.c: Support for AF_UNIX commented out. * posix/tst-getaddrinfo.c: Remove AF_UNIX test. 2001-05-19 H.J. Lu <hjl@gnu.org> * elf/dl-deps.c (_dl_map_object_deps): Pass objname and errstring of the failed DSO to _dl_signal_error ().
Diffstat (limited to 'elf')
-rw-r--r--elf/dl-deps.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/elf/dl-deps.c b/elf/dl-deps.c
index 8b9e132..9bdaa46 100644
--- a/elf/dl-deps.c
+++ b/elf/dl-deps.c
@@ -141,6 +141,7 @@ _dl_map_object_deps (struct link_map *map,
int errno_saved;
int errno_reason;
const char *errstring;
+ const char *objname;
auto inline void preload (struct link_map *map);
@@ -221,7 +222,6 @@ _dl_map_object_deps (struct link_map *map,
{
/* Map in the needed object. */
struct link_map *dep;
- const char *objname;
/* Recognize DSTs. */
name = expand_dst (l, strtab + d->d_un.d_val, 0);
@@ -263,7 +263,6 @@ _dl_map_object_deps (struct link_map *map,
}
else if (d->d_tag == DT_AUXILIARY || d->d_tag == DT_FILTER)
{
- const char *objname;
struct list *newp;
/* Recognize DSTs. */
@@ -289,7 +288,6 @@ _dl_map_object_deps (struct link_map *map,
assert (errstring != NULL);
if (errstring != _dl_out_of_memory)
free ((char *) errstring);
- errstring = NULL;
/* Simply ignore this error and continue the work. */
continue;
@@ -541,5 +539,5 @@ out:
if (errno_reason)
_dl_signal_error (errno_reason == -1 ? 0 : errno_reason,
- errstring ?: "", N_("cannot load shared object file"));
+ objname, errstring);
}