r6407 - in glibc-package/branches/glibc-2.21/debian: . patches patches/hurd-i386
Author: sthibault
Date: 2015-03-20 18:12:06 +0000 (Fri, 20 Mar 2015)
New Revision: 6407
Added:
glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/unsubmitted-libpthread-semaphore.h.diff
glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/unsubmitted-timer_routines.diff
Modified:
glibc-package/branches/glibc-2.21/debian/changelog
glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/cvs-libpthread.diff
glibc-package/branches/glibc-2.21/debian/patches/series
glibc-package/branches/glibc-2.21/debian/patches/series.hurd-i386
Log:
* patches/hurd-i386/cvs-libpthread.diff: Update from upstream.
* patches/hurd-i386/unsubmitted-libpthread-semaphore.h.diff: New patch,
fixes semaphore header inclusion.
* patches/hurd-i386/unsubmitted-timer_routines.diff: New patch, fixes
timer_routines build.
Modified: glibc-package/branches/glibc-2.21/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.21/debian/changelog 2015-03-20 16:00:33 UTC (rev 6406)
+++ glibc-package/branches/glibc-2.21/debian/changelog 2015-03-20 18:12:06 UTC (rev 6407)
@@ -32,6 +32,10 @@
implements alloca cutoff limit.
* patches/hurd-i386/cvs-unwind-resume.diff: New patch, fixes unwind-resume
build.
+ * patches/hurd-i386/unsubmitted-libpthread-semaphore.h.diff: New patch,
+ fixes semaphore header inclusion.
+ * patches/hurd-i386/unsubmitted-timer_routines.diff: New patch, fixes
+ timer_routines build.
* sysdeps/hurd.mk: Disable -Werror since MIG currently generates warnings.
* libc0.3.symbols.hurd-i386: Update to new version engine.
* patches/hurd-i386/{libpthread_version,
Modified: glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/cvs-libpthread.diff
===================================================================
--- glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/cvs-libpthread.diff 2015-03-20 16:00:33 UTC (rev 6406)
+++ glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/cvs-libpthread.diff 2015-03-20 18:12:06 UTC (rev 6407)
@@ -3,8 +3,9 @@
thus by construction only libpthread/ files, thus hurd-only
Date: Sun Nov 2 15:07:29 2014 +0100
-Plus all patches up to git ed61c3b7b5ebdde30f4d887972876b210fae2372
-Date: Sun Mar 8 17:55:49 2015 +0100
+Plus all patches up to
+commit 8b48173fdc8f52a234ff9d3d1de5277c60d7eea4
+Date: Fri Mar 20 18:29:25 2015 +0100
---
ChangeLog | 6
@@ -15645,3 +15646,84 @@
-strong_alias (__funlockfile, _IO_funlockfile)
+weak_alias (__funlockfile, _IO_funlockfile)
weak_alias (__funlockfile, funlockfile)
+
+commit 900ceafde74f7c7c5101e3da51d52f8f8d92430f
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date: Fri Mar 20 17:03:15 2015 +0100
+
+ Don't hardcode using __libc_stack_end
+
+ * sysdeps/mach/hurd/pt-sysdep.c (_init_routine): Use `stack' parameter
+ instead of hardcoding __libc_stack_end.
+
+diff --git a/libpthread/sysdeps/mach/hurd/pt-sysdep.c b/libpthread/sysdeps/mach/hurd/pt-sysdep.c
+index b23d9df..63e71e8 100644
+--- a/libpthread/sysdeps/mach/hurd/pt-sysdep.c
++++ b/libpthread/sysdeps/mach/hurd/pt-sysdep.c
+@@ -59,7 +59,7 @@ _init_routine (void *stack)
+ /* Avoid allocating another stack */
+ attrp = &attr;
+ pthread_attr_init(attrp);
+- pthread_attr_setstack(attrp, __libc_stack_end, __vm_page_size);
++ pthread_attr_setstack(attrp, stack, __vm_page_size);
+ }
+
+ /* Create the pthread structure for the main thread (i.e. us). */
+
+commit ec4ab3d578a2287b5cd6c898d209fb220fe65331
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date: Fri Mar 20 17:57:05 2015 +0100
+
+ Fix reference to ___pthread_init
+
+ * sysdeps/mach/hurd/pt-sysdep.c (_init_routine): Call ___pthread_init
+ instead of __pthread_init.
+
+diff --git a/libpthread/sysdeps/mach/hurd/pt-sysdep.c b/libpthread/sysdeps/mach/hurd/pt-sysdep.c
+index 63e71e8..939194b 100644
+--- a/libpthread/sysdeps/mach/hurd/pt-sysdep.c
++++ b/libpthread/sysdeps/mach/hurd/pt-sysdep.c
+@@ -50,7 +50,7 @@ _init_routine (void *stack)
+ return 0;
+
+ /* Initialize the library. */
+- __pthread_init ();
++ ___pthread_init ();
+
+ if (stack)
+ {
+
+commit 8b48173fdc8f52a234ff9d3d1de5277c60d7eea4
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date: Fri Mar 20 18:29:25 2015 +0100
+
+ Fix librt link
+
+ * Makefile (libpthread-routines): Add shm-directory.
+ * Versions (GLIBC_PRIVATE): Add __shm_directory.
+
+diff --git a/libpthread/Makefile b/libpthread/Makefile
+index b8dee58..2906788 100644
+--- a/libpthread/Makefile
++++ b/libpthread/Makefile
+@@ -149,6 +149,8 @@ libpthread-routines := pt-attr pt-attr-destroy pt-attr-getdetachstate \
+ sem-post sem-timedwait sem-trywait sem-unlink \
+ sem-wait \
+ \
++ shm-directory \
++ \
+ cthreads-compat \
+ $(SYSDEPS)
+
+diff --git a/libpthread/Versions b/libpthread/Versions
+index 19ff26c..f9ac817 100644
+--- a/libpthread/Versions
++++ b/libpthread/Versions
+@@ -136,4 +136,7 @@ libpthread {
+ pthread_hurd_cond_wait_np;
+ pthread_hurd_cond_timedwait_np;
+ }
++ GLIBC_PRIVATE {
++ __shm_directory;
++ }
+ }
Added: glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/unsubmitted-libpthread-semaphore.h.diff
===================================================================
--- glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/unsubmitted-libpthread-semaphore.h.diff (rev 0)
+++ glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/unsubmitted-libpthread-semaphore.h.diff 2015-03-20 18:12:06 UTC (rev 6407)
@@ -0,0 +1,12 @@
+Index: glibc/libpthread/sysdeps/i386/bits/semaphore.h
+===================================================================
+--- /dev/null
++++ glibc/libpthread/sysdeps/i386/bits/semaphore.h
+@@ -0,0 +1 @@
++#include "../../generic/bits/semaphore.h"
+Index: glibc/libpthread/sysdeps/pthread/semaphore.h
+===================================================================
+--- /dev/null
++++ glibc/libpthread/sysdeps/pthread/semaphore.h
+@@ -0,0 +1 @@
++#include "../../include/semaphore.h"
Added: glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/unsubmitted-timer_routines.diff
===================================================================
--- glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/unsubmitted-timer_routines.diff (rev 0)
+++ glibc-package/branches/glibc-2.21/debian/patches/hurd-i386/unsubmitted-timer_routines.diff 2015-03-20 18:12:06 UTC (rev 6407)
@@ -0,0 +1,67 @@
+Index: glibc/sysdeps/pthread/timer_routines.c
+===================================================================
+--- glibc.orig/sysdeps/pthread/timer_routines.c
++++ glibc/sysdeps/pthread/timer_routines.c
+@@ -29,7 +29,7 @@
+ #include <sys/syscall.h>
+
+ #include "posix-timer.h"
+-#include <nptl/pthreadP.h>
++//#include <nptl/pthreadP.h>
+
+
+ /* Number of threads used. */
+@@ -395,6 +395,9 @@ thread_func (void *arg)
+ {
+ timespec_add (&timer->expirytime, &timer->expirytime,
+ &timer->value.it_interval);
++#ifndef DELAYTIMER_MAX
++#define DELAYTIMER_MAX INT_MAX
++#endif
+ if (timer->overrun_count < DELAYTIMER_MAX)
+ ++timer->overrun_count;
+ }
+@@ -481,7 +484,7 @@ __timer_thread_wakeup (struct thread_nod
+ pthread_cond_broadcast (&thread->cond);
+ }
+
+-
++#if 0
+ /* Compare two pthread_attr_t thread attributes for exact equality.
+ Returns 1 if they are equal, otherwise zero if they are not equal
+ or contain illegal values. This version is NPTL-specific for
+@@ -506,6 +509,7 @@ thread_attr_compare (const pthread_attr_
+ && memcmp (ileft->cpuset, iright->cpuset,
+ ileft->cpusetsize) == 0)));
+ }
++#endif
+
+
+ /* Search the list of active threads and find one which has matching
+@@ -514,6 +518,7 @@ struct thread_node *
+ __timer_thread_find_matching (const pthread_attr_t *desired_attr,
+ clockid_t desired_clock_id)
+ {
++#if 0
+ struct list_head *iter = list_first (&thread_active_list);
+
+ while (iter != list_null (&thread_active_list))
+@@ -526,6 +531,7 @@ __timer_thread_find_matching (const pthr
+
+ iter = list_next (iter);
+ }
++#endif
+
+ return NULL;
+ }
+Index: glibc/libpthread/sysdeps/pthread/Makefile
+===================================================================
+--- glibc.orig/libpthread/sysdeps/pthread/Makefile
++++ glibc/libpthread/sysdeps/pthread/Makefile
+@@ -1,3 +1,6 @@
++ifeq ($(subdir),rt)
++librt-sysdep_routines += timer_routines
++endif
+ ifeq ($(subdir),posix)
+ # FIXME: this is not getting $(pthread-version) from libpthread/Makefile!
+ CFLAGS-confstr.c += -DLIBPTHREAD_VERSION='"libpthread $(pthread-version)"'
Modified: glibc-package/branches/glibc-2.21/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.21/debian/patches/series 2015-03-20 16:00:33 UTC (rev 6406)
+++ glibc-package/branches/glibc-2.21/debian/patches/series 2015-03-20 18:12:06 UTC (rev 6407)
@@ -136,6 +136,7 @@
hurd-i386/unsubmitted-libc_alloca_cutoff.diff
hurd-i386/libpthread_pthread_types.diff
hurd-i386/cvs-unwind-resume.diff
+hurd-i386/unsubmitted-libpthread-semaphore.h.diff
i386/local-biarch.diff
i386/local-cmov.diff
Modified: glibc-package/branches/glibc-2.21/debian/patches/series.hurd-i386
===================================================================
--- glibc-package/branches/glibc-2.21/debian/patches/series.hurd-i386 2015-03-20 16:00:33 UTC (rev 6406)
+++ glibc-package/branches/glibc-2.21/debian/patches/series.hurd-i386 2015-03-20 18:12:06 UTC (rev 6407)
@@ -11,3 +11,4 @@
hurd-i386/tg-pagesize.diff
hurd-i386/submitted-handle-eprototype.diff
hurd-i386/local-no-bootstrap-fs-access.diff
+hurd-i386/unsubmitted-timer_routines.diff
Reply to: