diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-07-21 21:04:40 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-07-21 21:04:40 +0000 |
| commit | 5de7684b2262e45cd6094bdd5d6f92e0cb386d05 (patch) | |
| tree | da9e9a54339c8fc4f187944a4b210203fe6b0162 | |
| parent | 10b36b41d28d8f945471aa34699b5c0153da63d8 (diff) | |
| download | glibc-5de7684b2262e45cd6094bdd5d6f92e0cb386d05.zip glibc-5de7684b2262e45cd6094bdd5d6f92e0cb386d05.tar.gz glibc-5de7684b2262e45cd6094bdd5d6f92e0cb386d05.tar.bz2 | |
(_dl_map_object): Take loader==NULL into account in DF_1_NODEFLIB handling.
| -rw-r--r-- | elf/dl-load.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/elf/dl-load.c b/elf/dl-load.c index 5e714af..ebe4c80 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -1469,7 +1469,12 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded, { /* If the loader has the DF_1_NODEFLIB flag set we must not use a cache entry from any of these directories. */ - if (__builtin_expect (loader->l_flags_1 & DF_1_NODEFLIB, 0)) + if ( +#ifndef SHARED + loader != NULL && +#endif + __builtin_expect ((loader ?: _dl_loaded)->l_flags_1 + & DF_1_NODEFLIB, 0)) { const char *dirp = system_dirs; int cnt = 0; @@ -1508,7 +1513,12 @@ _dl_map_object (struct link_map *loader, const char *name, int preloaded, /* Finally, try the default path. */ if (fd == -1 - && __builtin_expect (!(loader->l_flags_1 & DF_1_NODEFLIB), 1)) + && ( +#ifndef SHARED + loader == NULL || +#endif + __builtin_expect (!((loader ?: _dl_loaded)->l_flags_1 + & DF_1_NODEFLIB), 1))) fd = open_path (name, namelen, preloaded, &rtld_search_dirs, &realname); |