AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-26 15:00:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update.

Browse Source 
* elf/dl-load.c (_dl_map_object): Remove incorrect optimization
	for SHARED code.  Reported by Ben Collins <bcollins@debian.org>.
This commit is contained in:
Ulrich Drepper 2002-01-29 04:37:30 +00:00
parent b45b94573a
commit db2ebcef24
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2002-01-28 Ulrich Drepper <drepper@redhat.com> 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/asia: Update from tzdata2002b.
* timezone/australasia: Likewise. * timezone/australasia: Likewise.
* timezone/backward: Likewise. * timezone/backward: Likewise.

12
elf/dl-load.c
View File

@ -1,5 +1,5 @@
/* Map in a shared object's segments from the file. /* 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. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or 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. */ /* Finally, try the default path. */
if (fd == -1 if (fd == -1
&& ((l = loader ?: _dl_loaded) && ((l = loader ?: _dl_loaded) == NULL
/* 'l' is always != NULL for dynamically linked objects. */ || __builtin_expect (!(l->l_flags_1 & DF_1_NODEFLIB), 1))
#ifdef SHARED
,
#else
== NULL ||
#endif
__builtin_expect (!(l->l_flags_1 & DF_1_NODEFLIB), 1))
&& rtld_search_dirs.dirs != (void *) -1) && rtld_search_dirs.dirs != (void *) -1)
fd = open_path (name, namelen, preloaded, &rtld_search_dirs, fd = open_path (name, namelen, preloaded, &rtld_search_dirs,
&realname, &fb); &realname, &fb);