[gentoo-commits] dev/heroxbd:master commit in: sys-libs/glibc/files/2.15/, sys-libs/glibc/files/2.17/

[gentoo-commits] dev/heroxbd:master commit in: sys-libs/glibc/files/2.15/, sys-libs/glibc/files/2.17/

[Benda XU]

commit:     307b5fc0d087437474633e0ddd21ff104b74a537
Author:     XU Benda <heroxbd <AT> gmail <DOT> com>
AuthorDate: Mon Sep  2 16:58:43 2013 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon Sep  2 16:58:43 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/heroxbd.git;a=commit;h=307b5fc0

vdso patch

---
 .../2.15/glibc-2.15-localstatedir-backport.patch   | 13 +++++++++
 sys-libs/glibc/files/2.17/vdso-disable.patch       | 34 ++++++++++++++++++++++
 sys-libs/glibc/files/2.17/vdso.patch               | 17 +++++++++++
 3 files changed, 64 insertions(+)

diff --git a/sys-libs/glibc/files/2.15/glibc-2.15-localstatedir-backport.patch b/sys-libs/glibc/files/2.15/glibc-2.15-localstatedir-backport.patch
new file mode 100644
index 0000000..5f8f15a
--- /dev/null
+++ b/sys-libs/glibc/files/2.15/glibc-2.15-localstatedir-backport.patch
@@ -0,0 +1,13 @@
+Index: work/glibc-2.15/Makeconfig
+===================================================================
+--- work.orig/glibc-2.15/Makeconfig
++++ work/glibc-2.15/Makeconfig
+@@ -293,7 +293,7 @@ inst_sysconfdir = $(install_root)$(sysco
+ 
+ # Directory for the database files and Makefile for nss_db.
+ ifndef vardbdir
+-vardbdir = /var/db
++vardbdir = $(prefix)/var/db
+ endif
+ inst_vardbdir = $(install_root)$(vardbdir)
+ 

diff --git a/sys-libs/glibc/files/2.17/vdso-disable.patch b/sys-libs/glibc/files/2.17/vdso-disable.patch
new file mode 100644
index 0000000..0354ae9
--- /dev/null
+++ b/sys-libs/glibc/files/2.17/vdso-disable.patch
@@ -0,0 +1,34 @@
+Index: work/glibc-2.17/elf/dl-support.c
+===================================================================
+--- work.orig/glibc-2.17/elf/dl-support.c
++++ work/glibc-2.17/elf/dl-support.c
+@@ -212,16 +212,6 @@ _dl_aux_init (ElfW(auxv_t) *av)
+       case AT_HWCAP:
+ 	GLRO(dl_hwcap) = (unsigned long int) av->a_un.a_val;
+ 	break;
+-#ifdef NEED_DL_SYSINFO
+-      case AT_SYSINFO:
+-	GL(dl_sysinfo) = av->a_un.a_val;
+-	break;
+-#endif
+-#if defined NEED_DL_SYSINFO || defined NEED_DL_SYSINFO_DSO
+-      case AT_SYSINFO_EHDR:
+-	GL(dl_sysinfo_dso) = (void *) av->a_un.a_val;
+-	break;
+-#endif
+       case AT_UID:
+ 	uid ^= av->a_un.a_val;
+ 	seen |= 1;
+Index: work/glibc-2.17/elf/setup-vdso.h
+===================================================================
+--- work.orig/glibc-2.17/elf/setup-vdso.h
++++ work/glibc-2.17/elf/setup-vdso.h
+@@ -20,7 +20,7 @@ static inline void __attribute__ ((alway
+ setup_vdso (struct link_map *main_map __attribute__ ((unused)),
+ 	    struct link_map ***first_preload __attribute__ ((unused)))
+ {
+-#if defined NEED_DL_SYSINFO || defined NEED_DL_SYSINFO_DSO
++#if 0
+   if (GLRO(dl_sysinfo_dso) == NULL)
+     return;
+ 

diff --git a/sys-libs/glibc/files/2.17/vdso.patch b/sys-libs/glibc/files/2.17/vdso.patch
new file mode 100644
index 0000000..eb9a492
--- /dev/null
+++ b/sys-libs/glibc/files/2.17/vdso.patch
@@ -0,0 +1,17 @@
+Index: glibc-2.17/sysdeps/unix/sysv/linux/x86_64/gettimeofday.c
+===================================================================
+--- glibc-2.17.orig/sysdeps/unix/sysv/linux/x86_64/gettimeofday.c
++++ glibc-2.17/sysdeps/unix/sysv/linux/x86_64/gettimeofday.c
+@@ -28,11 +28,7 @@ void *gettimeofday_ifunc (void) __asm__
+ void *
+ gettimeofday_ifunc (void)
+ {
+-  PREPARE_VERSION (linux26, "LINUX_2.6", 61765110);
+-
+-  /* If the vDSO is not available we fall back on the old vsyscall.  */
+-  return (_dl_vdso_vsym ("__vdso_gettimeofday", &linux26)
+-	  ?: (void *) VSYSCALL_ADDR_vgettimeofday);
++  return (void *) VSYSCALL_ADDR_vgettimeofday;
+ }
+ asm (".type __gettimeofday, %gnu_indirect_function");
+