[glibc] 01/01: hurd-i386/cvs-libpthread.diff: More updates to glibc-2.23.
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 47cda7aa9ee36839fd27b6e2dbf4444b6ea76530
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Wed Mar 16 12:09:38 2016 +0100
hurd-i386/cvs-libpthread.diff: More updates to glibc-2.23.
---
debian/changelog | 4 ++++
debian/patches/hurd-i386/cvs-libpthread.diff | 10 +++++-----
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index aef8cd5..d4d276c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
glibc (2.23-0experimental1) UNRELEASED; urgency=medium
+ [ Aurelien Jarno ]
* debian/testsuite-xfail-debian.mk (powerpc) really mark
tst-malloc-thread-exit as xfail.
* debian/testsuite-xfail-debian.mk (ppc64) mark tst-malloc-thread-exit
test as xfail, it is a known issue and not a regression.
+ [ Samuel Thibault ]
+ * hurd-i386/cvs-libpthread.diff: More updates to glibc-2.23.
+
-- Aurelien Jarno <aurel32@debian.org> Mon, 14 Mar 2016 00:14:11 +0100
glibc (2.23-0experimental0) experimental; urgency=medium
diff --git a/debian/patches/hurd-i386/cvs-libpthread.diff b/debian/patches/hurd-i386/cvs-libpthread.diff
index a1d3fe9..2ca4d42 100644
--- a/debian/patches/hurd-i386/cvs-libpthread.diff
+++ b/debian/patches/hurd-i386/cvs-libpthread.diff
@@ -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 <bits/libc-lock.h>
++#include <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 <bits/stdio-lock.h>
++#include <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 <bits/stdio-lock.h>
++#include <stdio-lock.h>
+
+
+void
@@ -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));
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: