[glibc] 01/01: hurd-i386/cvs-libpthread.diff: Separate 2.23 changes to...
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 023a8c8d4c6968cda060d776dd5adae61497aa86
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Thu Mar 17 01:28:11 2016 +0100
hurd-i386/cvs-libpthread.diff: Separate 2.23 changes to...
hurd-i386/cvs-libpthread-2.23.diff: ... separate patch.
---
debian/changelog | 2 +
debian/patches/hurd-i386/cvs-libpthread-2.23.diff | 66 +++++++++++++++++++++++
debian/patches/hurd-i386/cvs-libpthread.diff | 20 +++----
debian/patches/series | 1 +
4 files changed, 79 insertions(+), 10 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 399902e..9bd070f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ glibc (2.23-0experimental1) UNRELEASED; urgency=medium
* hurd-i386/cvs-openat.diff: Fix __openat prototype.
* hurd-i386/cvs-gai_sigqueue.diff: Fix gai_sigqueue prototype.
* hurd-i386/cvs-aio_sigqueue.diff: Fix aio_sigqueue prototype.
+ * hurd-i386/cvs-libpthread.diff: Separate 2.23 changes to...
+ * hurd-i386/cvs-libpthread-2.23.diff: ... separate patch.
-- Aurelien Jarno <aurel32@debian.org> Mon, 14 Mar 2016 00:14:11 +0100
diff --git a/debian/patches/hurd-i386/cvs-libpthread-2.23.diff b/debian/patches/hurd-i386/cvs-libpthread-2.23.diff
new file mode 100644
index 0000000..de84623
--- /dev/null
+++ b/debian/patches/hurd-i386/cvs-libpthread-2.23.diff
@@ -0,0 +1,66 @@
+--- a/libpthread/forward.c
++++ b/libpthread/forward.c
+@@ -132,7 +132,7 @@ FORWARD (pthread_mutex_unlock, (pthread_
+ 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)
+--- a/libpthread/pthread/pt-initialize.c
++++ b/libpthread/pthread/pt-initialize.c
+@@ -61,7 +61,7 @@ static const struct pthread_functions pt
+ .ptr_pthread_mutex_trylock = __pthread_mutex_trylock,
+ .ptr_pthread_mutex_unlock = __pthread_mutex_unlock,
+ .ptr_pthread_self = __pthread_self,
+- .ptr_pthread_setcancelstate = __pthread_setcancelstate,
++ .ptr___pthread_setcancelstate = __pthread_setcancelstate,
+ .ptr_pthread_setcanceltype = __pthread_setcanceltype,
+ .ptr___pthread_get_cleanup_stack = __pthread_get_cleanup_stack,
+ .ptr_pthread_once = __pthread_once,
+--- a/libpthread/sysdeps/pthread/flockfile.c
++++ b/libpthread/sysdeps/pthread/flockfile.c
+@@ -18,7 +18,7 @@
+
+ #include <stdio.h>
+ #include <libio.h>
+-#include <bits/libc-lock.h>
++#include <libc-lock.h>
+
+
+ void
+--- a/libpthread/sysdeps/pthread/ftrylockfile.c
++++ b/libpthread/sysdeps/pthread/ftrylockfile.c
+@@ -19,7 +19,7 @@
+ #include <errno.h>
+ #include <pthread.h>
+ #include <stdio.h>
+-#include <bits/stdio-lock.h>
++#include <stdio-lock.h>
+
+
+ int
+--- a/libpthread/sysdeps/pthread/funlockfile.c
++++ b/libpthread/sysdeps/pthread/funlockfile.c
+@@ -19,7 +19,7 @@
+ #include <pthread.h>
+ #include <stdio.h>
+ #include <libio.h>
+-#include <bits/stdio-lock.h>
++#include <stdio-lock.h>
+
+
+ void
+--- a/libpthread/sysdeps/pthread/pthread-functions.h
++++ b/libpthread/sysdeps/pthread/pthread-functions.h
+@@ -114,7 +114,7 @@ struct pthread_functions
+ int (*ptr_pthread_mutex_trylock) (pthread_mutex_t *);
+ int (*ptr_pthread_mutex_unlock) (pthread_mutex_t *);
+ pthread_t (*ptr_pthread_self) (void);
+- int (*ptr_pthread_setcancelstate) (int, int *);
++ int (*ptr___pthread_setcancelstate) (int, int *);
+ int (*ptr_pthread_setcanceltype) (int, int *);
+ struct __pthread_cancelation_handler **(*ptr___pthread_get_cleanup_stack) (void);
+ int (*ptr_pthread_once) (pthread_once_t *, void (*) (void));
diff --git a/debian/patches/hurd-i386/cvs-libpthread.diff b/debian/patches/hurd-i386/cvs-libpthread.diff
index 5104eff..0e0522c 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)
@@ -3599,7 +3599,7 @@ Index: glibc-2.21/libpthread/pthread/pt-initialize.c
+ .ptr_pthread_mutex_trylock = __pthread_mutex_trylock,
+ .ptr_pthread_mutex_unlock = __pthread_mutex_unlock,
+ .ptr_pthread_self = __pthread_self,
-+ .ptr___pthread_setcancelstate = __pthread_setcancelstate,
++ .ptr_pthread_setcancelstate = __pthread_setcancelstate,
+ .ptr_pthread_setcanceltype = __pthread_setcanceltype,
+ .ptr___pthread_get_cleanup_stack = __pthread_get_cleanup_stack,
+ .ptr_pthread_once = __pthread_once,
@@ -14605,7 +14605,7 @@ Index: glibc-2.21/libpthread/sysdeps/pthread/flockfile.c
+
+#include <stdio.h>
+#include <libio.h>
-+#include <libc-lock.h>
++#include <bits/libc-lock.h>
+
+
+void
@@ -14644,7 +14644,7 @@ Index: glibc-2.21/libpthread/sysdeps/pthread/ftrylockfile.c
+#include <errno.h>
+#include <pthread.h>
+#include <stdio.h>
-+#include <stdio-lock.h>
++#include <bits/stdio-lock.h>
+
+
+int
@@ -14685,7 +14685,7 @@ Index: glibc-2.21/libpthread/sysdeps/pthread/funlockfile.c
+#include <pthread.h>
+#include <stdio.h>
+#include <libio.h>
-+#include <stdio-lock.h>
++#include <bits/stdio-lock.h>
+
+
+void
@@ -14698,10 +14698,10 @@ Index: glibc-2.21/libpthread/sysdeps/pthread/funlockfile.c
+}
+weak_alias (__funlockfile, _IO_funlockfile)
+weak_alias (__funlockfile, funlockfile)
-Index: glibc-2.21/libpthread/sysdeps/pthread/libc-lockP.h
+Index: glibc-2.21/libpthread/sysdeps/pthread/bits/libc-lockP.h
===================================================================
--- /dev/null
-+++ glibc-2.21/libpthread/sysdeps/pthread/libc-lockP.h
++++ glibc-2.21/libpthread/sysdeps/pthread/bits/libc-lockP.h
@@ -0,0 +1,158 @@
+/* Private libc-internal interface for mutex locks.
+ Copyright (C) 2015 Free Software Foundation, Inc.
@@ -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
+
@@ -14982,7 +14982,7 @@ Index: glibc-2.21/libpthread/sysdeps/pthread/pthread-functions.h
+ int (*ptr_pthread_mutex_trylock) (pthread_mutex_t *);
+ int (*ptr_pthread_mutex_unlock) (pthread_mutex_t *);
+ pthread_t (*ptr_pthread_self) (void);
-+ int (*ptr___pthread_setcancelstate) (int, int *);
++ int (*ptr_pthread_setcancelstate) (int, int *);
+ int (*ptr_pthread_setcanceltype) (int, int *);
+ struct __pthread_cancelation_handler **(*ptr___pthread_get_cleanup_stack) (void);
+ int (*ptr_pthread_once) (pthread_once_t *, void (*) (void));
diff --git a/debian/patches/series b/debian/patches/series
index b0b53d9..6d5569e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -86,6 +86,7 @@ hurd-i386/tg-hurdsig-SA_SIGINFO.diff
hurd-i386/tg-hurdsig-fixes-2.diff
hurd-i386/tg-hooks.diff
hurd-i386/cvs-libpthread.diff
+hurd-i386/cvs-libpthread-2.23.diff
hurd-i386/libpthread_spin-lock.diff
hurd-i386/libpthread_build.diff
hurd-i386/libpthread_sigmask.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: