diff options
| author | Roland McGrath <roland@gnu.org> | 2005-04-07 20:57:41 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2005-04-07 20:57:41 +0000 |
| commit | ab1d521db39bf4371c7db96e8a0fcd4857ee70ed (patch) | |
| tree | 08614e6eae83ca958ff2b106e70a9da3a51fcf66 /elf/dl-load.c | |
| parent | da232bf925bf8db8ae85c56483aa3d50f1e5bfb2 (diff) | |
| download | glibc-ab1d521db39bf4371c7db96e8a0fcd4857ee70ed.zip glibc-ab1d521db39bf4371c7db96e8a0fcd4857ee70ed.tar.gz glibc-ab1d521db39bf4371c7db96e8a0fcd4857ee70ed.tar.bz2 | |
* sysdeps/unix/sysv/linux/dl-osinfo.h (_dl_discover_osversion)
[(NEED_DL_SYSINFO || NEED_DL_SYSINFO_DSO) && SHARED]: Scan
GLRO(dl_sysinfo_map) for PT_NOTE giving Linux kernel version,
we can skip the uname call if it's there.
* sysdeps/generic/dl-sysdep.c (_dl_sysdep_start): Don't use
DL_SYSDEP_OSCHECK here.
* elf/rtld.c (dl_main) [DL_SYSDEP_OSCHECK]: Do it here instead.
* sysdeps/generic/ldsodefs.h (struct rtld_global_ro):
Add _dl_sysinfo_map.
* elf/rtld.c (dl_main): Don't call _dl_init_paths early in the
rtld_is_main case. Call it unconditionally later.
Move GLRO(dl_sysinfo_dso) handling earlier, before _dl_init_paths call.
Initialize GLRO(dl_sysinfo_map).
* elf/dl-load.c (open_path): Bail out if _dl_init_paths wasn't called.
* sysdeps/generic/dl-sysdep.c (_DL_FIRST_EXTRA): New macro.
(_dl_important_hwcaps)
[(NEED_DL_SYSINFO || NEED_DL_SYSINFO_DSO) && SHARED]: Scan
GLRO(dl_sysinfo_map) for PT_NOTE giving synthetic hwcap names
and bit values.
* elf/ldconfig.c (_DL_FIRST_EXTRA): New macro.
(hwcap_extra): New static variable.
(is_hwcap_platform): Check hwcap_extra for a matching name.
Remove tls special case.
(path_hwcap): Likewise.
(parse_conf): Parse "hwcap" directive to define synthetic hwcap bits
and their names, stored in hwcap_extra.
(main) [USE_TLS]: Initialize final synthetic hwcap bit as "tls".
* sysdeps/generic/ldsodefs.h (struct rtld_global_ro): Use uint64_t for
_dl_hwcap and _dl_hwcap_mask.
* sysdeps/generic/dl-sysdep.c (_dl_sysdep_start): Cast a_val for
AT_HWCAP to unsigned long int.
* elf/dl-support.c (_dl_aux_init): Likewise.
(_dl_hwcap): Update defn.
* elf/cache.c (print_entry): Pad hwcap value with 0s in diagnostic.
* elf/ldconfig.c (search_dir): Likewise.
Diffstat (limited to 'elf/dl-load.c')
| -rw-r--r-- | elf/dl-load.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/elf/dl-load.c b/elf/dl-load.c index 2ca108e..d8b3a56 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -1760,6 +1760,11 @@ open_path (const char *name, size_t namelen, int preloaded, const char *current_what = NULL; int any = 0; + if (__builtin_expect (dirs == NULL, 0)) + /* We're called before _dl_init_paths when loading the main executable + given on the command line when rtld is run directly. */ + return -1; + buf = alloca (max_dirnamelen + max_capstrlen + namelen); do { |