diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2003-05-04 04:30:13 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2003-05-04 04:30:13 +0000 |
| commit | f866314b89d56845f55e6f365e18b31ec978ec3a (patch) | |
| tree | 24177a21031b2cc13c60cbf6901c9b652dc2ea99 /sysdeps/generic/dl-sysdep.c | |
| parent | 003f9e7223a13d1c482424deb294647d35dbec92 (diff) | |
| download | glibc-f866314b89d56845f55e6f365e18b31ec978ec3a.tar.gz glibc-f866314b89d56845f55e6f365e18b31ec978ec3a.tar.xz glibc-f866314b89d56845f55e6f365e18b31ec978ec3a.zip | |
Update.
2003-04-22 Roland McGrath <roland@redhat.com> * elf/elf.h (AT_SYSINFO_EHDR): New macro, replaces AT_SYSINFO_EH_FRAME. * sysdeps/generic/ldsodefs.h (struct rtld_global): Remove dl_sysinfo_eh_frame member, add dl_sysinfo_dso member instead. * elf/dl-support.c: Update defn. * sysdeps/generic/libc-start.c: Don't call __register_frame_info_bases. * sysdeps/generic/dl-sysdep.c (_dl_sysdep_start) [NEED_DL_SYSINFO]: Set GL(dl_sysinfo_dso) from AT_SYSINFO_EHDR. (_dl_show_auxv): Grok AT_SYSINFO_EHDR, not AT_SYSINFO_EH_FRAME. * elf/rtld.c (dl_main) [NEED_DL_SYSINFO]: If GL(dl_sysinfo_dso) is set, set up a link_map for the preloaded, prelinked object.
Diffstat (limited to 'sysdeps/generic/dl-sysdep.c')
| -rw-r--r-- | sysdeps/generic/dl-sysdep.c | 52 |
1 files changed, 27 insertions, 25 deletions
diff --git a/sysdeps/generic/dl-sysdep.c b/sysdeps/generic/dl-sysdep.c index 33e74dd60b..a249791ec7 100644 --- a/sysdeps/generic/dl-sysdep.c +++ b/sysdeps/generic/dl-sysdep.c @@ -139,8 +139,8 @@ _dl_sysdep_start (void **start_argptr, case AT_SYSINFO: GL(dl_sysinfo) = av->a_un.a_val; break; - case AT_SYSINFO_EH_FRAME: - GL(dl_sysinfo_eh_frame) = av->a_un.a_val; + case AT_SYSINFO_EHDR: + GL(dl_sysinfo_dso) = av->a_un.a_ptr; break; #endif #ifdef DL_PLATFORM_AUXV @@ -227,32 +227,34 @@ _dl_show_auxv (void) { static const struct { - const char label[23]; + const char label[20]; enum { dec, hex, str } form; } auxvars[] = { - [AT_EXECFD - 2] = { "AT_EXECFD: ", dec }, - [AT_PHDR - 2] = { "AT_PHDR: 0x", hex }, - [AT_PHENT - 2] = { "AT_PHENT: ", dec }, - [AT_PHNUM - 2] = { "AT_PHNUM: ", dec }, - [AT_PAGESZ - 2] = { "AT_PAGESZ: ", dec }, - [AT_BASE - 2] = { "AT_BASE: 0x", hex }, - [AT_FLAGS - 2] = { "AT_FLAGS: 0x", hex }, - [AT_ENTRY - 2] = { "AT_ENTRY: 0x", hex }, - [AT_NOTELF - 2] = { "AT_NOTELF: ", hex }, - [AT_UID - 2] = { "AT_UID: ", dec }, - [AT_EUID - 2] = { "AT_EUID: ", dec }, - [AT_GID - 2] = { "AT_GID: ", dec }, - [AT_EGID - 2] = { "AT_EGID: ", dec }, - [AT_PLATFORM - 2] = { "AT_PLATFORM: ", str }, - [AT_HWCAP - 2] = { "AT_HWCAP: ", hex }, - [AT_CLKTCK - 2] = { "AT_CLKTCK: ", dec }, - [AT_FPUCW - 2] = { "AT_FPUCW: ", hex }, - [AT_DCACHEBSIZE - 2] = { "AT_DCACHEBSIZE: 0x", hex }, - [AT_ICACHEBSIZE - 2] = { "AT_ICACHEBSIZE: 0x", hex }, - [AT_UCACHEBSIZE - 2] = { "AT_UCACHEBSIZE: 0x", hex }, - [AT_SYSINFO - 2] = { "AT_SYSINFO: 0x", hex }, - [AT_SYSINFO_EH_FRAME - 2] = { "AT_SYSINFO_EH_FRAME: 0x", hex } + [AT_EXECFD - 2] = { "AT_EXECFD: ", dec }, + [AT_PHDR - 2] = { "AT_PHDR: 0x", hex }, + [AT_PHENT - 2] = { "AT_PHENT: ", dec }, + [AT_PHNUM - 2] = { "AT_PHNUM: ", dec }, + [AT_PAGESZ - 2] = { "AT_PAGESZ: ", dec }, + [AT_BASE - 2] = { "AT_BASE: 0x", hex }, + [AT_FLAGS - 2] = { "AT_FLAGS: 0x", hex }, + [AT_ENTRY - 2] = { "AT_ENTRY: 0x", hex }, + [AT_NOTELF - 2] = { "AT_NOTELF: ", hex }, + [AT_UID - 2] = { "AT_UID: ", dec }, + [AT_EUID - 2] = { "AT_EUID: ", dec }, + [AT_GID - 2] = { "AT_GID: ", dec }, + [AT_EGID - 2] = { "AT_EGID: ", dec }, + [AT_PLATFORM - 2] = { "AT_PLATFORM: ", str }, + [AT_HWCAP - 2] = { "AT_HWCAP: ", hex }, + [AT_CLKTCK - 2] = { "AT_CLKTCK: ", dec }, + [AT_FPUCW - 2] = { "AT_FPUCW: ", hex }, + [AT_DCACHEBSIZE - 2] = { "AT_DCACHEBSIZE: 0x", hex }, + [AT_ICACHEBSIZE - 2] = { "AT_ICACHEBSIZE: 0x", hex }, + [AT_UCACHEBSIZE - 2] = { "AT_UCACHEBSIZE: 0x", hex }, +#ifdef DL_NEED_SYSINFO + [AT_SYSINFO - 2] = { "AT_SYSINFO: 0x", hex }, + [AT_SYSINFO_EHDR - 2] = { "AT_SYSINFO_EHDR: 0x", hex } +#endif }; unsigned int idx = (unsigned int) (av->a_type - 2); |