aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog13
-rw-r--r--elf/dl-support.c4
-rw-r--r--elf/rtld.c42
-rw-r--r--sysdeps/generic/dl-sysdep.c52
-rw-r--r--sysdeps/generic/ldsodefs.h5
-rw-r--r--sysdeps/generic/libc-start.c14
6 files changed, 87 insertions, 43 deletions
diff --git a/ChangeLog b/ChangeLog
index 886146885b..70f69a6f49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+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.
+
2003-05-03 Roland McGrath <roland@redhat.com>
* sysdeps/gnu/Makefile (generated): Append errlist-compat.c here, ...
diff --git a/elf/dl-support.c b/elf/dl-support.c
index 1e547d3b4d..2ff3d2f905 100644
--- a/elf/dl-support.c
+++ b/elf/dl-support.c
@@ -127,8 +127,8 @@ size_t _dl_phnum;
#ifdef NEED_DL_SYSINFO
/* Needed for improved syscall handling on at least x86/Linux. */
uintptr_t _dl_sysinfo = DL_SYSINFO_DEFAULT;
-/* Address of the unwind info for the vsyscall page. */
-uintptr_t _dl_sysinfo_eh_frame;
+/* Address of the ELF headers in the vsyscall page. */
+const ElfW(Ehdr) *_dl_sysinfo_dso;
#endif
/* During the program run we must not modify the global data of
diff --git a/elf/rtld.c b/elf/rtld.c
index 9d2a94c492..e9e781aa95 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -1069,6 +1069,48 @@ of this helper program; chances are you did not intend to run this program.\n\
assert (i == npreloads);
}
+#ifdef NEED_DL_SYSINFO
+ if (GL(dl_sysinfo_dso) != NULL)
+ {
+ /* We have a prelinked DSO preloaded by the system. */
+ GL(dl_sysinfo) = GL(dl_sysinfo_dso)->e_entry;
+
+ /* Do an abridged version of the work _dl_map_object_from_fd would do
+ to map in the object. It's already mapped and prelinked (and
+ better be, since it's read-only and so we couldn't relocate it).
+ We just want our data structures to describe it as if we had just
+ mapped and relocated it normally. */
+ struct link_map *l = _dl_new_object ((char *) "", "", lt_library, NULL);
+ if (__builtin_expect (l != NULL, 1))
+ {
+ l->l_phdr = ((const void *) GL(dl_sysinfo_dso)
+ + GL(dl_sysinfo_dso)->e_phoff);
+ l->l_phnum = GL(dl_sysinfo_dso)->e_phnum;
+ for (uint_fast16_t i = 0; i < l->l_phnum; ++i)
+ {
+ const ElfW(Phdr) *const ph = &l->l_phdr[i];
+ if (ph->p_type == PT_DYNAMIC)
+ {
+ l->l_ld = (void *) ph->p_vaddr;
+ l->l_ldnum = ph->p_memsz / sizeof (ElfW(Dyn));
+ break;
+ }
+ if (ph->p_type == PT_LOAD)
+ assert ((void *) ph->p_vaddr == GL(dl_sysinfo_dso));
+ }
+ elf_get_dynamic_info (l);
+ _dl_setup_hash (l);
+ l->l_relocated = 1;
+
+ /* Now that we have the info handy, use the DSO image's soname
+ so this object can be looked up by name. */
+ if (l->l_info[DT_SONAME] != NULL)
+ l->l_libname->name = ((char *) D_PTR (l, l_info[DT_STRTAB])
+ + l->l_info[DT_SONAME]->d_un.d_val);
+ }
+ }
+#endif
+
/* Load all the libraries specified by DT_NEEDED entries. If LD_PRELOAD
specified some libraries to load, these are inserted before the actual
dependencies in the executable's searchlist for symbol resolution. */
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);
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
index 12151ce69d..4b75f4672e 100644
--- a/sysdeps/generic/ldsodefs.h
+++ b/sysdeps/generic/ldsodefs.h
@@ -395,8 +395,9 @@ struct rtld_global
/* Syscall handling improvements. This is very specific to x86. */
EXTERN uintptr_t _dl_sysinfo;
- /* Address of the unwind info for the vsyscall page. */
- EXTERN uintptr_t _dl_sysinfo_eh_frame;
+ /* The vsyscall page is a virtual DSO pre-mapped by the kernel.
+ This points to its ELF header. */
+ EXTERN const ElfW(Ehdr) *_dl_sysinfo_dso;
#endif
#ifdef SHARED
diff --git a/sysdeps/generic/libc-start.c b/sysdeps/generic/libc-start.c
index 0acdd59815..b98f0a2aa0 100644
--- a/sysdeps/generic/libc-start.c
+++ b/sysdeps/generic/libc-start.c
@@ -28,13 +28,6 @@ extern void __libc_init_first (int argc, char **argv, char **envp);
extern int __libc_multiple_libcs;
extern void *__libc_stack_end;
-#ifdef NEED_DL_SYSINFO
-# include "unwind-dw2-fde.h"
-extern __typeof (__register_frame_info_bases)
- INTUSE(__register_frame_info_bases);
-static struct object eh_obj;
-#endif
-
#include <tls.h>
#ifndef SHARED
# include <dl-osinfo.h>
@@ -157,13 +150,6 @@ LIBC_START_MAIN (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL),
__libc_check_standard_fds ();
#endif
-#ifdef NEED_DL_SYSINFO
- /* Register the kernel's unwind table. */
- if (GL(dl_sysinfo_eh_frame) != 0)
- INTUSE(__register_frame_info_bases) ((void *) GL(dl_sysinfo_eh_frame),
- &eh_obj, 0, 0);
-#endif
-
/* Register the destructor of the dynamic linker if there is any. */
if (__builtin_expect (rtld_fini != NULL, 1))
__cxa_atexit ((void (*) (void *)) rtld_fini, NULL, NULL);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 03:39:11 +0000