From: Ulrich Drepper <drepper@redhat.com>
Date: Tue, 29 Jan 2002 04:37:30 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/glibc-2-3~1186
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db2ebcef2428cb568315895f8fe3ef19d41735bc;p=thirdparty%2Fglibc.git

Update.

	* elf/dl-load.c (_dl_map_object): Remove incorrect optimization
	for SHARED code.  Reported by Ben Collins <bcollins@debian.org>.
---

diff --git a/ChangeLog b/ChangeLog
index fefa0ed08f4..5577fb5ae85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2002-01-28  Ulrich Drepper  <drepper@redhat.com>
 
+	* elf/dl-load.c (_dl_map_object): Remove incorrect optimization
+	for SHARED code.  Reported by Ben Collins <bcollins@debian.org>.
+
 	* timezone/asia: Update from tzdata2002b.
 	* timezone/australasia: Likewise.
 	* timezone/backward: Likewise.
diff --git a/elf/dl-load.c b/elf/dl-load.c
index 4b9af501c16..b66e7fee1d9 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -1,5 +1,5 @@
 /* Map in a shared object's segments from the file.
-   Copyright (C) 1995,96,97,98,99,2000,2001 Free Software Foundation, Inc.
+   Copyright (C) 1995,96,97,98,99,2000,2001,2002 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
@@ -1748,14 +1748,8 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded,
 
       /* Finally, try the default path.  */
       if (fd == -1
-	  && ((l = loader ?: _dl_loaded)
-	      /* 'l' is always != NULL for dynamically linked objects.  */
-#ifdef SHARED
-	      ,
-#else
-	      == NULL ||
-#endif
-	      __builtin_expect (!(l->l_flags_1 & DF_1_NODEFLIB), 1))
+	  && ((l = loader ?: _dl_loaded) == NULL
+	      || __builtin_expect (!(l->l_flags_1 & DF_1_NODEFLIB), 1))
 	  && rtld_search_dirs.dirs != (void *) -1)
 	fd = open_path (name, namelen, preloaded, &rtld_search_dirs,
 			&realname, &fb);