diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-08-17 19:36:13 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-08-17 19:36:13 +0000 |
| commit | 0f6b172f72efea7cd99a9b790df75045f6c85dba (patch) | |
| tree | f201868c8c1b9532e0023b38e6ae1a99062a25fa /elf/dl-load.c | |
| parent | 522554b15962927f372e4bf60e72ea7e0ae0b71f (diff) | |
| download | glibc-0f6b172f72efea7cd99a9b790df75045f6c85dba.tar.gz glibc-0f6b172f72efea7cd99a9b790df75045f6c85dba.tar.xz glibc-0f6b172f72efea7cd99a9b790df75045f6c85dba.zip | |
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.
Diffstat (limited to 'elf/dl-load.c')
| -rw-r--r-- | elf/dl-load.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/elf/dl-load.c b/elf/dl-load.c index ffaca6e55d..adeb7dced2 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -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); |