summaryrefslogtreecommitdiff
path: root/elf
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2006-05-01 07:53:45 +0000
committerJakub Jelinek <jakub@redhat.com>2006-05-01 07:53:45 +0000
commit410005dea38c87cdd7cb265423903bf42f0a96ef (patch)
tree74342d303b7b3d860b3163ca084517be942ffde4 /elf
parent45f1c052dc488bb21093d52bb9a3df18e7b2df36 (diff)
Updated to fedora-glibc-20060501T0751
Diffstat (limited to 'elf')
-rw-r--r--elf/dl-load.c23
-rw-r--r--elf/ldd.bash.in7
2 files changed, 13 insertions, 17 deletions
diff --git a/elf/dl-load.c b/elf/dl-load.c
index 088954a04f..29fdfd8f19 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -1,6 +1,5 @@
/* Map in a shared object's segments from the file.
- Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- 2005, 2006 Free Software Foundation, Inc.
+ Copyright (C) 1995-2005, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -786,7 +785,7 @@ _dl_init_paths (const char *llp)
static void
__attribute__ ((noreturn, noinline))
lose (int code, int fd, const char *name, char *realname, struct link_map *l,
- const char *msg)
+ const char *msg, struct r_debug *r)
{
/* The file might already be closed. */
if (fd != -1)
@@ -805,6 +804,13 @@ lose (int code, int fd, const char *name, char *realname, struct link_map *l,
free (l);
}
free (realname);
+
+ if (r != NULL)
+ {
+ r->r_state = RT_CONSISTENT;
+ _dl_debug_state ();
+ }
+
_dl_signal_error (code, name, NULL, msg);
}
@@ -840,13 +846,8 @@ _dl_map_object_from_fd (const char *name, int fd, struct filebuf *fbp,
call_lose_errno:
errval = errno;
call_lose:
- if (make_consistent)
- {
- r->r_state = RT_CONSISTENT;
- _dl_debug_state ();
- }
-
- lose (errval, fd, name, realname, l, errstring);
+ lose (errval, fd, name, realname, l, errstring,
+ make_consistent ? r : NULL);
}
/* Look again to see if the real name matched another already loaded. */
@@ -1642,7 +1643,7 @@ open_verify (const char *name, struct filebuf *fbp, struct link_map *loader,
name = strdupa (realname);
free (realname);
}
- lose (errval, fd, name, NULL, NULL, errstring);
+ lose (errval, fd, name, NULL, NULL, errstring, NULL);
}
/* See whether the ELF header is what we expect. */
diff --git a/elf/ldd.bash.in b/elf/ldd.bash.in
index a22ad15b59..d1591a5785 100644
--- a/elf/ldd.bash.in
+++ b/elf/ldd.bash.in
@@ -154,6 +154,7 @@ for file do
test -x "$file" || echo 'ldd:' $"\
warning: you do not have execution permission for" "\`$file'" >&2
RTLD=
+ ret=1
for rtld in ${RTLDLIST}; do
if test -x $rtld; then
verify_out=`${rtld} --verify "$file"`
@@ -163,12 +164,6 @@ warning: you do not have execution permission for" "\`$file'" >&2
esac
fi
done
- if test -z "${RTLD}"; then
- set ${RTLDLIST}
- RTLD=$1
- verify_out=`${RTLD} --verify "$file"`
- ret=$?
- fi
case $ret in
0)
# If the program exits with exit code 5, it means the process has been