r5716 - in glibc-package/branches/eglibc-2.18/debian: . patches/hurd-i386
Author: sthibault
Date: 2013-10-09 22:22:41 +0000 (Wed, 09 Oct 2013)
New Revision: 5716
Modified:
glibc-package/branches/eglibc-2.18/debian/changelog
glibc-package/branches/eglibc-2.18/debian/patches/hurd-i386/libpthread_hurd_cond_timedwait.diff
glibc-package/branches/eglibc-2.18/debian/patches/hurd-i386/libpthread_hurd_cond_wait.diff
Log:
* patches/hurd-i386/libpthread_hurd_cond_timedwait.diff: Add missing
version.
* patches/hurd-i386/libpthread_hurd_cond_wait.diff: Likewise.
Modified: glibc-package/branches/eglibc-2.18/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/changelog 2013-10-09 07:39:28 UTC (rev 5715)
+++ glibc-package/branches/eglibc-2.18/debian/changelog 2013-10-09 22:22:41 UTC (rev 5716)
@@ -52,6 +52,9 @@
* patches/hurd-i386/unsubmitted-clock_t_centiseconds.diff: Rebased.
* patches/hurd-i386/submitted-net.diff: Rebased.
* patches/hurd-i386/local-ulimit.diff: Removed, fixed upstream.
+ * patches/hurd-i386/libpthread_hurd_cond_timedwait.diff: Add missing
+ version.
+ * patches/hurd-i386/libpthread_hurd_cond_wait.diff: Likewise.
-- Adam Conrad <adconrad@ubuntu.com> Sun, 25 Aug 2013 14:59:44 -0600
Modified: glibc-package/branches/eglibc-2.18/debian/patches/hurd-i386/libpthread_hurd_cond_timedwait.diff
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/hurd-i386/libpthread_hurd_cond_timedwait.diff 2013-10-09 07:39:28 UTC (rev 5715)
+++ glibc-package/branches/eglibc-2.18/debian/patches/hurd-i386/libpthread_hurd_cond_timedwait.diff 2013-10-09 22:22:41 UTC (rev 5716)
@@ -26,11 +26,11 @@
libpthread/sysdeps/mach/hurd/pt-hurd-cond-wait.c | 76 +------
6 files changed, 192 insertions(+), 64 deletions(-)
-diff --git a/libpthread/Makefile b/libpthread/Makefile
-index 2c7645d..c57f1a0 100644
---- a/libpthread/Makefile
-+++ b/libpthread/Makefile
-@@ -115,6 +115,7 @@ libpthread-routines := pt-attr pt-attr-destroy pt-attr-getdetachstate \
+Index: eglibc-2.18/libpthread/Makefile
+===================================================================
+--- eglibc-2.18.orig/libpthread/Makefile 2013-10-09 10:42:41.000000000 +0000
++++ eglibc-2.18/libpthread/Makefile 2013-10-09 10:42:41.000000000 +0000
+@@ -115,6 +115,7 @@
pt-cond-wait \
pt-cond-timedwait \
pt-hurd-cond-wait \
@@ -38,11 +38,11 @@
\
pt-stack-alloc \
pt-thread-alloc \
-diff --git a/Versions.def b/Versions.def
-index 2c7645d..c57f1a0 100644
---- a/Versions.def
-+++ b/Versions.def
-@@ -98,6 +98,7 @@ libpthread {
+Index: eglibc-2.18/Versions.def
+===================================================================
+--- eglibc-2.18.orig/Versions.def 2013-10-09 10:42:41.000000000 +0000
++++ eglibc-2.18/Versions.def 2013-10-09 22:15:02.000000000 +0000
+@@ -31,6 +31,7 @@
GLIBC_2.12
GLIBC_2.13
GLIBC_2.13_DEBIAN_38
@@ -50,11 +50,19 @@
GLIBC_2.14
GLIBC_2.15
GLIBC_2.16
-diff --git a/libpthread/Versions b/libpthread/Versions
-index 8573637..3d151cf 100644
---- a/libpthread/Versions
-+++ b/libpthread/Versions
-@@ -132,4 +132,7 @@ libpthread {
+@@ -106,6 +107,7 @@
+ GLIBC_2.11
+ GLIBC_2.12
+ GLIBC_2.13_DEBIAN_38
++ GLIBC_2.13_DEBIAN_39
+ GLIBC_2.18
+ GLIBC_PRIVATE
+ }
+Index: eglibc-2.18/libpthread/Versions
+===================================================================
+--- eglibc-2.18.orig/libpthread/Versions 2013-10-09 10:42:41.000000000 +0000
++++ eglibc-2.18/libpthread/Versions 2013-10-09 10:42:41.000000000 +0000
+@@ -133,4 +133,7 @@
GLIBC_2.13_DEBIAN_38 {
pthread_hurd_cond_wait_np;
}
@@ -62,10 +70,10 @@
+ pthread_hurd_cond_timedwait_np;
+ }
}
-diff --git a/libpthread/sysdeps/mach/hurd/bits/pthread-np.h b/libpthread/sysdeps/mach/hurd/bits/pthread-np.h
-index 9817a06..5f75e06 100644
---- a/libpthread/sysdeps/mach/hurd/bits/pthread-np.h
-+++ b/libpthread/sysdeps/mach/hurd/bits/pthread-np.h
+Index: eglibc-2.18/libpthread/sysdeps/mach/hurd/bits/pthread-np.h
+===================================================================
+--- eglibc-2.18.orig/libpthread/sysdeps/mach/hurd/bits/pthread-np.h 2013-10-09 10:42:41.000000000 +0000
++++ eglibc-2.18/libpthread/sysdeps/mach/hurd/bits/pthread-np.h 2013-10-09 10:42:41.000000000 +0000
@@ -29,4 +29,10 @@
extern int pthread_hurd_cond_wait_np (pthread_cond_t *__restrict __cond,
pthread_mutex_t *__restrict __mutex);
@@ -77,11 +85,10 @@
+ const struct timespec *abstime);
+
#endif /* bits/pthread-np.h */
-diff --git a/libpthread/sysdeps/mach/hurd/pt-hurd-cond-timedwait.c b/libpthread/sysdeps/mach/hurd/pt-hurd-cond-timedwait.c
-new file mode 100644
-index 0000000..7491e0e
---- /dev/null
-+++ b/libpthread/sysdeps/mach/hurd/pt-hurd-cond-timedwait.c
+Index: eglibc-2.18/libpthread/sysdeps/mach/hurd/pt-hurd-cond-timedwait.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.18/libpthread/sysdeps/mach/hurd/pt-hurd-cond-timedwait.c 2013-10-09 10:42:41.000000000 +0000
@@ -0,0 +1,169 @@
+/* pthread_hurd_cond_timedwait_np. Hurd-specific wait on a condition.
+ Copyright (C) 2012 Free Software Foundation, Inc.
@@ -252,10 +259,10 @@
+
+ return 0;
+}
-diff --git a/libpthread/sysdeps/mach/hurd/pt-hurd-cond-wait.c b/libpthread/sysdeps/mach/hurd/pt-hurd-cond-wait.c
-index d2b5847..5e7c007 100644
---- a/libpthread/sysdeps/mach/hurd/pt-hurd-cond-wait.c
-+++ b/libpthread/sysdeps/mach/hurd/pt-hurd-cond-wait.c
+Index: eglibc-2.18/libpthread/sysdeps/mach/hurd/pt-hurd-cond-wait.c
+===================================================================
+--- eglibc-2.18.orig/libpthread/sysdeps/mach/hurd/pt-hurd-cond-wait.c 2013-10-09 10:42:41.000000000 +0000
++++ eglibc-2.18/libpthread/sysdeps/mach/hurd/pt-hurd-cond-wait.c 2013-10-09 10:42:41.000000000 +0000
@@ -23,71 +23,19 @@
#include <pt-internal.h>
Modified: glibc-package/branches/eglibc-2.18/debian/patches/hurd-i386/libpthread_hurd_cond_wait.diff
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/patches/hurd-i386/libpthread_hurd_cond_wait.diff 2013-10-09 07:39:28 UTC (rev 5715)
+++ glibc-package/branches/eglibc-2.18/debian/patches/hurd-i386/libpthread_hurd_cond_wait.diff 2013-10-09 22:22:41 UTC (rev 5716)
@@ -1,10 +1,10 @@
Add pthread_hurd_cond_wait_np, needed by translators with pthreads.
-diff --git a/libpthread/Makefile b/libpthread/Makefile
-index c1d8d33..2c7645d 100644
---- a/libpthread/Makefile
-+++ b/libpthread/Makefile
-@@ -114,6 +114,7 @@ libpthread-routines := pt-attr pt-attr-destroy pt-attr-getdetachstate \
+Index: eglibc-2.18/libpthread/Makefile
+===================================================================
+--- eglibc-2.18.orig/libpthread/Makefile 2013-10-09 10:42:41.000000000 +0000
++++ eglibc-2.18/libpthread/Makefile 2013-10-09 22:19:33.000000000 +0000
+@@ -110,6 +110,7 @@
pt-cond-signal \
pt-cond-wait \
pt-cond-timedwait \
@@ -12,9 +12,11 @@
\
pt-stack-alloc \
pt-thread-alloc \
---- a/Versions.def
-+++ b/Versions.def
-@@ -98,6 +98,7 @@ libpthread {
+Index: eglibc-2.18/Versions.def
+===================================================================
+--- eglibc-2.18.orig/Versions.def 2013-10-09 10:42:41.000000000 +0000
++++ eglibc-2.18/Versions.def 2013-10-09 22:19:48.000000000 +0000
+@@ -30,6 +30,7 @@
GLIBC_2.11
GLIBC_2.12
GLIBC_2.13
@@ -22,10 +24,19 @@
GLIBC_2.14
GLIBC_2.15
GLIBC_2.16
-index 77eb870..ca975e0 100644
---- a/libpthread/Versions
-+++ b/libpthread/Versions
-@@ -129,4 +129,7 @@ libpthread {
+@@ -105,6 +106,7 @@
+ GLIBC_2.6
+ GLIBC_2.11
+ GLIBC_2.12
++ GLIBC_2.13_DEBIAN_38
+ GLIBC_2.18
+ GLIBC_PRIVATE
+ }
+Index: eglibc-2.18/libpthread/Versions
+===================================================================
+--- eglibc-2.18.orig/libpthread/Versions 2013-10-09 10:42:41.000000000 +0000
++++ eglibc-2.18/libpthread/Versions 2013-10-09 22:19:32.000000000 +0000
+@@ -129,4 +129,7 @@
__pthread_spin_lock; __pthread_spin_trylock; __pthread_spin_unlock;
_pthread_spin_lock;
}
@@ -33,11 +44,11 @@
+ pthread_hurd_cond_wait_np;
+ }
}
-diff --git a/libpthread/pthread/pt-internal.h b/libpthread/pthread/pt-internal.h
-index 067fb73..291baf5 100644
---- a/libpthread/pthread/pt-internal.h
-+++ b/libpthread/pthread/pt-internal.h
-@@ -292,8 +292,9 @@ extern error_t __pthread_sigstate (struct __pthread *__restrict thread, int how,
+Index: eglibc-2.18/libpthread/pthread/pt-internal.h
+===================================================================
+--- eglibc-2.18.orig/libpthread/pthread/pt-internal.h 2013-10-09 10:42:41.000000000 +0000
++++ eglibc-2.18/libpthread/pthread/pt-internal.h 2013-10-09 22:19:32.000000000 +0000
+@@ -289,8 +289,9 @@
int clear_pending);
@@ -49,10 +60,10 @@
/* Default barrier attributes. */
extern const struct __pthread_barrierattr __pthread_default_barrierattr;
-diff --git a/libpthread/sysdeps/generic/pt-attr.c b/libpthread/sysdeps/generic/pt-attr.c
-index e501dc7..4f95918 100644
---- a/libpthread/sysdeps/generic/pt-attr.c
-+++ b/libpthread/sysdeps/generic/pt-attr.c
+Index: eglibc-2.18/libpthread/sysdeps/generic/pt-attr.c
+===================================================================
+--- eglibc-2.18.orig/libpthread/sysdeps/generic/pt-attr.c 2013-10-09 10:42:41.000000000 +0000
++++ eglibc-2.18/libpthread/sysdeps/generic/pt-attr.c 2013-10-09 10:42:41.000000000 +0000
@@ -24,7 +24,8 @@
#include <pt-internal.h>
@@ -63,11 +74,10 @@
{
schedparam: { sched_priority: 0 },
stacksize: PTHREAD_STACK_DEFAULT,
-diff --git a/libpthread/sysdeps/mach/hurd/bits/pthread-np.h b/libpthread/sysdeps/mach/hurd/bits/pthread-np.h
-new file mode 100644
-index 0000000..9817a06
---- /dev/null
-+++ b/libpthread/sysdeps/mach/hurd/bits/pthread-np.h
+Index: eglibc-2.18/libpthread/sysdeps/mach/hurd/bits/pthread-np.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.18/libpthread/sysdeps/mach/hurd/bits/pthread-np.h 2013-10-09 22:19:31.000000000 +0000
@@ -0,0 +1,32 @@
+/* Non-portable functions. Hurd on Mach version.
+ Copyright (C) 2008 Free Software Foundation, Inc.
@@ -101,11 +111,10 @@
+ pthread_mutex_t *__restrict __mutex);
+
+#endif /* bits/pthread-np.h */
-diff --git a/libpthread/sysdeps/mach/hurd/pt-hurd-cond-wait.c b/libpthread/sysdeps/mach/hurd/pt-hurd-cond-wait.c
-new file mode 100644
-index 0000000..d2b5847
---- /dev/null
-+++ b/libpthread/sysdeps/mach/hurd/pt-hurd-cond-wait.c
+Index: eglibc-2.18/libpthread/sysdeps/mach/hurd/pt-hurd-cond-wait.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ eglibc-2.18/libpthread/sysdeps/mach/hurd/pt-hurd-cond-wait.c 2013-10-09 22:19:31.000000000 +0000
@@ -0,0 +1,93 @@
+/* pthread_hurd_cond_wait. Hurd-specific wait on a condition.
+ Copyright (C) 2012 Free Software Foundation, Inc.
@@ -200,11 +209,11 @@
+
+ return cancel;
+}
-diff --git a/libpthread/sysdeps/mach/hurd/pt-sysdep.c b/libpthread/sysdeps/mach/hurd/pt-sysdep.c
-index f40fee5..882af69 100644
---- a/sysdeps/mach/hurd/pt-sysdep.c
-+++ b/libpthread/sysdeps/mach/hurd/pt-sysdep.c
-@@ -30,6 +30,16 @@
+Index: eglibc-2.18/libpthread/sysdeps/mach/hurd/pt-sysdep.c
+===================================================================
+--- eglibc-2.18.orig/libpthread/sysdeps/mach/hurd/pt-sysdep.c 2013-10-09 10:42:41.000000000 +0000
++++ eglibc-2.18/libpthread/sysdeps/mach/hurd/pt-sysdep.c 2013-10-09 10:42:41.000000000 +0000
+@@ -28,6 +28,16 @@
#include <pt-internal.h>
@@ -221,7 +230,7 @@
/* Forward. */
static void *init_routine (void);
-@@ -46,6 +56,10 @@ init_routine (void)
+@@ -44,6 +54,10 @@
struct __pthread *thread;
int err;
Reply to: