mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-29 11:41:21 +03:00
Update.
2000-08-17 Ulrich Drepper <drepper@redhat.com> * stdio-common/printf_fp.c: Fix chars_needed computation. Patch by Greg McGary <greg@mcgary.org>. 2000-08-17 Jakub Jelinek <jakub@redhat.com> * elf/dl-load.c (_dl_map_object): Don't crash if both loader and _dl_loaded are NULL. 2000-08-17 Jakub Jelinek <jakub@redhat.com> * manual/arith.texi (feholdexcept): Returns 0 on success. 2000-08-17 Andreas Jaeger <aj@suse.de> * sysdeps/gnu/net/if.h (struct ifreq): Add ifru_newname. (ifr_newname): New. Reported by Andi Kleen <ak@suse.de>. 2000-08-17 Jakub Jelinek <jakub@redhat.com> * sysdeps/alpha/fpu/fedisblxcpt.c: New file. * sysdeps/alpha/fpu/feenablxcpt.c: New file. * sysdeps/alpha/fpu/fegetexcept.c: New file. 2000-08-16 Jakub Jelinek <jakub@redhat.com> * sysdeps/unix/sysv/linux/xstatconv.c (xstat32_conv): Test sizes of buf->st_ino and kbuf->st_ino, not __st_ino. If _HAVE_STAT64___ST_INO is not defined, don't use __st_ino at all. * sysdeps/unix/sysv/linux/getdents64.c: Change path in #include directive so that only linux/getdents.c is used, not some architecture specific one. 2000-08-16 Jakub Jelinek <jakub@redhat.com> * sysdeps/i386/fpu/fegetexcept.c (fegetexcept): Return currently enabled, not disabled exceptions. * sysdeps/i386/fpu/fedisblxcpt.c (fedisableexcept): Likewise. * sysdeps/i386/fpu/feenablxcpt.c (feenableexcept): Likewise. ($(addprefix $(objpfx),$(tests)), $(addprefix $(objpfx),$(librt-tests))): * include/link.h: Undo last patches. Hurd now has stat64.
This commit is contained in:
@ -1466,16 +1466,18 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded,
|
||||
for compatibility with Linux's ldconfig program. */
|
||||
extern const char *_dl_load_cache_lookup (const char *name);
|
||||
const char *cached = _dl_load_cache_lookup (name);
|
||||
|
||||
#ifdef SHARED
|
||||
l = loader ?: _dl_loaded;
|
||||
#else
|
||||
l = loader;
|
||||
#endif
|
||||
|
||||
if (cached)
|
||||
{
|
||||
/* If the loader has the DF_1_NODEFLIB flag set we must not
|
||||
use a cache entry from any of these directories. */
|
||||
if (
|
||||
#ifndef SHARED
|
||||
loader != NULL &&
|
||||
#endif
|
||||
__builtin_expect ((loader ?: _dl_loaded)->l_flags_1
|
||||
& DF_1_NODEFLIB, 0))
|
||||
if (l && __builtin_expect (l->l_flags_1 & DF_1_NODEFLIB, 0))
|
||||
{
|
||||
const char *dirp = system_dirs;
|
||||
int cnt = 0;
|
||||
@ -1514,12 +1516,8 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded,
|
||||
|
||||
/* Finally, try the default path. */
|
||||
if (fd == -1
|
||||
&& (
|
||||
#ifndef SHARED
|
||||
loader == NULL ||
|
||||
#endif
|
||||
__builtin_expect (!((loader ?: _dl_loaded)->l_flags_1
|
||||
& DF_1_NODEFLIB), 1)))
|
||||
&& (l == NULL ||
|
||||
__builtin_expect (!(l->l_flags_1 & DF_1_NODEFLIB), 1)))
|
||||
fd = open_path (name, namelen, preloaded, &rtld_search_dirs,
|
||||
&realname);
|
||||
|
||||
|
Reference in New Issue
Block a user