From 3ee87ca7d4c813087eeee8b9fd04b7836244a54a Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Tue, 12 Oct 2004 12:00:26 +0000
Subject: Updated to fedora-glibc-20041012T1128

---
 elf/dl-addr.c         | 8 ++++----
 elf/dl-sym.c          | 6 +++---
 elf/tst-dlopenrpath.c | 2 --
 3 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'elf')

diff --git a/elf/dl-addr.c b/elf/dl-addr.c
index ae97398bad..c373eb3b17 100644
--- a/elf/dl-addr.c
+++ b/elf/dl-addr.c
@@ -28,7 +28,7 @@ _dl_addr (const void *address, Dl_info *info,
 	  struct link_map **mapp, const ElfW(Sym) **symbolp)
 {
   const ElfW(Addr) addr = DL_LOOKUP_ADDRESS (address);
-  struct link_map *l, *match;
+  struct link_map *match;
   const ElfW(Sym) *symtab, *matchsym, *symtabend;
   const char *strtab;
   ElfW(Word) strtabsize;
@@ -38,7 +38,7 @@ _dl_addr (const void *address, Dl_info *info,
 
   /* Find the highest-addressed object that ADDRESS is not below.  */
   match = NULL;
-  for (l = GL(dl_loaded); l; l = l->l_next)
+  for (struct link_map *l = GL(dl_loaded); l; l = l->l_next)
     if (addr >= l->l_map_start && addr < l->l_map_end)
       {
 	/* We know ADDRESS lies within L if in any shared object.
@@ -67,8 +67,8 @@ _dl_addr (const void *address, Dl_info *info,
       info->dli_fbase = (void *) match->l_map_start;
 
       /* If this is the main program the information is incomplete.  */
-      if (__builtin_expect (l->l_name[0], 'a') == '\0'
-	  && l->l_type == lt_executable)
+      if (__builtin_expect (match->l_name[0], 'a') == '\0'
+	  && match->l_type == lt_executable)
 	info->dli_fname = _dl_argv[0];
 
       symtab = (const void *) D_PTR (match, l_info[DT_SYMTAB]);
diff --git a/elf/dl-sym.c b/elf/dl-sym.c
index c7c737804e..a94610263d 100644
--- a/elf/dl-sym.c
+++ b/elf/dl-sym.c
@@ -90,9 +90,9 @@ do_sym (void *handle, const char *name, void *who,
     {
       if (__builtin_expect (match == GL(dl_loaded), 0))
 	{
-	  if (! GL(dl_loaded)
-	      || caller < GL(dl_loaded)->l_map_start
-	      || caller >= GL(dl_loaded)->l_map_end)
+	  if (match == NULL
+	      || caller < match->l_map_start
+	      || caller >= match->l_map_end)
 	    GLRO(dl_signal_error) (0, NULL, NULL, N_("\
 RTLD_NEXT used in code not dynamically loaded"));
 	}
diff --git a/elf/tst-dlopenrpath.c b/elf/tst-dlopenrpath.c
index 964f103b8c..bd4d888f34 100644
--- a/elf/tst-dlopenrpath.c
+++ b/elf/tst-dlopenrpath.c
@@ -62,10 +62,8 @@ do_test (void)
   result = foo ();
 
  out:
-#if 0
   unlink (PFX "test-subdir/in-subdir.so");
   rmdir (testsubdir);
-#endif
 
   return result;
 }
-- 
cgit v1.2.3