diff options
| author | Roland McGrath <roland@gnu.org> | 2005-03-30 02:07:41 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2005-03-30 02:07:41 +0000 |
| commit | 9640622776d1f9833590ec15e4f59eceee7dd379 (patch) | |
| tree | 48c67da11f694f2077400ba281e97b695a6cf229 | |
| parent | 1718c60cfdb7858d25770cda2ac64a2c5a6febc7 (diff) | |
| download | glibc-9640622776d1f9833590ec15e4f59eceee7dd379.tar.gz glibc-9640622776d1f9833590ec15e4f59eceee7dd379.tar.xz glibc-9640622776d1f9833590ec15e4f59eceee7dd379.zip | |
* elf/dl-load.c: Don't include dl-osinfo.h here.
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | elf/dl-load.c | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/dl-osinfo.h | 39 |
3 files changed, 40 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index ac148f0349..cc508e969c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ (DL_SYSDEP_OSCHECK): ... here. Use that. Do the discovery and set GLRO(dl_osversion) if successful, if __LINUX_KERNEL_VERSION <= 0. + * elf/dl-load.c: Don't include dl-osinfo.h here. 2005-03-29 Alfred M. Szmidt <ams@gnu.org> diff --git a/elf/dl-load.c b/elf/dl-load.c index d9c2da2ac7..2ca108ef69 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -33,7 +33,6 @@ #include <sys/types.h> #include "dynamic-link.h" #include <abi-tag.h> -#include <dl-osinfo.h> #include <stackinfo.h> #include <caller.h> #include <sysdep.h> diff --git a/sysdeps/unix/sysv/linux/dl-osinfo.h b/sysdeps/unix/sysv/linux/dl-osinfo.h index dfb4cde72d..befa804cb1 100644 --- a/sysdeps/unix/sysv/linux/dl-osinfo.h +++ b/sysdeps/unix/sysv/linux/dl-osinfo.h @@ -43,6 +43,45 @@ dl_fatal (const char *str) static inline int __attribute__ ((always_inline)) _dl_discover_osversion (void) { +#if (defined NEED_DL_SYSINFO || defined NEED_DL_SYSINFO_DSO) && defined SHARED + if (GLRO(dl_sysinfo_map) != NULL) + { + /* If the kernel-supplied DSO contains a note indicating the kernel's + version, we don't need to call uname or parse any strings. */ + + static const struct + { + ElfW(Word) vendorlen; + ElfW(Word) datalen; + ElfW(Word) type; + char vendor[8]; + } expected_note = { sizeof "Linux", sizeof (ElfW(Word)), 0, "Linux" }; + const ElfW(Phdr) *const phdr = GLRO(dl_sysinfo_map)->l_phdr; + const ElfW(Word) phnum = GLRO(dl_sysinfo_map)->l_phnum; + for (uint_fast16_t i = 0; i < phnum; ++i) + if (phdr[i].p_type == PT_NOTE) + { + const ElfW(Addr) start = (phdr[i].p_vaddr + + GLRO(dl_sysinfo_map)->l_addr); + const struct + { + ElfW(Word) vendorlen; + ElfW(Word) datalen; + ElfW(Word) type; + } *note = (const void *) start; + while ((ElfW(Addr)) (note + 1) - start < phdr[i].p_memsz) + { + if (!memcmp (note, &expected_note, sizeof expected_note)) + return *(const ElfW(Word) *) ((const void *) note + + sizeof expected_note); +#define ROUND(len) (((len) + sizeof (ElfW(Word)) - 1) & -sizeof (ElfW(Word))) + note = ((const void *) (note + 1) + + ROUND (note->vendorlen) + ROUND (note->datalen)); + } + } + } +#endif + char bufmem[64]; char *buf = bufmem; unsigned int version; |