[glibc] 01/01: hurd-i386/submitted-auxv.diff: Update from upstream commit
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch sid
in repository glibc.
commit d6c4db85a633b4b10cc918de098cc4ac077e054b
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon Apr 11 00:01:52 2016 +0200
hurd-i386/submitted-auxv.diff: Update from upstream commit
into cvs-auxv.diff
---
debian/changelog | 5 ++++
debian/patches/hurd-i386/cvs-auxv.diff | 42 ++++++++++++++++++++++++++++
debian/patches/hurd-i386/submitted-auxv.diff | 14 ----------
debian/patches/series | 2 +-
4 files changed, 48 insertions(+), 15 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 62b16a0..b70e822 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
glibc (2.22-7) UNRELEASED; urgency=medium
+ [ Aurelien Jarno ]
*
+ [ Samuel Thibault ]
+ * hurd-i386/submitted-auxv.diff: Update from upstream commit into
+ cvs-auxv.diff.
+
-- Aurelien Jarno <aurel32@debian.org> Sat, 09 Apr 2016 16:23:55 +0200
glibc (2.22-6) unstable; urgency=medium
diff --git a/debian/patches/hurd-i386/cvs-auxv.diff b/debian/patches/hurd-i386/cvs-auxv.diff
new file mode 100644
index 0000000..74a5736
--- /dev/null
+++ b/debian/patches/hurd-i386/cvs-auxv.diff
@@ -0,0 +1,42 @@
+commit 0cdc5e930a95ca2ec3f2fd9327da93a2fbaf8e97
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date: Sun Apr 10 23:58:43 2016 +0200
+
+ Fix crash on getauxval call without HAVE_AUX_VECTOR
+
+ * sysdeps/generic/ldsodefs.h (struct rtld_global_ro)
+ [!HAVE_AUX_VECTOR]: Do not define _dl_auxv field.
+ * misc/getauxval.c (__getauxval) [!HAVE_AUX_VECTOR]: Do not go through
+ GLRO(dl_auxv) list.
+
+diff --git a/misc/getauxval.c b/misc/getauxval.c
+index e48f40f..6111376 100644
+--- a/misc/getauxval.c
++++ b/misc/getauxval.c
+@@ -30,9 +30,11 @@ __getauxval (unsigned long int type)
+ else if (type == AT_HWCAP2)
+ return GLRO(dl_hwcap2);
+
++#ifdef HAVE_AUX_VECTOR
+ for (p = GLRO(dl_auxv); p->a_type != AT_NULL; p++)
+ if (p->a_type == type)
+ return p->a_un.a_val;
++#endif
+
+ __set_errno (ENOENT);
+ return 0;
+diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
+index 2733ac8..ddec0be 100644
+--- a/sysdeps/generic/ldsodefs.h
++++ b/sysdeps/generic/ldsodefs.h
+@@ -509,8 +509,10 @@ struct rtld_global_ro
+ /* Mask for important hardware capabilities we honour. */
+ EXTERN uint64_t _dl_hwcap_mask;
+
++#ifdef HAVE_AUX_VECTOR
+ /* Pointer to the auxv list supplied to the program at startup. */
+ EXTERN ElfW(auxv_t) *_dl_auxv;
++#endif
+
+ /* Get architecture specific definitions. */
+ #define PROCINFO_DECL
diff --git a/debian/patches/hurd-i386/submitted-auxv.diff b/debian/patches/hurd-i386/submitted-auxv.diff
deleted file mode 100644
index 6c3ef98..0000000
--- a/debian/patches/hurd-i386/submitted-auxv.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-https://sourceware.org/ml/libc-alpha/2016-04/msg00025.html
-
-Index: glibc-2.22/misc/getauxval.c
-===================================================================
---- glibc-2.22.orig/misc/getauxval.c
-+++ glibc-2.22/misc/getauxval.c
-@@ -35,6 +35,7 @@ __getauxval (unsigned long int type)
- else if (type == AT_HWCAP2)
- return GLRO(dl_hwcap2);
-
-+ if (GLRO(dl_auxv))
- for (p = GLRO(dl_auxv); p->a_type != AT_NULL; p++)
- if (p->a_type == type)
- return p->a_un.a_val;
diff --git a/debian/patches/series b/debian/patches/series
index 481fa2a..5971499 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -151,7 +151,7 @@ hurd-i386/cvs-raise-longjump.diff
hurd-i386/submitted-hurd-abilist.diff
hurd-i386/cvs-errnos.d.diff
hurd-i386/cvs-mach-syscalls.mk.diff
-hurd-i386/submitted-auxv.diff
+hurd-i386/cvs-auxv.diff
hurd-i386/submitted-anon-mmap-shared.diff
i386/local-biarch.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: