aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-02-26 20:50:52 +0000
committerUlrich Drepper <drepper@redhat.com>2006-02-26 20:50:52 +0000
commit67d7308c0a772caebcd63633ff9321a5eb5741c2 (patch)
tree5da812247b1932ea58910288a18d2162904b9d6a
parent74c5693b2e5475585ccaba8deadf8ca3b58a330a (diff)
downloadglibc-67d7308c0a772caebcd63633ff9321a5eb5741c2.tar
glibc-67d7308c0a772caebcd63633ff9321a5eb5741c2.tar.gz
glibc-67d7308c0a772caebcd63633ff9321a5eb5741c2.tar.bz2
glibc-67d7308c0a772caebcd63633ff9321a5eb5741c2.zip
* elf/do-lookup.h (do_lookup_x): No need to compare SKIP to NULL
before comparison with MAP. * elf/dl-sym.c (do_sym): For RTLD_NEXT, pass MATCH to dl_lookup_symbol_x instead of L.
-rw-r--r--ChangeLog9
-rw-r--r--elf/dl-sym.c2
-rw-r--r--elf/do-lookup.h4
3 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index ce8e47b95c..f36031721c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-02-26 Ulrich Drepper <drepper@redhat.com>
+
+ * elf/do-lookup.h (do_lookup_x): No need to compare SKIP to NULL
+ before comparison with MAP.
+
+ * elf/dl-sym.c (do_sym): For RTLD_NEXT, pass MATCH to
+ dl_lookup_symbol_x instead of L.
+
2006-02-24 Mike Frysinger <vapier@gentoo.org>
* sysdeps/gnu/net/if.h (IFF_DYNAMIC): New macro.
@@ -6,7 +14,6 @@
* configure.in: Use sparc/sparc32/sparcv9/sparcv9b in place
of sparc/sparc32/sparcv9b.
- * configure: Regenerated.
* sysdeps/sparc/sparc32/sparcv9b/Implies: File removed.
* sysdeps/unix/sysv/linux/sparc/sparc32/sparcv9b/Implies: File removed.
diff --git a/elf/dl-sym.c b/elf/dl-sym.c
index 40df7f0078..d2b0ec0dab 100644
--- a/elf/dl-sym.c
+++ b/elf/dl-sym.c
@@ -1,5 +1,5 @@
/* Look up a symbol in a shared object loaded by `dlopen'.
- Copyright (C) 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
+ Copyright (C) 1999,2000,2001,2002,2004,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
diff --git a/elf/do-lookup.h b/elf/do-lookup.h
index 62755ea013..7b62b0feec 100644
--- a/elf/do-lookup.h
+++ b/elf/do-lookup.h
@@ -1,5 +1,5 @@
/* Look up a symbol in the loaded objects.
- Copyright (C) 1995-2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1995-2004, 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
@@ -45,7 +45,7 @@ do_lookup_x (const char *undef_name, unsigned long int hash,
map = list[i]->l_real;
/* Here come the extra test needed for `_dl_lookup_symbol_skip'. */
- if (skip != NULL && map == skip)
+ if (map == skip)
continue;
/* Don't search the executable when resolving a copy reloc. */