summary refs log tree commit diff
path: root/elf/dl-deps.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-04-11 00:29:09 +0000
committerUlrich Drepper <drepper@redhat.com>2001-04-11 00:29:09 +0000
commit951d5dd80f7266fbc655e917eadfe2701c4a735b (patch)
tree0646c9e7a0f35c9353ee3cdd41fdaa08638091ca /elf/dl-deps.c
parentc88dcdce0d61094ccec5fc8375be8efe349d2085 (diff)
downloadglibc-951d5dd80f7266fbc655e917eadfe2701c4a735b.tar.gz
glibc-951d5dd80f7266fbc655e917eadfe2701c4a735b.tar.xz
glibc-951d5dd80f7266fbc655e917eadfe2701c4a735b.zip
Update.
2001-04-10  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/i386/fpu/libm-test-ulps: Add deltas for tgamma to help
	the lousy AMD FPU.

2001-04-10  Franz Sirl  <Franz.Sirl-kernel@lauterbach.com>

	* sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h: New file.
	* sysdeps/unix/sysv/linux/powerpc/Dist: Add sys/ptrace.h.
	* sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h: Delete wrong stuff.
	* sysdeps/unix/sysv/linux/powerpc/sys/procfs.h: Correct typedefs.

2001-04-10  Ulrich Drepper  <drepper@redhat.com>

	* elf/dl-deps.c (_dl_map_object_deps): Provide complete error
	message.  Based on a patch by HJ Lu.
Diffstat (limited to 'elf/dl-deps.c')
-rw-r--r--elf/dl-deps.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/elf/dl-deps.c b/elf/dl-deps.c
index c886ca8b18..8313ae8a2d 100644
--- a/elf/dl-deps.c
+++ b/elf/dl-deps.c
@@ -145,6 +145,7 @@ _dl_map_object_deps (struct link_map *map,
   const char *name;
   int errno_saved;
   int errno_reason;
+  const char *errstring;
 
   auto inline void preload (struct link_map *map);
 
@@ -198,6 +199,7 @@ _dl_map_object_deps (struct link_map *map,
      alloca means we cannot use recursive function calls.  */
   errno_saved = errno;
   errno_reason = 0;
+  errstring = NULL;
   errno = 0;
   name = NULL;
   for (runp = known; runp; )
@@ -236,7 +238,6 @@ _dl_map_object_deps (struct link_map *map,
 		/* Allocate new entry.  */
 		struct list *newp;
 		const char *objname;
-		const char *errstring;
 
 		/* Recognize DSTs.  */
 		name = expand_dst (l, strtab + d->d_un.d_val, 0);
@@ -281,7 +282,6 @@ _dl_map_object_deps (struct link_map *map,
 	    else if (d->d_tag == DT_AUXILIARY || d->d_tag == DT_FILTER)
 	      {
 		const char *objname;
-		const char *errstring;
 		struct list *newp;
 
 		/* Recognize DSTs.  */
@@ -307,6 +307,7 @@ _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;
@@ -581,5 +582,5 @@ out:
 
   if (errno_reason)
     _dl_signal_error (errno_reason == -1 ? 0 : errno_reason,
-		      name ?: "", N_("cannot load shared object file"));
+		      errstring ?: "", N_("cannot load shared object file"));
 }