diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2007-08-12 19:33:45 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2007-08-12 19:33:45 +0000 |
| commit | fb86328ad89bed5340882b8c9f245ba93189a55c (patch) | |
| tree | fe272ce0e56aa9f21bee9da95159aadde03af133 /sysdeps/unix/sysv/linux/dl-vdso.c | |
| parent | 75fb247e69ede25fb49929fed7535a091a4f6934 (diff) | |
| download | glibc-fb86328ad89bed5340882b8c9f245ba93189a55c.tar.gz | |
* sysdeps/unix/sysv/linux/dl-vdso.c (_dl_vdso_vsym): Expect
r_found_version structure as second parameter.
* sysdeps/unix/sysv/linux/dl-vdso.h (PREPARE_VERSION): Define.
(_dl_vdso_vsym): Change type of second parameter accordingly.
* sysdeps/unix/sysv/linux/x86-64/libc-start.c
(_libc_vdso_platform_setup): Adjust.
* sysdeps/unix/sysv/linux/pwoerpc/libc-start.c
(_libc_vdso_platform_setup): Likewise.
Diffstat (limited to 'sysdeps/unix/sysv/linux/dl-vdso.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/dl-vdso.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/sysdeps/unix/sysv/linux/dl-vdso.c b/sysdeps/unix/sysv/linux/dl-vdso.c index e1be097734..f12b4c37fd 100644 --- a/sysdeps/unix/sysv/linux/dl-vdso.c +++ b/sysdeps/unix/sysv/linux/dl-vdso.c @@ -1,5 +1,5 @@ /* ELF symbol resolve functions for VDSO objects. - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2007 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -24,7 +24,7 @@ void * internal_function -_dl_vdso_vsym (const char *name, const char *version) +_dl_vdso_vsym (const char *name, const struct r_found_version *vers) { struct link_map *map = GLRO (dl_sysinfo_map); void *value = NULL; @@ -37,19 +37,11 @@ _dl_vdso_vsym (const char *name, const char *version) memset (&wsym, 0, sizeof (ElfW (Sym))); wsym.st_info = (unsigned char) ELFW (ST_INFO (STB_WEAK, STT_NOTYPE)); - /* Compute hash value to the version string. */ - struct r_found_version vers; - vers.name = version; - vers.hidden = 1; - vers.hash = _dl_elf_hash (version); - /* We don't have a specific file where the symbol can be found. */ - vers.filename = NULL; - /* Search the scope of the vdso map. */ const ElfW (Sym) *ref = &wsym; lookup_t result = GLRO (dl_lookup_symbol_x) (name, map, &ref, map->l_local_scope, - &vers, 0, 0, NULL); + vers, 0, 0, NULL); if (ref != NULL) value = DL_SYMBOL_ADDRESS (result, ref); |