Author: sthibault Date: 2010-01-10 21:58:20 +0000 (Sun, 10 Jan 2010) New Revision: 4075
Modified: glibc-package/trunk/debian/changelog glibc-package/trunk/debian/patches/hurd-i386/submitted-posix_opt.h.diff Log: * patches/hurd-i386/submitted-posix_opt.h.diff: Update. Modified: glibc-package/trunk/debian/changelog =================================================================== --- glibc-package/trunk/debian/changelog 2010-01-08 17:03:38 UTC (rev 4074) +++ glibc-package/trunk/debian/changelog 2010-01-10 21:58:20 UTC (rev 4075) @@ -9,6 +9,7 @@ * 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. + * patches/hurd-i386/submitted-posix_opt.h.diff: Update. -- Aurelien Jarno <aure...@debian.org> Fri, 08 Jan 2010 14:36:13 +0100 Modified: glibc-package/trunk/debian/patches/hurd-i386/submitted-posix_opt.h.diff =================================================================== --- glibc-package/trunk/debian/patches/hurd-i386/submitted-posix_opt.h.diff 2010-01-08 17:03:38 UTC (rev 4074) +++ glibc-package/trunk/debian/patches/hurd-i386/submitted-posix_opt.h.diff 2010-01-10 21:58:20 UTC (rev 4075) @@ -1,65 +1,83 @@ -2010-01-05 Samuel Thibault <samuel.thiba...@ens-lyon.org> +2010-01-10 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. + * posix/tst-sysconf.c (posix_options): Only use + _POSIX_PRIORITIZED_IO, _POSIX_PRIORITY_SCHEDULING, and + _POSIX_SYNCHRONIZED_IO when they are defined + * sysdeps/mach/hurd/bits/posix_opt.h: + (_POSIX_PRIORITY_SCHEDULING): Undefine macro. + (_XOPEN_REALTIME): Undefine macro. + (_XOPEN_REALTIME_THREADS): Undefine macro. (_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_ASYNC_IO): Undefine macro. + (_POSIX_PRIORITIZED_IO): Undefine macro. (_POSIX_SPIN_LOCKS): Define macro to -1. --- - bits/posix_opt.h | 36 ++++++++++++++++++++++++++---------- - spawni.c | 2 +- - 2 files changed, 27 insertions(+), 11 deletions(-) + posix/tst-sysconf.c | 6 ++++++ + sysdeps/mach/hurd/bits/posix_opt.h | 28 +++++++++++++++++++++++----- + 2 files changed, 29 insertions(+), 5 deletions(-) +diff --git a/posix/tst-sysconf.c b/posix/tst-sysconf.c +index e297229..105c7c2 100644 +--- a/posix/tst-sysconf.c ++++ b/posix/tst-sysconf.c +@@ -29,8 +29,12 @@ static struct + N (MEMORY_PROTECTION), + N (MESSAGE_PASSING), + N (MONOTONIC_CLOCK), ++#ifdef _POSIX_PRIORITIZED_IO + N (PRIORITIZED_IO), ++#endif ++#ifdef _POSIX_PRIORITY_SCHEDULING + N (PRIORITY_SCHEDULING), ++#endif + N (RAW_SOCKETS), + N (READER_WRITER_LOCKS), + N (REALTIME_SIGNALS), +@@ -42,7 +46,9 @@ static struct + N (SPAWN), + N (SPIN_LOCKS), + N (SPORADIC_SERVER), ++#ifdef _POSIX_SYNCHRONIZED_IO + N (SYNCHRONIZED_IO), ++#endif + N (THREAD_ATTR_STACKADDR), + N (THREAD_ATTR_STACKSIZE), + N (THREAD_CPUTIME), diff --git a/sysdeps/mach/hurd/bits/posix_opt.h b/sysdeps/mach/hurd/bits/posix_opt.h -index 775c921..03ce39e 100644 +index 775c921..4c1b06b 100644 --- a/sysdeps/mach/hurd/bits/posix_opt.h +++ b/sysdeps/mach/hurd/bits/posix_opt.h -@@ -31,8 +31,9 @@ +@@ -31,6 +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 ++#undef _POSIX_PRIORITY_SCHEDULING + + /* Synchronizing file data is supported, but msync is missing. */ + #undef _POSIX_SYNCHRONIZED_IO - /* The fsync function is present. */ - #define _POSIX_FSYNC 200809L -@@ -56,10 +57,18 @@ +@@ -60,6 +63,14 @@ + #undef _POSIX_NO_TRUNC /* Overlong file names get error? */ + #undef _POSIX_SYNC_IO /* File supports O_SYNC et al? */ - /* 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 supported. */ ++#undef _XOPEN_REALTIME + -+/* X/Open realtime support is not available. */ -+#define _XOPEN_REALTIME -1 ++/* X/Open thread realtime support is not supported. */ ++#undef _XOPEN_REALTIME_THREADS + -+/* 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 @@ +@@ -72,6 +83,12 @@ #define _POSIX_THREAD_PRIORITY_SCHEDULING -1 #define _POSIX_THREAD_ATTR_STACKSIZE -1 #define _POSIX_THREAD_ATTR_STACKADDR -1 @@ -72,19 +90,19 @@ #define _POSIX_SEMAPHORES -1 /* Real-time signals are not yet supported. */ -@@ -79,8 +94,11 @@ +@@ -79,8 +96,11 @@ /* Asynchronous I/O might supported with the existing ABI. */ #define _POSIX_ASYNCHRONOUS_IO 0 -+#define _POSIX_ASYNC_IO 1 ++#undef _POSIX_ASYNC_IO /* Alternative name for Unix98. */ #define _LFS_ASYNCHRONOUS_IO _POSIX_ASYNCHRONOUS_IO +/* Support for prioritization is not available. */ -+#define _POSIX_PRIORITIZED_IO -1 ++#undef _POSIX_PRIORITIZED_IO /* The LFS support in asynchronous I/O is also available. */ #define _LFS64_ASYNCHRONOUS_IO _POSIX_ASYNCHRONOUS_IO -@@ -111,6 +129,9 @@ +@@ -111,6 +131,9 @@ /* We cannot support the Timeouts option without _POSIX_THREADS. */ #define _POSIX_TIMEOUTS -1 @@ -94,7 +112,7 @@ /* The `spawn' function family is supported. */ #define _POSIX_SPAWN 200809L -@@ -157,9 +178,4 @@ +@@ -157,9 +180,4 @@ /* Typed memory objects are not available. */ #define _POSIX_TYPED_MEMORY_OBJECTS -1 @@ -104,16 +122,3 @@ - - #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)) -- To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org