Author: sthibault Date: 2010-01-07 10:21:50 +0000 (Thu, 07 Jan 2010) New Revision: 4066
Added: glibc-package/trunk/debian/patches/hurd-i386/cvs-getcwd.diff glibc-package/trunk/debian/patches/hurd-i386/cvs-setsid.diff glibc-package/trunk/debian/patches/hurd-i386/submitted-posix_opt.h.diff Removed: glibc-package/trunk/debian/patches/hurd-i386/submitted-getcwd.diff glibc-package/trunk/debian/patches/hurd-i386/submitted-setsid.diff Modified: glibc-package/trunk/debian/changelog glibc-package/trunk/debian/patches/hurd-i386/local-pthread_posix-option.diff glibc-package/trunk/debian/patches/hurd-i386/local-tls-support.diff glibc-package/trunk/debian/patches/hurd-i386/submitted-sysvshm.diff glibc-package/trunk/debian/patches/series glibc-package/trunk/debian/testsuite-checking/expected-results-i486-gnu-libc Log: patches/hurd-i386/submitted-posix_opt.h.diff: New patch to update standard macros in posix_opt.h. patches/hurd-i386/local-pthread_posix-option.diff: Refresh and update standard macros in posix_opt.h. patches/hurd-i386/submitted-sysvshm.diff: Add standard macro _XOPEN_SHM in posix_opt.h. patches/hurd-i386/local-tls-support.diff: Use kern_return_t instead of error_t to avoid a dependency on a GNU-specific type. patches/hurd-i386/submitted-getcwd.diff: renamed to cvs-getcwd.diff since merged upstream. patches/hurd-i386/submitted-setsid.diff: renamed to cvs-setsid.diff since merged upstream. Modified: glibc-package/trunk/debian/changelog =================================================================== --- glibc-package/trunk/debian/changelog 2010-01-07 06:50:24 UTC (rev 4065) +++ glibc-package/trunk/debian/changelog 2010-01-07 10:21:50 UTC (rev 4066) @@ -5,6 +5,20 @@ Move it into any/local-no-SOCK_NONBLOCK.diff, as it is used also on hurd. Closes: #564008. + [ Samuel Thibault ] + * patches/hurd-i386/submitted-posix_opt.h.diff: New patch to update standard + macros in posix_opt.h. + * patches/hurd-i386/local-pthread_posix-option.diff: Refresh and update + standard macros in posix_opt.h. + * patches/hurd-i386/submitted-sysvshm.diff: Add standard macro _XOPEN_SHM in + posix_opt.h. + * patches/hurd-i386/local-tls-support.diff: Use kern_return_t instead of + error_t to avoid a dependency on a GNU-specific type. + * patches/hurd-i386/submitted-getcwd.diff: renamed to cvs-getcwd.diff since + merged upstream. + * patches/hurd-i386/submitted-setsid.diff: renamed to cvs-setsid.diff since + merged upstream. + -- Aurelien Jarno <aure...@debian.org> Wed, 06 Jan 2010 22:18:19 +0100 eglibc (2.10.2-4) unstable; urgency=low Copied: glibc-package/trunk/debian/patches/hurd-i386/cvs-getcwd.diff (from rev 4051, glibc-package/trunk/debian/patches/hurd-i386/submitted-getcwd.diff) =================================================================== --- glibc-package/trunk/debian/patches/hurd-i386/cvs-getcwd.diff (rev 0) +++ glibc-package/trunk/debian/patches/hurd-i386/cvs-getcwd.diff 2010-01-07 10:21:50 UTC (rev 4066) @@ -0,0 +1,19 @@ +The patch below fixes a spurious call to mach_port_deallocate: rootdevid +is already deallocated as soon as it is fetched through __io_identity. + +--- + getcwd.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/sysdeps/mach/hurd/getcwd.c b/sysdeps/mach/hurd/getcwd.c +index 7e07e6b..f833f3d 100644 +--- a/sysdeps/mach/hurd/getcwd.c ++++ b/sysdeps/mach/hurd/getcwd.c +@@ -60,7 +60,6 @@ _hurd_canonicalize_directory_name_internal (file_t thisdir, + __mach_port_deallocate (__mach_task_self (), thisid); + __mach_port_deallocate (__mach_task_self (), thisdevid); + __mach_port_deallocate (__mach_task_self (), rootid); +- __mach_port_deallocate (__mach_task_self (), rootdevid); + + if (dirbuf != NULL) + __vm_deallocate (__mach_task_self (), Copied: glibc-package/trunk/debian/patches/hurd-i386/cvs-setsid.diff (from rev 4051, glibc-package/trunk/debian/patches/hurd-i386/submitted-setsid.diff) =================================================================== --- glibc-package/trunk/debian/patches/hurd-i386/cvs-setsid.diff (rev 0) +++ glibc-package/trunk/debian/patches/hurd-i386/cvs-setsid.diff 2010-01-07 10:21:50 UTC (rev 4066) @@ -0,0 +1,17 @@ +Fix bogus port deallocation due to uninitialized variable + +--- + hurdioctl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- eglibc-2.10.2-orig/hurd/hurdioctl.c 2006-08-17 02:18:26.000000000 +0100 ++++ eglibc-2.10.2/hurd/hurdioctl.c 2009-12-22 03:13:05.000000000 +0000 +@@ -169,7 +169,7 @@ + for (i = 0; i < _hurd_dtablesize; ++i) + { + struct hurd_fd *const d = _hurd_dtable[i]; +- mach_port_t newctty; ++ mach_port_t newctty = MACH_PORT_NULL; + + if (d == NULL) + /* Nothing to do for an unused descriptor cell. */ 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-07 06:50:24 UTC (rev 4065) +++ glibc-package/trunk/debian/patches/hurd-i386/local-pthread_posix-option.diff 2010-01-07 10:21:50 UTC (rev 4066) @@ -2,15 +2,15 @@ packages which have a pthread library. --- - sysdeps/mach/hurd/bits/posix_opt.h | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) + posix_opt.h | 40 +++++++++++++++++++++++++++------------- + 1 file changed, 27 insertions(+), 13 deletions(-) ---- a/sysdeps/mach/hurd/bits/posix_opt.h -+++ b/sysdeps/mach/hurd/bits/posix_opt.h -@@ -61,8 +61,8 @@ - #undef _POSIX_SYNC_IO /* File supports O_SYNC et al? */ +--- 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 +@@ -73,24 +73,38 @@ + /* XPG4.2 shared memory is supported. */ + #define _XOPEN_SHM 1 - -/* We do not have the POSIX threads interface. */ -#define _POSIX_THREADS -1 +/* Tell we have POSIX threads. */ @@ -18,7 +18,49 @@ /* We have the reentrant functions described in POSIX. */ #define _POSIX_REENTRANT_FUNCTIONS 1 -@@ -108,8 +108,8 @@ + #define _POSIX_THREAD_SAFE_FUNCTIONS 200809L + +-/* These are all things that won't be supported when _POSIX_THREADS is not. */ ++/* We do not provide priority scheduling for threads. */ + #define _POSIX_THREAD_PRIORITY_SCHEDULING -1 +-#define _POSIX_THREAD_ATTR_STACKSIZE -1 +-#define _POSIX_THREAD_ATTR_STACKADDR -1 ++ ++/* We support user-defined stack sizes. */ ++#define _POSIX_THREAD_ATTR_STACKSIZE 200112L ++ ++/* We support user-defined stacks. */ ++#define _POSIX_THREAD_ATTR_STACKADDR 200112L ++ ++/* We do not support priority inheritence. */ + #define _POSIX_THREAD_PRIO_INHERIT -1 ++ ++/* We do not support priority protection. */ + #define _POSIX_THREAD_PRIO_PROTECT -1 ++ + #ifdef __USE_XOPEN2K8 ++/* We do not support priority inheritence for robust mutexes. */ + # define _POSIX_THREAD_ROBUST_PRIO_INHERIT -1 ++ ++/* We do not support priority protection for robust mutexes. */ + # define _POSIX_THREAD_ROBUST_PRIO_PROTECT -1 + #endif +-#define _POSIX_SEMAPHORES -1 ++ ++/* We support POSIX.1b semaphores. */ ++#define _POSIX_SEMAPHORES 200112L + + /* Real-time signals are not yet supported. */ + #define _POSIX_REALTIME_SIGNALS -1 +@@ -123,17 +137,17 @@ + /* GNU libc provides regular expression handling. */ + #define _POSIX_REGEXP 1 + +-/* Reader/Writer locks are not available. */ +-#define _POSIX_READER_WRITER_LOCKS -1 ++/* Reader/Writer locks are available. */ ++#define _POSIX_READER_WRITER_LOCKS 200112L + /* We have a POSIX shell. */ #define _POSIX_SHELL 1 @@ -27,5 +69,19 @@ +/* We support the Timeouts option. */ +#define _POSIX_TIMEOUTS 200112L +-/* We do not support spinlocks. */ +-#define _POSIX_SPIN_LOCKS -1 ++/* We support spinlocks. */ ++#define _POSIX_SPIN_LOCKS 200112L + /* The `spawn' function family is supported. */ #define _POSIX_SPAWN 200809L +@@ -142,7 +156,7 @@ + #define _POSIX_TIMERS 0 + + /* The barrier functions are not available. */ +-#define _POSIX_BARRIERS -1 ++#define _POSIX_BARRIERS 200112L + + /* POSIX message queues could be available in future. */ + #define _POSIX_MESSAGE_PASSING 0 Modified: glibc-package/trunk/debian/patches/hurd-i386/local-tls-support.diff =================================================================== --- glibc-package/trunk/debian/patches/hurd-i386/local-tls-support.diff 2010-01-07 06:50:24 UTC (rev 4065) +++ glibc-package/trunk/debian/patches/hurd-i386/local-tls-support.diff 2010-01-07 10:21:50 UTC (rev 4066) @@ -10,16 +10,16 @@ sysdeps/mach/hurd/bits/libc-tsd.h | 35 ------------------ sysdeps/mach/hurd/fork.c | 7 +++ sysdeps/mach/hurd/i386/init-first.c | 60 +++++++++++++++++++------------- - sysdeps/mach/hurd/i386/tls.h | 43 ++++++++++++++++++++-- + sysdeps/mach/hurd/i386/tls.h | 53 ++++++++++++++++++++++------ sysdeps/mach/hurd/i386/tlsdesc.sym | 17 +++++++++ sysdeps/mach/hurd/i386/trampoline.c | 2 - sysdeps/mach/hurd/profil.c | 2 + sysdeps/mach/hurd/setitimer.c | 3 + - sysdeps/mach/hurd/tls.h | 1 + sysdeps/mach/hurd/tls.h | 2 + sysdeps/mach/i386/thread_state.h | 11 +++++ sysdeps/mach/powerpc/thread_state.h | 1 sysdeps/mach/thread_state.h | 3 + - 20 files changed, 161 insertions(+), 70 deletions(-) + 20 files changed, 167 insertions(+), 75 deletions(-) --- a/csu/libc-start.c +++ b/csu/libc-start.c @@ -307,23 +307,53 @@ properly before before cthreads initialization, so cthreads can know --- a/sysdeps/mach/hurd/i386/tls.h +++ b/sysdeps/mach/hurd/i386/tls.h -@@ -96,7 +96,7 @@ +@@ -31,6 +31,8 @@ + + # ifndef __ASSEMBLER__ + ++#include <pthread/pthread.h> ++ + /* Use i386-specific RPCs to arrange that %gs segment register prefix + addresses the TCB in each thread. */ + # include <mach/i386/mach_i386.h> +@@ -72,7 +72,7 @@ _hurd_tls_init (tcbhead_t *tcb, int secondcall) + + /* Get the first available selector. */ + int sel = -1; +- error_t err = __i386_set_gdt (tcb->self, &sel, desc); ++ kern_return_t err = __i386_set_gdt (tcb->self, &sel, desc); + if (err == MIG_BAD_ID) + { + /* Old kernel, use a per-thread LDT. */ +@@ -96,16 +96,16 @@ _hurd_tls_init (tcbhead_t *tcb, int secondcall) /* Fetch the selector set by the first call. */ int sel; asm ("mov %%gs, %w0" : "=q" (sel) : "0" (0)); - if (__builtin_expect (sel, 0x50) & 4) /* LDT selector */ + if (__builtin_expect (sel, 0x48) & 4) /* LDT selector */ { - error_t err = __i386_set_ldt (tcb->self, sel, &desc, 1); +- error_t err = __i386_set_ldt (tcb->self, sel, &desc, 1); ++ kern_return_t err = __i386_set_ldt (tcb->self, sel, &desc, 1); assert_perror (err); -@@ -142,9 +142,40 @@ + if (err) + return "i386_set_ldt failed"; + } + else + { +- error_t err = __i386_set_gdt (tcb->self, &sel, desc); ++ kern_return_t err = __i386_set_gdt (tcb->self, &sel, desc); + assert_perror (err); + if (err) + return "i386_set_gdt failed"; +@@ -142,9 +142,40 @@ _hurd_tls_init (tcbhead_t *tcb, int secondcall) #include <mach/machine/thread_status.h> -/* Set up TLS in the new thread of a fork child, copying from our own. */ +-static inline error_t __attribute__ ((unused)) +-_hurd_tls_fork (thread_t child, struct i386_thread_state *state) +/* Set up TLS in the new thread of a fork child, copying from the original. */ - static inline error_t __attribute__ ((unused)) --_hurd_tls_fork (thread_t child, struct i386_thread_state *state) ++static inline kern_return_t __attribute__ ((unused)) +_hurd_tls_fork (thread_t child, thread_t orig, struct i386_thread_state *state) +{ + /* Fetch the selector set by _hurd_tls_init. */ @@ -333,7 +363,7 @@ + return 0; + + struct descriptor desc, *_desc = &desc; -+ error_t err; ++ int err; + unsigned int count; + + if (__builtin_expect (sel, 0x48) & 4) /* LDT selector */ @@ -354,23 +384,24 @@ + return err; +} + -+static inline error_t __attribute__ ((unused)) ++static inline kern_return_t __attribute__ ((unused)) +_hurd_tls_new (thread_t child, struct i386_thread_state *state, tcbhead_t *tcb) { /* Fetch the selector set by _hurd_tls_init. */ int sel; -@@ -152,11 +183,13 @@ +@@ -152,11 +183,13 @@ _hurd_tls_fork (thread_t child, struct i386_thread_state *state) if (sel == state->ds) /* _hurd_tls_init was never called. */ return 0; - tcbhead_t *const tcb = THREAD_SELF; HURD_TLS_DESC_DECL (desc, tcb); - error_t err; +- error_t err; ++ kern_return_t err; ++ ++ tcb->tcb = tcb; ++ tcb->self = child; - if (__builtin_expect (sel, 0x50) & 4) /* LDT selector */ -+ tcb->tcb = tcb; -+ tcb->self = child; -+ + if (__builtin_expect (sel, 0x48) & 4) /* LDT selector */ err = __i386_set_ldt (child, sel, &desc, 1); else Deleted: glibc-package/trunk/debian/patches/hurd-i386/submitted-getcwd.diff =================================================================== --- glibc-package/trunk/debian/patches/hurd-i386/submitted-getcwd.diff 2010-01-07 06:50:24 UTC (rev 4065) +++ glibc-package/trunk/debian/patches/hurd-i386/submitted-getcwd.diff 2010-01-07 10:21:50 UTC (rev 4066) @@ -1,19 +0,0 @@ -The patch below fixes a spurious call to mach_port_deallocate: rootdevid -is already deallocated as soon as it is fetched through __io_identity. - ---- - getcwd.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/sysdeps/mach/hurd/getcwd.c b/sysdeps/mach/hurd/getcwd.c -index 7e07e6b..f833f3d 100644 ---- a/sysdeps/mach/hurd/getcwd.c -+++ b/sysdeps/mach/hurd/getcwd.c -@@ -60,7 +60,6 @@ _hurd_canonicalize_directory_name_internal (file_t thisdir, - __mach_port_deallocate (__mach_task_self (), thisid); - __mach_port_deallocate (__mach_task_self (), thisdevid); - __mach_port_deallocate (__mach_task_self (), rootid); -- __mach_port_deallocate (__mach_task_self (), rootdevid); - - if (dirbuf != NULL) - __vm_deallocate (__mach_task_self (), Added: glibc-package/trunk/debian/patches/hurd-i386/submitted-posix_opt.h.diff =================================================================== --- glibc-package/trunk/debian/patches/hurd-i386/submitted-posix_opt.h.diff (rev 0) +++ glibc-package/trunk/debian/patches/hurd-i386/submitted-posix_opt.h.diff 2010-01-07 10:21:50 UTC (rev 4066) @@ -0,0 +1,119 @@ +2010-01-05 Samuel Thibault <samuel.thiba...@ens-lyon.org> + + * sysdeps/mach/hurd/bits/posix_opt.h + (_POSIX_PRIORITY_SCHEDULING): Define macro to -1. + (_POSIX_CHOWN_RESTRICTED): Define macro to 0. + (_POSIX_NO_TRUNC): Define macro to 0. + (_POSIX_SYNCHRONIZED_IO): Define macro to 0. + (_XOPEN_REALTIME): Define macro to -1. + (_XOPEN_REALTIME_THREADS): Define macro to -1. + (_XOPEN_SHM): Undefine macro. + [__USE_XOPEN2K8] (_POSIX_THREAD_ROBUST_PRIO_INHERIT): Define + macro to -1. + [__USE_XOPEN2K8] (_POSIX_THREAD_ROBUST_PRIO_PROTECT): Define + macro to -1. + (_POSIX_ASYNC_IO): Define macro to 1. + (_POSIX_PRIORITIZED_IO): Define macro to -1. + (_POSIX_SPIN_LOCKS): Define macro to -1. + +--- + bits/posix_opt.h | 36 ++++++++++++++++++++++++++---------- + spawni.c | 2 +- + 2 files changed, 27 insertions(+), 11 deletions(-) + +diff --git a/sysdeps/mach/hurd/bits/posix_opt.h b/sysdeps/mach/hurd/bits/posix_opt.h +index 775c921..03ce39e 100644 +--- a/sysdeps/mach/hurd/bits/posix_opt.h ++++ b/sysdeps/mach/hurd/bits/posix_opt.h +@@ -31,8 +31,9 @@ + /* Processes have a saved set-user-ID and a saved set-group-ID. */ + #define _POSIX_SAVED_IDS 1 + +-/* Synchronizing file data is supported, but msync is missing. */ +-#undef _POSIX_SYNCHRONIZED_IO ++/* Priority scheduling is not supported. */ ++#define _POSIX_PRIORITY_SCHEDULING -1 ++ + + /* The fsync function is present. */ + #define _POSIX_FSYNC 200809L +@@ -56,10 +57,18 @@ + + /* Different Hurd filesystems might do these differently. + You must query the particular file with `pathconf' or `fpathconf'. */ +-#undef _POSIX_CHOWN_RESTRICTED /* Only root can change owner of file? */ +-#undef _POSIX_NO_TRUNC /* Overlong file names get error? */ +-#undef _POSIX_SYNC_IO /* File supports O_SYNC et al? */ ++#define _POSIX_CHOWN_RESTRICTED 0 /* Only root can change owner of file? */ ++#define _POSIX_NO_TRUNC 0 /* Overlong file names get error? */ ++#define _POSIX_SYNCHRONIZED_IO 0 /* File supports O_SYNC et al? */ ++ ++/* X/Open realtime support is not available. */ ++#define _XOPEN_REALTIME -1 ++ ++/* X/Open thread realtime support is available. */ ++#define _XOPEN_REALTIME_THREADS -1 + ++/* XPG4.2 shared memory is not supported. */ ++#undef _XOPEN_SHM + + /* We do not have the POSIX threads interface. */ + #define _POSIX_THREADS -1 +@@ -72,6 +81,12 @@ + #define _POSIX_THREAD_PRIORITY_SCHEDULING -1 + #define _POSIX_THREAD_ATTR_STACKSIZE -1 + #define _POSIX_THREAD_ATTR_STACKADDR -1 ++#define _POSIX_THREAD_PRIO_INHERIT -1 ++#define _POSIX_THREAD_PRIO_PROTECT -1 ++#ifdef __USE_XOPEN2K8 ++# define _POSIX_THREAD_ROBUST_PRIO_INHERIT -1 ++# define _POSIX_THREAD_ROBUST_PRIO_PROTECT -1 ++#endif + #define _POSIX_SEMAPHORES -1 + + /* Real-time signals are not yet supported. */ +@@ -79,8 +94,11 @@ + + /* Asynchronous I/O might supported with the existing ABI. */ + #define _POSIX_ASYNCHRONOUS_IO 0 ++#define _POSIX_ASYNC_IO 1 + /* Alternative name for Unix98. */ + #define _LFS_ASYNCHRONOUS_IO _POSIX_ASYNCHRONOUS_IO ++/* Support for prioritization is not available. */ ++#define _POSIX_PRIORITIZED_IO -1 + + /* The LFS support in asynchronous I/O is also available. */ + #define _LFS64_ASYNCHRONOUS_IO _POSIX_ASYNCHRONOUS_IO +@@ -111,6 +129,9 @@ + /* We cannot support the Timeouts option without _POSIX_THREADS. */ + #define _POSIX_TIMEOUTS -1 + ++/* We do not support spinlocks. */ ++#define _POSIX_SPIN_LOCKS -1 ++ + /* The `spawn' function family is supported. */ + #define _POSIX_SPAWN 200809L + +@@ -157,9 +178,4 @@ + /* Typed memory objects are not available. */ + #define _POSIX_TYPED_MEMORY_OBJECTS -1 + +-/* No support for priority inheritance or protection so far. */ +-#define _POSIX_THREAD_PRIO_INHERIT -1 +-#define _POSIX_THREAD_PRIO_PROTECT -1 +- +- + #endif /* bits/posix_opt.h */ +diff --git a/sysdeps/mach/hurd/spawni.c b/sysdeps/mach/hurd/spawni.c +index 244ca2d..150b2cf 100644 +--- a/sysdeps/mach/hurd/spawni.c ++++ b/sysdeps/mach/hurd/spawni.c +@@ -264,7 +264,7 @@ __spawni (pid_t *pid, const char *file, + if ((flags & POSIX_SPAWN_SETSIGMASK) != 0) + ints[INIT_SIGMASK] = attrp->__ss; + +-#ifdef _POSIX_PRIORITY_SCHEDULING ++#if _POSIX_PRIORITY_SCHEDULING > 0 + /* Set the scheduling algorithm and parameters. */ + # error implement me + if ((flags & (POSIX_SPAWN_SETSCHEDPARAM | POSIX_SPAWN_SETSCHEDULER)) Deleted: glibc-package/trunk/debian/patches/hurd-i386/submitted-setsid.diff =================================================================== --- glibc-package/trunk/debian/patches/hurd-i386/submitted-setsid.diff 2010-01-07 06:50:24 UTC (rev 4065) +++ glibc-package/trunk/debian/patches/hurd-i386/submitted-setsid.diff 2010-01-07 10:21:50 UTC (rev 4066) @@ -1,17 +0,0 @@ -Fix bogus port deallocation due to uninitialized variable - ---- - hurdioctl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- eglibc-2.10.2-orig/hurd/hurdioctl.c 2006-08-17 02:18:26.000000000 +0100 -+++ eglibc-2.10.2/hurd/hurdioctl.c 2009-12-22 03:13:05.000000000 +0000 -@@ -169,7 +169,7 @@ - for (i = 0; i < _hurd_dtablesize; ++i) - { - struct hurd_fd *const d = _hurd_dtable[i]; -- mach_port_t newctty; -+ mach_port_t newctty = MACH_PORT_NULL; - - if (d == NULL) - /* Nothing to do for an unused descriptor cell. */ Modified: glibc-package/trunk/debian/patches/hurd-i386/submitted-sysvshm.diff =================================================================== --- glibc-package/trunk/debian/patches/hurd-i386/submitted-sysvshm.diff 2010-01-07 06:50:24 UTC (rev 4065) +++ glibc-package/trunk/debian/patches/hurd-i386/submitted-sysvshm.diff 2010-01-07 10:21:50 UTC (rev 4066) @@ -17,17 +17,19 @@ * sysdeps/mach/hurd/shmat.c: New file. * sysdeps/mach/hurd/shmctl.c: New file. * sysdeps/mach/hurd/shmdt.c: New file. + * sysdeps/mach/hurd/bits/posix_opt.h: Define _XOPEN_SHM to 1. --- - hurd/Makefile | 3 - hurd/sysvshm.c | 96 +++++++++++++++++ - hurd/sysvshm.h | 47 ++++++++ - sysdeps/mach/hurd/ftok.c | 43 +++++++ - sysdeps/mach/hurd/shmat.c | 78 ++++++++++++++ - sysdeps/mach/hurd/shmctl.c | 132 ++++++++++++++++++++++++ - sysdeps/mach/hurd/shmdt.c | 51 +++++++++ - sysdeps/mach/hurd/shmget.c | 245 +++++++++++++++++++++++++++++++++++++++++++++ - 8 files changed, 694 insertions(+), 1 deletion(-) + b/hurd/sysvshm.c | 96 ++++++++++++++ + b/hurd/sysvshm.h | 47 +++++++ + b/sysdeps/mach/hurd/ftok.c | 43 ++++++ + b/sysdeps/mach/hurd/shmat.c | 78 +++++++++++ + b/sysdeps/mach/hurd/shmctl.c | 132 +++++++++++++++++++ + b/sysdeps/mach/hurd/shmdt.c | 51 +++++++ + b/sysdeps/mach/hurd/shmget.c | 245 +++++++++++++++++++++++++++++++++++++ + hurd/Makefile | 3 + sysdeps/mach/hurd/bits/posix_opt.h | 3 + 9 files changed, 697 insertions(+), 1 deletion(-) --- a/hurd/Makefile +++ b/hurd/Makefile @@ -761,3 +763,15 @@ +} + +weak_alias(__shmget, shmget) +--- a/sysdeps/mach/hurd/bits/posix_opt.h 2010-01-05 22:13:57.000000000 +0100 ++++ b/sysdeps/mach/hurd/bits/posix_opt.h 2010-01-05 22:14:42.000000000 +0100 +@@ -61,6 +61,9 @@ + #undef _POSIX_SYNC_IO /* File supports O_SYNC et al? */ + + ++/* XPG4.2 shared memory is supported. */ ++#define _XOPEN_SHM 1 ++ + /* We do not have the POSIX threads interface. */ + #define _POSIX_THREADS -1 + Modified: glibc-package/trunk/debian/patches/series =================================================================== --- glibc-package/trunk/debian/patches/series 2010-01-07 06:50:24 UTC (rev 4065) +++ glibc-package/trunk/debian/patches/series 2010-01-07 10:21:50 UTC (rev 4066) @@ -83,6 +83,7 @@ hurd-i386/local-tls.diff hurd-i386/local-tls-support.diff hurd-i386/local-gcc-4.1-init-first.diff +hurd-i386/submitted-posix_opt.h.diff hurd-i386/submitted-ioctl-decode-argument.diff hurd-i386/submitted-libc_once.diff hurd-i386/submitted-ptr-mangle.diff @@ -110,8 +111,8 @@ hurd-i386/submitted-SOL_IP.patch hurd-i386/local-bigmem.diff hurd-i386/local-disable-ioctls.diff -hurd-i386/submitted-getcwd.diff -hurd-i386/submitted-setsid.diff +hurd-i386/cvs-getcwd.diff +hurd-i386/cvs-setsid.diff ia64/submitted-sysconf.diff ia64/submitted-libm.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-07 06:50:24 UTC (rev 4065) +++ glibc-package/trunk/debian/testsuite-checking/expected-results-i486-gnu-libc 2010-01-07 10:21:50 UTC (rev 4066) @@ -3,6 +3,18 @@ # failure number, indicating the signal the process died with. # Format: <Failed test>, Error <Make error code> [(ignored)] # +# Need actual porting +tst-cpuset.o, Error 1 +tst-cputimer1.o, Error 1 +tst-cputimer2.o, Error 1 +tst-cputimer3.o, Error 1 +tst-mqueue5.o, Error 1 +tst-pselect.o, Error 1 +tst-timer2.o, Error 1 +tst-timer4.o, Error 1 +tst-timer5.o, Error 1 +# +# Need investigation annexc.out, Error 1 (ignored) bug-glob2.out, Error 1 bug-ulimit1.out, Error 1 @@ -10,8 +22,6 @@ check-localplt.out, Error 1 mtrace-tst-loading, Error 1 opendir-tst1.out, Error 1 -scanf15.o, Error 1 -scanf17.o, Error 1 test-assert-perr.out, Error 1 test-assert.out, Error 1 test-fenv.out, Error 1 @@ -19,8 +29,8 @@ test-lfs.out, Error 1 test-memmem, Error 1 tst-aio10, Error 1 -tst-aio2.o, Error 1 -tst-aio3.o, Error 1 +tst-aio2, Error 1 +tst-aio3, Error 1 tst-aio8.out, Error 1 tst-aio9, Error 1 tst-atime.out, Error 1 @@ -34,14 +44,9 @@ tst-chk6.out, Error 1 tst-cpuclock2, Error 1 tst-cpucount, Error 1 -tst-cpuset.o, Error 1 -tst-cputimer1.o, Error 1 -tst-cputimer2.o, Error 1 -tst-cputimer3.o, Error 1 tst-dlmopen1.out, Error 1 tst-error1-mem, Error 1 tst-ether_line.o, Error 1 -tst-fdopendir.out, Error 1 tst-fdopendir2.out, Error 1 tst-fopenloc.check, Error 1 tst-futimesat.out, Error 1 @@ -55,21 +60,16 @@ tst-lfschk6.out, Error 1 tst-mknodat.out, Error 1 tst-mqueue3, Error 1 -tst-mqueue5.o, Error 1 tst-mqueue6, Error 1 tst-mqueue8, Error 1 -tst-pselect.o, 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.o, Error 1 +tst-sysconf.out, Error 1 tst-thrlock, Error 1 tst-timer.out, Error 1 -tst-timer2.o, Error 1 tst-timer3, Error 1 -tst-timer4.o, Error 1 -tst-timer5.o, Error 1 tst-tls18.out, Error 1 tst-tls9-static.out, Error 1 tst-ttyname_r.out, Error 2 -- To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org