r1678 - in glibc-package: branches/glibc-2.4/debian branches/glibc-2.4/debian/patches branches/glibc-2.4/debian/patches/any branches/glibc-2.4/debian/patches/kfreebsd trunk/debian trunk/debian/patches trunk/debian/patches/any trunk/debian/patches/kfreebsd
Author: aurel32
Date: 2006-07-25 00:34:21 +0000 (Tue, 25 Jul 2006)
New Revision: 1678
Added:
glibc-package/branches/glibc-2.4/debian/patches/any/cvs-thread_signals.diff
glibc-package/trunk/debian/patches/any/cvs-thread_signals.diff
Removed:
glibc-package/branches/glibc-2.4/debian/patches/kfreebsd/submitted-thread_signals.diff
glibc-package/trunk/debian/patches/kfreebsd/submitted-thread_signals.diff
Modified:
glibc-package/branches/glibc-2.4/debian/changelog
glibc-package/branches/glibc-2.4/debian/patches/kfreebsd/local-ftw.diff
glibc-package/branches/glibc-2.4/debian/patches/kfreebsd/local-sysdeps.diff
glibc-package/branches/glibc-2.4/debian/patches/series
glibc-package/branches/glibc-2.4/debian/patches/series.kfreebsd-amd64
glibc-package/branches/glibc-2.4/debian/patches/series.kfreebsd-i386
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
glibc-package/trunk/debian/patches/series
glibc-package/trunk/debian/patches/series.kfreebsd-amd64
glibc-package/trunk/debian/patches/series.kfreebsd-i386
Log:
* patches/kfreebsd/local-sysdeps.diff: update to revision 1631 (from glibc-bsd).
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-07-25 00:20:39 UTC (rev 1677)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-07-25 00:34:21 UTC (rev 1678)
@@ -157,7 +157,7 @@
headers.
* debian/sysdeps/kfreebsd.mk: also use the nfs/ directory from kernel
headers.
- * patches/kfreebsd/local-sysdeps.diff: update to revision 1620 (from glibc-bsd).
+ * patches/kfreebsd/local-sysdeps.diff: update to revision 1631 (from glibc-bsd).
* debian/local/manpages/iconv.1: fixed the description of the --silent
option. (Closes: #375741)
* debian/local/manpages/iconv.1: fixed the use of the TH keyword. (Closes:
Added: glibc-package/branches/glibc-2.4/debian/patches/any/cvs-thread_signals.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/any/cvs-thread_signals.diff 2006-07-25 00:20:39 UTC (rev 1677)
+++ glibc-package/branches/glibc-2.4/debian/patches/any/cvs-thread_signals.diff 2006-07-25 00:34:21 UTC (rev 1678)
@@ -0,0 +1,47 @@
+Status: in upstream as of 2006/07/24
+ see http://sourceware.org/bugzilla/show_bug.cgi?id=2383
+
+===================================================================
+RCS file: /cvs/glibc/linuxthreads/linuxthreads/pthread.c,v
+retrieving revision 1.140
+retrieving revision 1.141
+diff -u -r1.140 -r1.141
+--- linuxthreads/pthread.c 2006/07/24 15:12:15 1.140
++++ linuxthreads/pthread.c 2006/07/24 19:20:26 1.141
+@@ -37,7 +37,7 @@
+ #include <not-cancel.h>
+
+ /* Sanity check. */
+-#if !defined __SIGRTMIN || (__SIGRTMAX - __SIGRTMIN) < 3
++#if !defined PTHREAD_SIGBASE && (!defined __SIGRTMIN || (__SIGRTMAX - __SIGRTMIN) < 3)
+ # error "This must not happen"
+ #endif
+
+@@ -181,9 +181,15 @@
+ platform does not support any real-time signals we will define the
+ values to some unreasonable value which will signal failing of all
+ the functions below. */
++#if defined (PTHREAD_SIGBASE)
++int __pthread_sig_restart = PTHREAD_SIGBASE;
++int __pthread_sig_cancel = PTHREAD_SIGBASE + 1;
++int __pthread_sig_debug = PTHREAD_SIGBASE + 2;
++#else
+ int __pthread_sig_restart = __SIGRTMIN;
+ int __pthread_sig_cancel = __SIGRTMIN + 1;
+ int __pthread_sig_debug = __SIGRTMIN + 2;
++#endif
+
+ extern int __libc_current_sigrtmin_private (void);
+
+@@ -198,9 +204,11 @@
+
+ if (__libc_current_sigrtmin_private () == -1)
+ {
++#ifndef PTHREAD_SIGBASE
+ __pthread_sig_restart = SIGUSR1;
+ __pthread_sig_cancel = SIGUSR2;
+ __pthread_sig_debug = 0;
++#endif
+ }
+ else
+ {
Modified: glibc-package/branches/glibc-2.4/debian/patches/kfreebsd/local-ftw.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/kfreebsd/local-ftw.diff 2006-07-25 00:20:39 UTC (rev 1677)
+++ glibc-package/branches/glibc-2.4/debian/patches/kfreebsd/local-ftw.diff 2006-07-25 00:34:21 UTC (rev 1678)
@@ -1,5 +1,8 @@
-disable unimplemented *at function
+disable usage of unimplemented *at functions
+revert to previous behaviour, inspired by
+ http://sourceware.org/ml/glibc-cvs/2006-q1/msg00636.html
+ http://sources.redhat.com/cgi-bin/cvsweb.cgi/libc/io/ftw.c.diff?cvsroot=glibc&r1=1.50&r2=1.51
--- io/ftw.c~ 2006-06-26 19:35:23.000000000 +0200
Modified: glibc-package/branches/glibc-2.4/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/kfreebsd/local-sysdeps.diff 2006-07-25 00:20:39 UTC (rev 1677)
+++ glibc-package/branches/glibc-2.4/debian/patches/kfreebsd/local-sysdeps.diff 2006-07-25 00:34:21 UTC (rev 1678)
@@ -11836,8 +11836,8 @@
+}
diff -x .svn -Nurd null/unix/bsd/bsd4.4/kfreebsd/kernel-features.h sysdeps/unix/bsd/bsd4.4/kfreebsd/kernel-features.h
--- null/unix/bsd/bsd4.4/kfreebsd/kernel-features.h 1970-01-01 01:00:00.000000000 +0100
-+++ sysdeps/unix/bsd/bsd4.4/kfreebsd/kernel-features.h 2006-01-03 22:12:22.000000000 +0100
-@@ -0,0 +1,40 @@
++++ sysdeps/unix/bsd/bsd4.4/kfreebsd/kernel-features.h 2006-07-25 02:21:10.000000000 +0200
+@@ -0,0 +1,43 @@
+/* Set flags signalling availability of kernel features based on given
+ kernel version number.
+ Copyright (C) 2002 Free Software Foundation, Inc.
@@ -11878,6 +11878,9 @@
+/* No real-time signals in FreeBSD 5.x or 6.x. */
+#define __ASSUME_REALTIME_SIGNALS 0
+
++/* Use signals #32, #33, #34 for internal linuxthreads communication */
++#define PTHREAD_SIGBASE 32
++
diff -x .svn -Nurd null/unix/bsd/bsd4.4/kfreebsd/ldconfig.h sysdeps/unix/bsd/bsd4.4/kfreebsd/ldconfig.h
--- null/unix/bsd/bsd4.4/kfreebsd/ldconfig.h 1970-01-01 01:00:00.000000000 +0100
+++ sysdeps/unix/bsd/bsd4.4/kfreebsd/ldconfig.h 2006-01-02 19:10:55.000000000 +0100
@@ -15662,8 +15665,8 @@
+libc_hidden_weak (statvfs)
diff -x .svn -Nurd null/unix/bsd/bsd4.4/kfreebsd/sys/kd.h sysdeps/unix/bsd/bsd4.4/kfreebsd/sys/kd.h
--- null/unix/bsd/bsd4.4/kfreebsd/sys/kd.h 1970-01-01 01:00:00.000000000 +0100
-+++ sysdeps/unix/bsd/bsd4.4/kfreebsd/sys/kd.h 2006-01-02 19:10:54.000000000 +0100
-@@ -0,0 +1,24 @@
++++ sysdeps/unix/bsd/bsd4.4/kfreebsd/sys/kd.h 2006-07-25 02:21:10.000000000 +0200
+@@ -0,0 +1,25 @@
+/* Copyright (C) 2005 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -15686,6 +15689,7 @@
+#define _SYS_KD_H 1
+
+#include <sys/consio.h>
++#include <sys/kbio.h>
+
+#endif /* sys/kd.h */
diff -x .svn -Nurd null/unix/bsd/bsd4.4/kfreebsd/sys/ktrace.h sysdeps/unix/bsd/bsd4.4/kfreebsd/sys/ktrace.h
@@ -15878,7 +15882,7 @@
+#endif /* _SYS_KTRACE_H */
diff -x .svn -Nurd null/unix/bsd/bsd4.4/kfreebsd/sys/mount.h sysdeps/unix/bsd/bsd4.4/kfreebsd/sys/mount.h
--- null/unix/bsd/bsd4.4/kfreebsd/sys/mount.h 1970-01-01 01:00:00.000000000 +0100
-+++ sysdeps/unix/bsd/bsd4.4/kfreebsd/sys/mount.h 2006-01-14 23:17:06.000000000 +0100
++++ sysdeps/unix/bsd/bsd4.4/kfreebsd/sys/mount.h 2006-07-25 02:21:10.000000000 +0200
@@ -0,0 +1,438 @@
+/* Header file for handling mounted filesystems. FreeBSD version.
+ Copyright (C) 2002 Free Software Foundation, Inc.
@@ -15907,7 +15911,7 @@
+/* Retrieving the list of mounted filesystems. */
+
+#include <bits/statfs.h>
-+
++#include <rpc/types.h>
+#include <sys/ucred.h>
+#include <sys/queue.h>
+
@@ -17440,8 +17444,8 @@
+#endif
diff -x .svn -Nurd null/unix/bsd/bsd4.4/kfreebsd/syscalls.list sysdeps/unix/bsd/bsd4.4/kfreebsd/syscalls.list
--- null/unix/bsd/bsd4.4/kfreebsd/syscalls.list 1970-01-01 01:00:00.000000000 +0100
-+++ sysdeps/unix/bsd/bsd4.4/kfreebsd/syscalls.list 2006-03-20 09:32:48.000000000 +0100
-@@ -0,0 +1,151 @@
++++ sysdeps/unix/bsd/bsd4.4/kfreebsd/syscalls.list 2006-07-25 02:21:10.000000000 +0200
+@@ -0,0 +1,153 @@
+# File name Caller Syscall name # args Strong name Weak names
+
+acl_aclcheck_fd - acl_aclcheck_fd i:iip __acl_aclcheck_fd
@@ -17593,6 +17597,8 @@
+swapoff - swapoff i:s swapoff
+getcontext - getcontext i:p __getcontext getcontext
+setcontext - setcontext i:p __setcontext setcontext
++kqueue EXTRA kqueue i: __kqueue kqueue
++kevent EXTRA kevent i:ipipip __kevent kevent
diff -x .svn -Nurd null/unix/bsd/bsd4.4/kfreebsd/sysconf.c sysdeps/unix/bsd/bsd4.4/kfreebsd/sysconf.c
--- null/unix/bsd/bsd4.4/kfreebsd/sysconf.c 1970-01-01 01:00:00.000000000 +0100
+++ sysdeps/unix/bsd/bsd4.4/kfreebsd/sysconf.c 2006-01-16 01:49:07.000000000 +0100
@@ -18726,8 +18732,8 @@
+#include <sysdeps/unix/sysv/linux/utmp_file.c>
diff -x .svn -Nurd null/unix/bsd/bsd4.4/kfreebsd/Versions sysdeps/unix/bsd/bsd4.4/kfreebsd/Versions
--- null/unix/bsd/bsd4.4/kfreebsd/Versions 1970-01-01 01:00:00.000000000 +0100
-+++ sysdeps/unix/bsd/bsd4.4/kfreebsd/Versions 2006-03-20 09:32:48.000000000 +0100
-@@ -0,0 +1,102 @@
++++ sysdeps/unix/bsd/bsd4.4/kfreebsd/Versions 2006-07-25 02:21:10.000000000 +0200
+@@ -0,0 +1,103 @@
+libc {
+ # The comment lines with "#errlist-compat" are magic; see errlist-compat.awk.
+ # When you get an error from errlist-compat.awk, you need to add a new
@@ -18803,6 +18809,7 @@
+ GLIBC_2.3.4 {
+ # f*
+ fhstat64; fhstatfs64;
++ kqueue; kevent;
+
+ #errlist-compat 93
+ _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
@@ -21748,16 +21755,6 @@
+ifeq ($(subdir),linuxthreads)
+sysdep_routines += register-atfork unregister-atfork
+endif
-diff -x .svn -Nurd null/sysdeps/unix/bsd/bsd4.4/kfreebsd/pthread_sig.h linuxthreads/sysdeps/unix/bsd/bsd4.4/kfreebsd/pthread_sig.h
---- null/sysdeps/unix/bsd/bsd4.4/kfreebsd/pthread_sig.h 1970-01-01 01:00:00.000000000 +0100
-+++ linuxthreads/sysdeps/unix/bsd/bsd4.4/kfreebsd/pthread_sig.h 2006-01-17 15:02:29.000000000 +0100
-@@ -0,0 +1,6 @@
-+/* Signal numbers used for the communication. */
-+
-+int __pthread_sig_restart = 32;
-+int __pthread_sig_cancel = 33;
-+int __pthread_sig_debug = 34;
-+
diff -x .svn -Nurd null/sysdeps/unix/bsd/bsd4.4/kfreebsd/pt-sigsuspend.S linuxthreads/sysdeps/unix/bsd/bsd4.4/kfreebsd/pt-sigsuspend.S
--- null/sysdeps/unix/bsd/bsd4.4/kfreebsd/pt-sigsuspend.S 1970-01-01 01:00:00.000000000 +0100
+++ linuxthreads/sysdeps/unix/bsd/bsd4.4/kfreebsd/pt-sigsuspend.S 2006-01-10 15:22:18.000000000 +0100
Deleted: glibc-package/branches/glibc-2.4/debian/patches/kfreebsd/submitted-thread_signals.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/kfreebsd/submitted-thread_signals.diff 2006-07-25 00:20:39 UTC (rev 1677)
+++ glibc-package/branches/glibc-2.4/debian/patches/kfreebsd/submitted-thread_signals.diff 2006-07-25 00:34:21 UTC (rev 1678)
@@ -1,142 +0,0 @@
-
-Status: submitted upstream
- see http://sourceware.org/bugzilla/show_bug.cgi?id=2383
-
-diff -urN linuxthreads/pthread.c linuxthreads/pthread.c
---- linuxthreads/pthread.c 2006-01-17 13:28:26.000000000 +0100
-+++ linuxthreads/pthread.c 2006-01-17 13:26:42.000000000 +0100
-@@ -35,11 +35,7 @@
- #include <tls.h>
- #include <version.h>
- #include <not-cancel.h>
--
--/* Sanity check. */
--#if !defined __SIGRTMIN || (__SIGRTMAX - __SIGRTMIN) < 3
--# error "This must not happen"
--#endif
-+#include <pthread_sig.h>
-
- #if !(USE_TLS && HAVE___THREAD)
- /* These variables are used by the setup code. */
-@@ -176,44 +172,6 @@
- static void pthread_handle_sigrestart(int sig);
- static void pthread_handle_sigdebug(int sig);
-
--/* Signal numbers used for the communication.
-- In these variables we keep track of the used variables. If the
-- platform does not support any real-time signals we will define the
-- values to some unreasonable value which will signal failing of all
-- the functions below. */
--int __pthread_sig_restart = __SIGRTMIN;
--int __pthread_sig_cancel = __SIGRTMIN + 1;
--int __pthread_sig_debug = __SIGRTMIN + 2;
--
--extern int __libc_current_sigrtmin_private (void);
--
--#if !__ASSUME_REALTIME_SIGNALS
--static int rtsigs_initialized;
--
--static void
--init_rtsigs (void)
--{
-- if (rtsigs_initialized)
-- return;
--
-- if (__libc_current_sigrtmin_private () == -1)
-- {
-- __pthread_sig_restart = SIGUSR1;
-- __pthread_sig_cancel = SIGUSR2;
-- __pthread_sig_debug = 0;
-- }
-- else
-- {
-- __pthread_restart = __pthread_restart_new;
-- __pthread_suspend = __pthread_wait_for_restart_signal;
-- __pthread_timedsuspend = __pthread_timedsuspend_new;
-- }
--
-- rtsigs_initialized = 1;
--}
--#endif
--
--
- /* Initialize the pthread library.
- Initialization is split in two functions:
- - a constructor function that blocks the __pthread_sig_restart signal
-@@ -548,9 +506,10 @@
- /* Likewise for the resolver state _res. */
- __pthread_initial_thread.p_resp = &_res;
- #endif
--#if !__ASSUME_REALTIME_SIGNALS
-+
-+#ifdef INIT_RTSIGS
- /* Initialize real-time signals. */
-- init_rtsigs ();
-+ INIT_RTSIGS;
- #endif
- /* Setup signal handlers for the initial thread.
- Since signal handlers are shared between threads, these settings
-diff -urN linuxthreads/sysdeps/unix/sysv/linux/pthread_sig.h linuxthreads/sysdeps/unix/sysv/linux/pthread_sig.h
---- linuxthreads/sysdeps/unix/sysv/linux/pthread_sig.h 1970-01-01 01:00:00.000000000 +0100
-+++ linuxthreads/sysdeps/unix/sysv/linux/pthread_sig.h 2006-01-17 13:24:51.000000000 +0100
-@@ -0,0 +1,60 @@
-+/* Linuxthreads - a simple clone()-based implementation of Posix */
-+/* threads for Linux. */
-+/* Copyright (C) 1996 Xavier Leroy (Xavier.Leroy@inria.fr) */
-+/* */
-+/* This program is free software; you can redistribute it and/or */
-+/* modify it under the terms of the GNU Library General Public License */
-+/* as published by the Free Software Foundation; either version 2 */
-+/* of the License, or (at your option) any later version. */
-+/* */
-+/* This program is distributed in the hope that it will be useful, */
-+/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
-+/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
-+/* GNU Library General Public License for more details. */
-+
-+/* Sanity check. */
-+#if !defined __SIGRTMIN || (__SIGRTMAX - __SIGRTMIN) < 3
-+# error "This must not happen"
-+#endif
-+
-+/* Signal numbers used for the communication.
-+ In these variables we keep track of the used variables. If the
-+ platform does not support any real-time signals we will define the
-+ values to some unreasonable value which will signal failing of all
-+ the functions below. */
-+
-+int __pthread_sig_restart = __SIGRTMIN;
-+int __pthread_sig_cancel = __SIGRTMIN + 1;
-+int __pthread_sig_debug = __SIGRTMIN + 2;
-+
-+extern int __libc_current_sigrtmin_private (void);
-+
-+#if !__ASSUME_REALTIME_SIGNALS
-+
-+#define INIT_RTSIGS init_rtsigs()
-+
-+static int rtsigs_initialized;
-+
-+static void
-+init_rtsigs (void)
-+{
-+ if (rtsigs_initialized)
-+ return;
-+
-+ if (__libc_current_sigrtmin_private () == -1)
-+ {
-+ __pthread_sig_restart = SIGUSR1;
-+ __pthread_sig_cancel = SIGUSR2;
-+ __pthread_sig_debug = 0;
-+ }
-+ else
-+ {
-+ __pthread_restart = __pthread_restart_new;
-+ __pthread_suspend = __pthread_wait_for_restart_signal;
-+ __pthread_timedsuspend = __pthread_timedsuspend_new;
-+ }
-+
-+ rtsigs_initialized = 1;
-+}
-+#endif
-+
Modified: glibc-package/branches/glibc-2.4/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/series 2006-07-25 00:20:39 UTC (rev 1677)
+++ glibc-package/branches/glibc-2.4/debian/patches/series 2006-07-25 00:34:21 UTC (rev 1678)
@@ -104,6 +104,7 @@
all/submitted-new-brf-encoding.diff -p0
any/cvs-getcwd_c.diff -p1
+any/cvs-thread_signals.diff -p0
any/local-__thread.diff -p0
any/local-asserth-decls.diff -p0
#any/local-base.diff -p0 # g: suspended
Modified: glibc-package/branches/glibc-2.4/debian/patches/series.kfreebsd-amd64
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/series.kfreebsd-amd64 2006-07-25 00:20:39 UTC (rev 1677)
+++ glibc-package/branches/glibc-2.4/debian/patches/series.kfreebsd-amd64 2006-07-25 00:34:21 UTC (rev 1678)
@@ -7,4 +7,3 @@
kfreebsd/local-sysdeps.diff -p0
kfreebsd/local-sysdeps-2.4.diff -p0
kfreebsd/local-undef-glibc.diff -p0
-kfreebsd/submitted-thread_signals.diff -p0
Modified: glibc-package/branches/glibc-2.4/debian/patches/series.kfreebsd-i386
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/series.kfreebsd-i386 2006-07-25 00:20:39 UTC (rev 1677)
+++ glibc-package/branches/glibc-2.4/debian/patches/series.kfreebsd-i386 2006-07-25 00:34:21 UTC (rev 1678)
@@ -7,4 +7,3 @@
kfreebsd/local-sysdeps.diff -p0
kfreebsd/local-sysdeps-2.4.diff -p0
kfreebsd/local-undef-glibc.diff -p0
-kfreebsd/submitted-thread_signals.diff -p0
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-07-25 00:20:39 UTC (rev 1677)
+++ glibc-package/trunk/debian/changelog 2006-07-25 00:34:21 UTC (rev 1678)
@@ -11,7 +11,7 @@
determine if the host CPU is able to run the testsuite.
* debian/sysdeps/kfreebsd.mk: also use the nfs/ directory from kernel
headers.
- * patches/kfreebsd/local-sysdeps.diff: update to revision 1620 (from glibc-bsd).
+ * patches/kfreebsd/local-sysdeps.diff: update to revision 1631 (from glibc-bsd).
* debian/local/manpages/iconv.1: fixed the description of the --silent
option. (Closes: #375741)
* debian/local/manpages/iconv.1: fixed the use of the TH keyword. (Closes:
Added: glibc-package/trunk/debian/patches/any/cvs-thread_signals.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-thread_signals.diff 2006-07-25 00:20:39 UTC (rev 1677)
+++ glibc-package/trunk/debian/patches/any/cvs-thread_signals.diff 2006-07-25 00:34:21 UTC (rev 1678)
@@ -0,0 +1,47 @@
+Status: in upstream as of 2006/07/24
+ see http://sourceware.org/bugzilla/show_bug.cgi?id=2383
+
+===================================================================
+RCS file: /cvs/glibc/linuxthreads/linuxthreads/pthread.c,v
+retrieving revision 1.140
+retrieving revision 1.141
+diff -u -r1.140 -r1.141
+--- linuxthreads/pthread.c 2006/07/24 15:12:15 1.140
++++ linuxthreads/pthread.c 2006/07/24 19:20:26 1.141
+@@ -37,7 +37,7 @@
+ #include <not-cancel.h>
+
+ /* Sanity check. */
+-#if !defined __SIGRTMIN || (__SIGRTMAX - __SIGRTMIN) < 3
++#if !defined PTHREAD_SIGBASE && (!defined __SIGRTMIN || (__SIGRTMAX - __SIGRTMIN) < 3)
+ # error "This must not happen"
+ #endif
+
+@@ -181,9 +181,15 @@
+ platform does not support any real-time signals we will define the
+ values to some unreasonable value which will signal failing of all
+ the functions below. */
++#if defined (PTHREAD_SIGBASE)
++int __pthread_sig_restart = PTHREAD_SIGBASE;
++int __pthread_sig_cancel = PTHREAD_SIGBASE + 1;
++int __pthread_sig_debug = PTHREAD_SIGBASE + 2;
++#else
+ int __pthread_sig_restart = __SIGRTMIN;
+ int __pthread_sig_cancel = __SIGRTMIN + 1;
+ int __pthread_sig_debug = __SIGRTMIN + 2;
++#endif
+
+ extern int __libc_current_sigrtmin_private (void);
+
+@@ -198,9 +204,11 @@
+
+ if (__libc_current_sigrtmin_private () == -1)
+ {
++#ifndef PTHREAD_SIGBASE
+ __pthread_sig_restart = SIGUSR1;
+ __pthread_sig_cancel = SIGUSR2;
+ __pthread_sig_debug = 0;
++#endif
+ }
+ else
+ {
Modified: glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2006-07-25 00:20:39 UTC (rev 1677)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2006-07-25 00:34:21 UTC (rev 1678)
@@ -11836,8 +11836,8 @@
+}
diff -x .svn -Nurd null/unix/bsd/bsd4.4/kfreebsd/kernel-features.h sysdeps/unix/bsd/bsd4.4/kfreebsd/kernel-features.h
--- null/unix/bsd/bsd4.4/kfreebsd/kernel-features.h 1970-01-01 01:00:00.000000000 +0100
-+++ sysdeps/unix/bsd/bsd4.4/kfreebsd/kernel-features.h 2006-01-03 22:12:22.000000000 +0100
-@@ -0,0 +1,40 @@
++++ sysdeps/unix/bsd/bsd4.4/kfreebsd/kernel-features.h 2006-07-25 02:21:10.000000000 +0200
+@@ -0,0 +1,43 @@
+/* Set flags signalling availability of kernel features based on given
+ kernel version number.
+ Copyright (C) 2002 Free Software Foundation, Inc.
@@ -11878,6 +11878,9 @@
+/* No real-time signals in FreeBSD 5.x or 6.x. */
+#define __ASSUME_REALTIME_SIGNALS 0
+
++/* Use signals #32, #33, #34 for internal linuxthreads communication */
++#define PTHREAD_SIGBASE 32
++
diff -x .svn -Nurd null/unix/bsd/bsd4.4/kfreebsd/ldconfig.h sysdeps/unix/bsd/bsd4.4/kfreebsd/ldconfig.h
--- null/unix/bsd/bsd4.4/kfreebsd/ldconfig.h 1970-01-01 01:00:00.000000000 +0100
+++ sysdeps/unix/bsd/bsd4.4/kfreebsd/ldconfig.h 2006-01-02 19:10:55.000000000 +0100
@@ -15662,8 +15665,8 @@
+libc_hidden_weak (statvfs)
diff -x .svn -Nurd null/unix/bsd/bsd4.4/kfreebsd/sys/kd.h sysdeps/unix/bsd/bsd4.4/kfreebsd/sys/kd.h
--- null/unix/bsd/bsd4.4/kfreebsd/sys/kd.h 1970-01-01 01:00:00.000000000 +0100
-+++ sysdeps/unix/bsd/bsd4.4/kfreebsd/sys/kd.h 2006-01-02 19:10:54.000000000 +0100
-@@ -0,0 +1,24 @@
++++ sysdeps/unix/bsd/bsd4.4/kfreebsd/sys/kd.h 2006-07-25 02:21:10.000000000 +0200
+@@ -0,0 +1,25 @@
+/* Copyright (C) 2005 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -15686,6 +15689,7 @@
+#define _SYS_KD_H 1
+
+#include <sys/consio.h>
++#include <sys/kbio.h>
+
+#endif /* sys/kd.h */
diff -x .svn -Nurd null/unix/bsd/bsd4.4/kfreebsd/sys/ktrace.h sysdeps/unix/bsd/bsd4.4/kfreebsd/sys/ktrace.h
@@ -15878,7 +15882,7 @@
+#endif /* _SYS_KTRACE_H */
diff -x .svn -Nurd null/unix/bsd/bsd4.4/kfreebsd/sys/mount.h sysdeps/unix/bsd/bsd4.4/kfreebsd/sys/mount.h
--- null/unix/bsd/bsd4.4/kfreebsd/sys/mount.h 1970-01-01 01:00:00.000000000 +0100
-+++ sysdeps/unix/bsd/bsd4.4/kfreebsd/sys/mount.h 2006-01-14 23:17:06.000000000 +0100
++++ sysdeps/unix/bsd/bsd4.4/kfreebsd/sys/mount.h 2006-07-25 02:21:10.000000000 +0200
@@ -0,0 +1,438 @@
+/* Header file for handling mounted filesystems. FreeBSD version.
+ Copyright (C) 2002 Free Software Foundation, Inc.
@@ -15907,7 +15911,7 @@
+/* Retrieving the list of mounted filesystems. */
+
+#include <bits/statfs.h>
-+
++#include <rpc/types.h>
+#include <sys/ucred.h>
+#include <sys/queue.h>
+
@@ -17440,8 +17444,8 @@
+#endif
diff -x .svn -Nurd null/unix/bsd/bsd4.4/kfreebsd/syscalls.list sysdeps/unix/bsd/bsd4.4/kfreebsd/syscalls.list
--- null/unix/bsd/bsd4.4/kfreebsd/syscalls.list 1970-01-01 01:00:00.000000000 +0100
-+++ sysdeps/unix/bsd/bsd4.4/kfreebsd/syscalls.list 2006-03-20 09:32:48.000000000 +0100
-@@ -0,0 +1,151 @@
++++ sysdeps/unix/bsd/bsd4.4/kfreebsd/syscalls.list 2006-07-25 02:21:10.000000000 +0200
+@@ -0,0 +1,153 @@
+# File name Caller Syscall name # args Strong name Weak names
+
+acl_aclcheck_fd - acl_aclcheck_fd i:iip __acl_aclcheck_fd
@@ -17593,6 +17597,8 @@
+swapoff - swapoff i:s swapoff
+getcontext - getcontext i:p __getcontext getcontext
+setcontext - setcontext i:p __setcontext setcontext
++kqueue EXTRA kqueue i: __kqueue kqueue
++kevent EXTRA kevent i:ipipip __kevent kevent
diff -x .svn -Nurd null/unix/bsd/bsd4.4/kfreebsd/sysconf.c sysdeps/unix/bsd/bsd4.4/kfreebsd/sysconf.c
--- null/unix/bsd/bsd4.4/kfreebsd/sysconf.c 1970-01-01 01:00:00.000000000 +0100
+++ sysdeps/unix/bsd/bsd4.4/kfreebsd/sysconf.c 2006-01-16 01:49:07.000000000 +0100
@@ -18726,8 +18732,8 @@
+#include <sysdeps/unix/sysv/linux/utmp_file.c>
diff -x .svn -Nurd null/unix/bsd/bsd4.4/kfreebsd/Versions sysdeps/unix/bsd/bsd4.4/kfreebsd/Versions
--- null/unix/bsd/bsd4.4/kfreebsd/Versions 1970-01-01 01:00:00.000000000 +0100
-+++ sysdeps/unix/bsd/bsd4.4/kfreebsd/Versions 2006-03-20 09:32:48.000000000 +0100
-@@ -0,0 +1,102 @@
++++ sysdeps/unix/bsd/bsd4.4/kfreebsd/Versions 2006-07-25 02:21:10.000000000 +0200
+@@ -0,0 +1,103 @@
+libc {
+ # The comment lines with "#errlist-compat" are magic; see errlist-compat.awk.
+ # When you get an error from errlist-compat.awk, you need to add a new
@@ -18803,6 +18809,7 @@
+ GLIBC_2.3.4 {
+ # f*
+ fhstat64; fhstatfs64;
++ kqueue; kevent;
+
+ #errlist-compat 93
+ _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
@@ -21748,16 +21755,6 @@
+ifeq ($(subdir),linuxthreads)
+sysdep_routines += register-atfork unregister-atfork
+endif
-diff -x .svn -Nurd null/sysdeps/unix/bsd/bsd4.4/kfreebsd/pthread_sig.h linuxthreads/sysdeps/unix/bsd/bsd4.4/kfreebsd/pthread_sig.h
---- null/sysdeps/unix/bsd/bsd4.4/kfreebsd/pthread_sig.h 1970-01-01 01:00:00.000000000 +0100
-+++ linuxthreads/sysdeps/unix/bsd/bsd4.4/kfreebsd/pthread_sig.h 2006-01-17 15:02:29.000000000 +0100
-@@ -0,0 +1,6 @@
-+/* Signal numbers used for the communication. */
-+
-+int __pthread_sig_restart = 32;
-+int __pthread_sig_cancel = 33;
-+int __pthread_sig_debug = 34;
-+
diff -x .svn -Nurd null/sysdeps/unix/bsd/bsd4.4/kfreebsd/pt-sigsuspend.S linuxthreads/sysdeps/unix/bsd/bsd4.4/kfreebsd/pt-sigsuspend.S
--- null/sysdeps/unix/bsd/bsd4.4/kfreebsd/pt-sigsuspend.S 1970-01-01 01:00:00.000000000 +0100
+++ linuxthreads/sysdeps/unix/bsd/bsd4.4/kfreebsd/pt-sigsuspend.S 2006-01-10 15:22:18.000000000 +0100
Deleted: glibc-package/trunk/debian/patches/kfreebsd/submitted-thread_signals.diff
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/submitted-thread_signals.diff 2006-07-25 00:20:39 UTC (rev 1677)
+++ glibc-package/trunk/debian/patches/kfreebsd/submitted-thread_signals.diff 2006-07-25 00:34:21 UTC (rev 1678)
@@ -1,142 +0,0 @@
-
-Status: submitted upstream
- see http://sourceware.org/bugzilla/show_bug.cgi?id=2383
-
-diff -urN linuxthreads/pthread.c linuxthreads/pthread.c
---- linuxthreads/pthread.c 2006-01-17 13:28:26.000000000 +0100
-+++ linuxthreads/pthread.c 2006-01-17 13:26:42.000000000 +0100
-@@ -35,11 +35,7 @@
- #include <tls.h>
- #include <version.h>
- #include <not-cancel.h>
--
--/* Sanity check. */
--#if !defined __SIGRTMIN || (__SIGRTMAX - __SIGRTMIN) < 3
--# error "This must not happen"
--#endif
-+#include <pthread_sig.h>
-
- #if !(USE_TLS && HAVE___THREAD)
- /* These variables are used by the setup code. */
-@@ -176,44 +172,6 @@
- static void pthread_handle_sigrestart(int sig);
- static void pthread_handle_sigdebug(int sig);
-
--/* Signal numbers used for the communication.
-- In these variables we keep track of the used variables. If the
-- platform does not support any real-time signals we will define the
-- values to some unreasonable value which will signal failing of all
-- the functions below. */
--int __pthread_sig_restart = __SIGRTMIN;
--int __pthread_sig_cancel = __SIGRTMIN + 1;
--int __pthread_sig_debug = __SIGRTMIN + 2;
--
--extern int __libc_current_sigrtmin_private (void);
--
--#if !__ASSUME_REALTIME_SIGNALS
--static int rtsigs_initialized;
--
--static void
--init_rtsigs (void)
--{
-- if (rtsigs_initialized)
-- return;
--
-- if (__libc_current_sigrtmin_private () == -1)
-- {
-- __pthread_sig_restart = SIGUSR1;
-- __pthread_sig_cancel = SIGUSR2;
-- __pthread_sig_debug = 0;
-- }
-- else
-- {
-- __pthread_restart = __pthread_restart_new;
-- __pthread_suspend = __pthread_wait_for_restart_signal;
-- __pthread_timedsuspend = __pthread_timedsuspend_new;
-- }
--
-- rtsigs_initialized = 1;
--}
--#endif
--
--
- /* Initialize the pthread library.
- Initialization is split in two functions:
- - a constructor function that blocks the __pthread_sig_restart signal
-@@ -548,9 +506,10 @@
- /* Likewise for the resolver state _res. */
- __pthread_initial_thread.p_resp = &_res;
- #endif
--#if !__ASSUME_REALTIME_SIGNALS
-+
-+#ifdef INIT_RTSIGS
- /* Initialize real-time signals. */
-- init_rtsigs ();
-+ INIT_RTSIGS;
- #endif
- /* Setup signal handlers for the initial thread.
- Since signal handlers are shared between threads, these settings
-diff -urN linuxthreads/sysdeps/unix/sysv/linux/pthread_sig.h linuxthreads/sysdeps/unix/sysv/linux/pthread_sig.h
---- linuxthreads/sysdeps/unix/sysv/linux/pthread_sig.h 1970-01-01 01:00:00.000000000 +0100
-+++ linuxthreads/sysdeps/unix/sysv/linux/pthread_sig.h 2006-01-17 13:24:51.000000000 +0100
-@@ -0,0 +1,60 @@
-+/* Linuxthreads - a simple clone()-based implementation of Posix */
-+/* threads for Linux. */
-+/* Copyright (C) 1996 Xavier Leroy (Xavier.Leroy@inria.fr) */
-+/* */
-+/* This program is free software; you can redistribute it and/or */
-+/* modify it under the terms of the GNU Library General Public License */
-+/* as published by the Free Software Foundation; either version 2 */
-+/* of the License, or (at your option) any later version. */
-+/* */
-+/* This program is distributed in the hope that it will be useful, */
-+/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
-+/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
-+/* GNU Library General Public License for more details. */
-+
-+/* Sanity check. */
-+#if !defined __SIGRTMIN || (__SIGRTMAX - __SIGRTMIN) < 3
-+# error "This must not happen"
-+#endif
-+
-+/* Signal numbers used for the communication.
-+ In these variables we keep track of the used variables. If the
-+ platform does not support any real-time signals we will define the
-+ values to some unreasonable value which will signal failing of all
-+ the functions below. */
-+
-+int __pthread_sig_restart = __SIGRTMIN;
-+int __pthread_sig_cancel = __SIGRTMIN + 1;
-+int __pthread_sig_debug = __SIGRTMIN + 2;
-+
-+extern int __libc_current_sigrtmin_private (void);
-+
-+#if !__ASSUME_REALTIME_SIGNALS
-+
-+#define INIT_RTSIGS init_rtsigs()
-+
-+static int rtsigs_initialized;
-+
-+static void
-+init_rtsigs (void)
-+{
-+ if (rtsigs_initialized)
-+ return;
-+
-+ if (__libc_current_sigrtmin_private () == -1)
-+ {
-+ __pthread_sig_restart = SIGUSR1;
-+ __pthread_sig_cancel = SIGUSR2;
-+ __pthread_sig_debug = 0;
-+ }
-+ else
-+ {
-+ __pthread_restart = __pthread_restart_new;
-+ __pthread_suspend = __pthread_wait_for_restart_signal;
-+ __pthread_timedsuspend = __pthread_timedsuspend_new;
-+ }
-+
-+ rtsigs_initialized = 1;
-+}
-+#endif
-+
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2006-07-25 00:20:39 UTC (rev 1677)
+++ glibc-package/trunk/debian/patches/series 2006-07-25 00:34:21 UTC (rev 1678)
@@ -138,6 +138,7 @@
any/cvs-path_log.diff -p0
any/cvs-regcomp_c.diff -p1
any/cvs-siginfo_h.diff -p1
+any/cvs-thread_signals.diff -p0
any/cvs-tls-crashfix.diff -p1
any/cvs-tst-setcontext_c.diff -p1
any/cvs-resource_h.diff -p1
Modified: glibc-package/trunk/debian/patches/series.kfreebsd-amd64
===================================================================
--- glibc-package/trunk/debian/patches/series.kfreebsd-amd64 2006-07-25 00:20:39 UTC (rev 1677)
+++ glibc-package/trunk/debian/patches/series.kfreebsd-amd64 2006-07-25 00:34:21 UTC (rev 1678)
@@ -5,4 +5,3 @@
kfreebsd/local-sys_queue_h.diff -p0
kfreebsd/local-sysdeps.diff -p0
kfreebsd/local-undef-glibc.diff -p0
-kfreebsd/submitted-thread_signals.diff -p0
Modified: glibc-package/trunk/debian/patches/series.kfreebsd-i386
===================================================================
--- glibc-package/trunk/debian/patches/series.kfreebsd-i386 2006-07-25 00:20:39 UTC (rev 1677)
+++ glibc-package/trunk/debian/patches/series.kfreebsd-i386 2006-07-25 00:34:21 UTC (rev 1678)
@@ -5,4 +5,3 @@
kfreebsd/local-sys_queue_h.diff -p0
kfreebsd/local-sysdeps.diff -p0
kfreebsd/local-undef-glibc.diff -p0
-kfreebsd/submitted-thread_signals.diff -p0
Reply to: