[glibc] 01/02: More glibc 2.23 fixes
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch glibc-2.23
in repository glibc.
commit 19bac1a0b6654932d0199b8f9207baaf9a6ba929
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Wed Mar 16 13:45:01 2016 +0100
More glibc 2.23 fixes
hurd-i386/cvs-libpthread.diff: More updates to glibc-2.23.
hurd-i386/cvs-gai_sigqueue.diff: Fix gai_sigqueue prototype.
---
debian/changelog | 1 +
debian/patches/hurd-i386/cvs-gai_sigqueue.diff | 12 ++++++++++++
debian/patches/hurd-i386/cvs-libpthread.diff | 6 +++---
debian/patches/series | 1 +
4 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 10b2e3f..f686720 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ glibc (2.23-0experimental1) UNRELEASED; urgency=medium
[ Samuel Thibault ]
* hurd-i386/cvs-libpthread.diff: More updates to glibc-2.23.
* hurd-i386/cvs-openat.diff: Fix __openat prototype.
+ * hurd-i386/cvs-gai_sigqueue.diff: Fix gai_sigqueue prototype.
-- Aurelien Jarno <aurel32@debian.org> Mon, 14 Mar 2016 00:14:11 +0100
diff --git a/debian/patches/hurd-i386/cvs-gai_sigqueue.diff b/debian/patches/hurd-i386/cvs-gai_sigqueue.diff
new file mode 100644
index 0000000..081d6be
--- /dev/null
+++ b/debian/patches/hurd-i386/cvs-gai_sigqueue.diff
@@ -0,0 +1,12 @@
+diff --git a/resolv/gai_sigqueue.c b/resolv/gai_sigqueue.c
+index 4b0c08f..40d2a68 100644
+--- a/resolv/gai_sigqueue.c
++++ b/resolv/gai_sigqueue.c
+@@ -22,6 +22,7 @@
+ #include <gai_misc.h>
+
+ int
++internal_function
+ __gai_sigqueue (int sig, const union sigval val, pid_t caller_pid)
+ {
+ __set_errno (ENOSYS);
diff --git a/debian/patches/hurd-i386/cvs-libpthread.diff b/debian/patches/hurd-i386/cvs-libpthread.diff
index 2ca4d42..5104eff 100644
--- a/debian/patches/hurd-i386/cvs-libpthread.diff
+++ b/debian/patches/hurd-i386/cvs-libpthread.diff
@@ -395,7 +395,7 @@ Index: glibc-2.21/libpthread/forward.c
+FORWARD2 (pthread_self, pthread_t, (void), (), return 0)
+
+
-+FORWARD (pthread_setcancelstate, (int state, int *oldstate), (state, oldstate),
++FORWARD (__pthread_setcancelstate, (int state, int *oldstate), (state, oldstate),
+ 0)
+
+FORWARD (pthread_setcanceltype, (int type, int *oldtype), (type, oldtype), 0)
@@ -14834,7 +14834,7 @@ Index: glibc-2.21/libpthread/sysdeps/pthread/libc-lockP.h
+weak_extern (__pthread_once)
+weak_extern (__pthread_initialize)
+weak_extern (__pthread_atfork)
-+weak_extern (pthread_setcancelstate)
++weak_extern (__pthread_setcancelstate)
+# else
+# pragma weak __pthread_mutex_init
+# pragma weak __pthread_mutex_destroy
@@ -14856,7 +14856,7 @@ Index: glibc-2.21/libpthread/sysdeps/pthread/libc-lockP.h
+# pragma weak __pthread_once
+# pragma weak __pthread_initialize
+# pragma weak __pthread_atfork
-+# pragma weak pthread_setcancelstate
++# pragma weak __pthread_setcancelstate
+# endif
+#endif
+
diff --git a/debian/patches/series b/debian/patches/series
index 7817fca..c29a69c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -132,6 +132,7 @@ hurd-i386/cvs-libpthread-api.diff
hurd-i386/cvs-libpthread-sigstate.diff
hurd-i386/submitted-hurd-abilist.diff
hurd-i386/cvs-openat.diff
+hurd-i386/cvs-gai_sigqueue.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: