[glibc] 01/01: hurd-i386/submitted-auxv.diff: New patch, fixes cvs crash
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch glibc-2.22
in repository glibc.
commit 898b1e9db8e9661fa5890404085618bbf25060fd
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat Apr 2 11:03:59 2016 +0000
hurd-i386/submitted-auxv.diff: New patch, fixes cvs crash
---
debian/changelog | 1 +
debian/patches/hurd-i386/submitted-auxv.diff | 14 ++++++++++++++
debian/patches/kfreebsd/submitted-auxv.diff | 2 +-
debian/patches/series | 1 +
4 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 0cb5c27..aed6702 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ glibc (2.22-0experimental4) UNRELEASED; urgency=medium
[ Samuel Thibault ]
* control: Accept hurd-headers-dev and libihash-dev as alternatives to
hurd-dev for bootstrapping.
+ * hurd-i386/submitted-auxv.diff: New patch, fixes cvs crash.
-- Aurelien Jarno <aurel32@debian.org> Tue, 01 Mar 2016 21:37:40 +0100
diff --git a/debian/patches/hurd-i386/submitted-auxv.diff b/debian/patches/hurd-i386/submitted-auxv.diff
new file mode 100644
index 0000000..6c3ef98
--- /dev/null
+++ b/debian/patches/hurd-i386/submitted-auxv.diff
@@ -0,0 +1,14 @@
+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/kfreebsd/submitted-auxv.diff b/debian/patches/kfreebsd/submitted-auxv.diff
index 360c276..c3c7533 100644
--- a/debian/patches/kfreebsd/submitted-auxv.diff
+++ b/debian/patches/kfreebsd/submitted-auxv.diff
@@ -17,9 +17,9 @@ https://sourceware.org/bugzilla/show_bug.cgi?id=15794
return GLRO(dl_hwcap2);
+#endif
+ if (GLRO(dl_auxv))
for (p = GLRO(dl_auxv); p->a_type != AT_NULL; p++)
if (p->a_type == type)
-
diff --git a/bits/auxv.h b/bits/auxv.h
new file mode 100644
index 0000000..76701c3
diff --git a/debian/patches/series b/debian/patches/series
index 30d33e2..aac1f8e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -150,6 +150,7 @@ hurd-i386/cvs-libpthread-sigstate.diff
hurd-i386/cvs-O_DIRECTORY.diff
hurd-i386/cvs-raise-longjump.diff
hurd-i386/submitted-hurd-abilist.diff
+hurd-i386/submitted-auxv.diff
i386/local-biarch.diff
i386/local-cmov.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: