r4074 - in glibc-package/trunk/debian: . patches patches/hurd-i386 testsuite-checking
Author: sthibault
Date: 2010-01-08 17:03:38 +0000 (Fri, 08 Jan 2010)
New Revision: 4074
Added:
glibc-package/trunk/debian/patches/hurd-i386/local-pthread.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/hurd-i386/local-pthread_posix-option.diff
glibc-package/trunk/debian/patches/series.hurd-i386
glibc-package/trunk/debian/testsuite-checking/expected-results-i486-gnu-libc
Log:
patches/hurd-i386/local-pthread.diff: New hurd-only patch to provide LIBPTHREAD_SO and disable nscd.
patches/hurd-i386/local-pthread_posix-option.diff: Tell glibc Makefiles that we have a libpthread.
testsuite-checking/expected-results-i486-linux-gnu-libc: Update results.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2010-01-08 14:50:55 UTC (rev 4073)
+++ glibc-package/trunk/debian/changelog 2010-01-08 17:03:38 UTC (rev 4074)
@@ -3,6 +3,13 @@
[ Aurelien Jarno ]
* kfreebsd/local-sysdeps.diff: update to revision 2913 (from glibc-bsd).
+ [ Samuel Thibault ]
+ * patches/hurd-i386/local-pthread.diff: New hurd-only patch to provide
+ LIBPTHREAD_SO and disable nscd.
+ * patches/hurd-i386/local-pthread_posix-option.diff: Tell glibc Makefiles that
+ we have a libpthread.
+ * testsuite-checking/expected-results-i486-linux-gnu-libc: Update results.
+
-- Aurelien Jarno <aurel32@debian.org> Fri, 08 Jan 2010 14:36:13 +0100
eglibc (2.10.2-5) unstable; urgency=low
Added: glibc-package/trunk/debian/patches/hurd-i386/local-pthread.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/local-pthread.diff (rev 0)
+++ glibc-package/trunk/debian/patches/hurd-i386/local-pthread.diff 2010-01-08 17:03:38 UTC (rev 4074)
@@ -0,0 +1,28 @@
+Add LIBPTHREAD_SO macro to gnu/lib-names.h and disable nscd build
+---
+ nscd/Makefile | 2 +-
+ scripts/lib-names.awk | 2 ++
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+--- a/scripts/lib-names.awk
++++ b/scripts/lib-names.awk
+@@ -61,6 +61,8 @@ END {
+ cmd = "LC_ALL=C sort"; print lines["DEFAULT"] | cmd; close(cmd);
+ }
+
++ print "#define LIBPTHREAD_SO \"libpthread.so.0.3\""
++
+ print "";
+ print "#endif /* gnu/lib-names.h */"
+ }
+--- a/nscd/Makefile
++++ b/nscd/Makefile
+@@ -36,7 +36,7 @@ nscd-modules := nscd connections pwdcache getpwnam_r getpwuid_r grpcache \
+ dbg_log nscd_conf nscd_stat cache mem nscd_setup_thread \
+ xmalloc xstrdup aicache initgrcache gai res_hconf
+
+-ifeq ($(have-thread-library),yes)
++ifeq ($(have-thread-library),yesreallyyes)
+
+ ifneq (yesyes,$(have-fpie)$(build-shared))
+ others += nscd
Modified: glibc-package/trunk/debian/patches/hurd-i386/local-pthread_posix-option.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/local-pthread_posix-option.diff 2010-01-08 14:50:55 UTC (rev 4073)
+++ glibc-package/trunk/debian/patches/hurd-i386/local-pthread_posix-option.diff 2010-01-08 17:03:38 UTC (rev 4074)
@@ -2,8 +2,10 @@
packages which have a pthread library.
---
- posix_opt.h | 40 +++++++++++++++++++++++++++-------------
- 1 file changed, 27 insertions(+), 13 deletions(-)
+ b/sysdeps/mach/hurd/gai_misc.h | 43 +++++++++++++++++++++++++++++++++++++
+ sysdeps/mach/hurd/Makeconfig | 10 ++++++++
+ sysdeps/mach/hurd/bits/posix_opt.h | 40 +++++++++++++++++++++++-----------
+ 3 files changed, 80 insertions(+), 13 deletions(-)
--- a/sysdeps/mach/hurd/bits/posix_opt.h 2010-01-05 23:43:03.000000000 +0100
+++ b/sysdeps/mach/hurd/bits/posix_opt.h 2010-01-05 23:46:32.000000000 +0100
@@ -85,3 +87,67 @@
/* POSIX message queues could be available in future. */
#define _POSIX_MESSAGE_PASSING 0
+--- a/sysdeps/mach/hurd/Makeconfig
++++ b/sysdeps/mach/hurd/Makeconfig
+@@ -2,3 +2,13 @@
+ # See Makefile in this directory for the rule that builds this.
+ # We must define this variable earlier than sysdeps Makefiles are included.
+ static-start-installed-name = crt0.o
++
++have-thread-library = yes
++shared-thread-library = /lib/libpthread.so
++static-thread-library = /lib/libpthread.a
++bounded-thread-library = $(static-thread-library)
++
++$(shared-thread-library):
++ true
++$(static-thread-library):
++ true
++/usr/include/pthread.h:
++ true
+--- /dev/null
++++ b/sysdeps/mach/hurd/gai_misc.h
+@@ -0,0 +1,43 @@
++#include <signal.h>
++
++#define gai_start_notify_thread __gai_start_notify_thread
++#define gai_create_helper_thread __gai_create_helper_thread
++
++extern inline void
++__gai_start_notify_thread (void)
++{
++ sigset_t ss;
++ sigemptyset (&ss);
++ sigprocmask(SIG_SETMASK, &ss, NULL);
++}
++
++extern inline int
++__gai_create_helper_thread (pthread_t *threadp, void *(*tf) (void *),
++ void *arg)
++{
++ pthread_attr_t attr;
++
++ /* Make sure the thread is created detached. */
++ pthread_attr_init (&attr);
++ pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
++
++ /* The helper thread needs only very little resources. */
++ (void) pthread_attr_setstacksize (&attr, 0x10000);
++
++ /* Block all signals in the helper thread. To do this thoroughly we
++ temporarily have to block all signals here. */
++ sigset_t ss;
++ sigset_t oss;
++ sigfillset (&ss);
++ sigprocmask(SIG_SETMASK, &ss, &oss);
++
++ int ret = pthread_create (threadp, &attr, tf, arg);
++
++ /* Restore the signal mask. */
++ sigprocmask(SIG_SETMASK, &oss, NULL);
++
++ (void) pthread_attr_destroy (&attr);
++ return ret;
++}
++
++#include_next <gai_misc.h>
Modified: glibc-package/trunk/debian/patches/series.hurd-i386
===================================================================
--- glibc-package/trunk/debian/patches/series.hurd-i386 2010-01-08 14:50:55 UTC (rev 4073)
+++ glibc-package/trunk/debian/patches/series.hurd-i386 2010-01-08 17:03:38 UTC (rev 4074)
@@ -4,3 +4,4 @@
hurd-i386/local-pthread-unsupported-stubs.diff
hurd-i386/local-unlockpt-chroot.diff
hurd-i386/local-msg-nosignal.diff
+hurd-i386/local-pthread.diff
Modified: glibc-package/trunk/debian/testsuite-checking/expected-results-i486-gnu-libc
===================================================================
--- glibc-package/trunk/debian/testsuite-checking/expected-results-i486-gnu-libc 2010-01-08 14:50:55 UTC (rev 4073)
+++ glibc-package/trunk/debian/testsuite-checking/expected-results-i486-gnu-libc 2010-01-08 17:03:38 UTC (rev 4074)
@@ -29,11 +29,9 @@
test-ifaddrs.out, Error 1
test-lfs.out, Error 1
test-memmem, Error 1
-tst-aio10, Error 1
-tst-aio2, Error 1
-tst-aio3, Error 1
+tst-aio10.out, Error 1
tst-aio8.out, Error 1
-tst-aio9, Error 1
+tst-aio9.out, Error 1
tst-atime.out, Error 1
tst-audit1.out, Error 137
tst-audit2.out, Error 137
@@ -43,7 +41,7 @@
tst-chk4.out, Error 1
tst-chk5.out, Error 1
tst-chk6.out, Error 1
-tst-cpuclock2, Error 1
+tst-clock_nanosleep.out, Error 1
tst-dlmopen1.out, Error 1
tst-error1-mem, Error 1
tst-ether_line.o, Error 1
@@ -59,17 +57,12 @@
tst-lfschk5.out, Error 1
tst-lfschk6.out, Error 1
tst-mknodat.out, Error 1
-tst-mqueue3, Error 1
-tst-mqueue6, Error 1
-tst-mqueue8, Error 1
tst-renameat.out, Error 1
tst-sprofil.out, Error 136
tst-stackguard1-static.out, Error 1
tst-stackguard1.out, Error 1
tst-sysconf.out, Error 1
-tst-thrlock, Error 1
tst-timer.out, Error 1
-tst-timer3, Error 1
tst-tls18.out, Error 1
tst-tls9-static.out, Error 1
tst-ttyname_r.out, Error 2
Reply to: