* 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.

5 files changed, 46 insertions, 27 deletions

diff --git a/ChangeLog b/ChangeLog
index 3c6e6b4046..dbe9ba47a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2007-08-12  Ulrich Drepper  <drepper@redhat.com>
 
+	* 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.
+
 	* sysdeps/unix/sysv/linux/powerpc/dl-vdso.c: Move to...
 	* sysdeps/unix/sysv/linux/dl-vdso.c: ...here.
 	* sysdeps/unix/sysv/linux/powerpc/dl-vdso.h: Move to...
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);
diff --git a/sysdeps/unix/sysv/linux/dl-vdso.h b/sysdeps/unix/sysv/linux/dl-vdso.h
index a7dcb2e5ff..0a76dbe6f3 100644
--- a/sysdeps/unix/sysv/linux/dl-vdso.h
+++ b/sysdeps/unix/sysv/linux/dl-vdso.h
@@ -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
@@ -20,8 +20,25 @@
 #ifndef _DL_VDSO_H
 #define _DL_VDSO_H	1
 
+#include <assert.h>
+#include <dl-hash.h>
+#include <ldsodefs.h>
+
+
+/* Create version number record for lookup.  */
+#define PREPARE_VERSION(var, vname, vhash) \
+  struct r_found_version var;						      \
+  var.name = vname;							      \
+  var.hidden = 1;							      \
+  var.hash = vhash;							      \
+  assert (var.hash == _dl_elf_hash (vname));				      \
+  /* We don't have a specific file where the symbol can be found.  */	      \
+  var.filename = NULL
+
+
 /* Functions for resolving symbols in the VDSO link map.  */
-extern void *_dl_vdso_vsym (const char *name, const char *version)
+extern void *_dl_vdso_vsym (const char *name,
+			    const struct r_found_version *version)
      internal_function attribute_hidden;
 
 #endif /* dl-vdso.h */
diff --git a/sysdeps/unix/sysv/linux/powerpc/libc-start.c b/sysdeps/unix/sysv/linux/powerpc/libc-start.c
index d78876d40d..d1f321c44d 100644
--- a/sysdeps/unix/sysv/linux/powerpc/libc-start.c
+++ b/sysdeps/unix/sysv/linux/powerpc/libc-start.c
@@ -33,25 +33,24 @@
 # undef __clock_getres
 # include <bits/libc-vdso.h>
 
-void *__vdso_gettimeofday;
+void *__vdso_gettimeofday attribute_hidden;
 void *__vdso_clock_gettime;
 void *__vdso_clock_getres;
 void *__vdso_get_tbfreq;
 
-static inline void _libc_vdso_platform_setup (void)
-  {
-    __vdso_gettimeofday = _dl_vdso_vsym ("__kernel_gettimeofday",
-  				         "LINUX_2.6.15");
+static inline void
+_libc_vdso_platform_setup (void)
+{
+  PREPARE_VERSION (linux2615, "LINUX_2.6.15", 123718565);
 
-    __vdso_clock_gettime = _dl_vdso_vsym ("__kernel_clock_gettime",
-					  "LINUX_2.6.15");
+  __vdso_gettimeofday = _dl_vdso_vsym ("__kernel_gettimeofday", &linux2615);
 
-    __vdso_clock_getres = _dl_vdso_vsym ("__kernel_clock_getres",
-				         "LINUX_2.6.15");
+  __vdso_clock_gettime = _dl_vdso_vsym ("__kernel_clock_gettime", &linux2615);
 
-    __vdso_get_tbfreq = _dl_vdso_vsym ("__kernel_vdso_get_tbfreq",
-				       "LINUX_2.6.15");
-  }
+  __vdso_clock_getres = _dl_vdso_vsym ("__kernel_clock_getres", &linux2615);
+
+  __vdso_get_tbfreq = _dl_vdso_vsym ("__kernel_vdso_get_tbfreq", &linux2615);
+}
 
 # define VDSO_SETUP _libc_vdso_platform_setup
 #endif
diff --git a/sysdeps/unix/sysv/linux/x86_64/libc-start.c b/sysdeps/unix/sysv/linux/x86_64/libc-start.c
index 3c95729371..08b1c497c8 100644
--- a/sysdeps/unix/sysv/linux/x86_64/libc-start.c
+++ b/sysdeps/unix/sysv/linux/x86_64/libc-start.c
@@ -28,9 +28,11 @@ int (*__vdso_clock_gettime) (clockid_t, struct timespec *);
 static inline void
 _libc_vdso_platform_setup (void)
 {
-  __vdso_gettimeofday = _dl_vdso_vsym ("gettimeofday", "LINUX_2.6");
+  PREPARE_VERSION (linux26, "LINUX_2.6", 61765110);
 
-  __vdso_clock_gettime = _dl_vdso_vsym ("clock_gettime", "LINUX_2.6");
+  __vdso_gettimeofday = _dl_vdso_vsym ("gettimeofday", &linux26);
+
+  __vdso_clock_gettime = _dl_vdso_vsym ("clock_gettime", &linux26);
 }
 
 # define VDSO_SETUP _libc_vdso_platform_setup