* 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.

diff --git a/ChangeLog b/ChangeLog
index ce8e47b95cd35585cf9e2334d5cd17cfdc42be91..f36031721cca104920d562d7eb288f25010b890a 100644 (file)
--- 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 40df7f00783143d280892e4b9f33ae07303949c6..d2b0ec0dab94650a31c9298c52267ba3401d4a2f 100644 (file)
--- 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 62755ea013352b1c4ee475d23d446388fa0b5b98..7b62b0feecd676e2bc7bf739cb724cb0f842c4fd 100644 (file)
--- 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.  */