r3882 - in glibc-package/trunk/debian: . patches patches/kfreebsd
Author: ps-guest
Date: 2009-10-19 14:32:29 +0000 (Mon, 19 Oct 2009)
New Revision: 3882
Removed:
glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps-2.10.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
glibc-package/trunk/debian/patches/series.kfreebsd-amd64
glibc-package/trunk/debian/patches/series.kfreebsd-i386
Log:
* kfreebsd/local-sysdeps.diff: update to revision 2806 (from glibc-bsd).
* Drop kfreebsd/local-sysdeps-2.10.diff (merged in local-sysdeps.diff).
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2009-10-18 20:34:50 UTC (rev 3881)
+++ glibc-package/trunk/debian/changelog 2009-10-19 14:32:29 UTC (rev 3882)
@@ -1,3 +1,11 @@
+eglibc (2.10.1-2) UNSTABLE; urgency=low
+
+ [ Petr Salinger ]
+ * kfreebsd/local-sysdeps.diff: update to revision 2806 (from glibc-bsd).
+ * Drop kfreebsd/local-sysdeps-2.10.diff (merged in local-sysdeps.diff).
+
+ -- Aurelien Jarno <aurel32@debian.org> Sun, 18 Oct 2009 18:35:20 +0200
+
eglibc (2.10.1-1) unstable; urgency=low
[ Aurelien Jarno ]
Deleted: glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps-2.10.diff
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps-2.10.diff 2009-10-18 20:34:50 UTC (rev 3881)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps-2.10.diff 2009-10-19 14:32:29 UTC (rev 3882)
@@ -1,421 +0,0 @@
-To be applied for glibc 2.10
-
---- a/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/dl-osinfo.h
-+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/dl-osinfo.h
-@@ -62,7 +62,7 @@
- } while (0)
-
- static inline uintptr_t __attribute__ ((always_inline))
--_dl_setup_stack_chk_guard (void)
-+_dl_setup_stack_chk_guard (void *dl_random)
- {
- uintptr_t ret;
- #ifdef ENABLE_STACKGUARD_RANDOMIZE
-@@ -81,3 +81,18 @@
- p[sizeof (ret) - 2] = '\n';
- return ret;
- }
-+
-+static inline uintptr_t __attribute__ ((always_inline))
-+_dl_setup_pointer_guard (void *dl_random, uintptr_t stack_chk_guard)
-+{
-+ uintptr_t ret;
-+
-+ ret = stack_chk_guard;
-+# ifndef HP_TIMING_NONAVAIL
-+ hp_timing_t now;
-+ HP_TIMING_NOW (now);
-+ ret ^= now;
-+# endif
-+ return ret;
-+}
-+
---- a/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/linuxthreads/bits/posix_opt.h
---- b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/linuxthreads/bits/posix_opt.h
-@@ -31,25 +31,25 @@
- #define _POSIX_SAVED_IDS 1
-
- /* Priority scheduling is supported. */
--#define _POSIX_PRIORITY_SCHEDULING 200112L
-+#define _POSIX_PRIORITY_SCHEDULING 200809L
-
- /* Synchronizing file data is supported. */
--#define _POSIX_SYNCHRONIZED_IO 200112L
-+#define _POSIX_SYNCHRONIZED_IO 200809L
-
- /* The fsync function is present. */
--#define _POSIX_FSYNC 200112L
-+#define _POSIX_FSYNC 200809L
-
- /* Mapping of files to memory is supported. */
--#define _POSIX_MAPPED_FILES 200112L
-+#define _POSIX_MAPPED_FILES 200809L
-
- /* Locking of all memory is supported. */
--#define _POSIX_MEMLOCK 200112L
-+#define _POSIX_MEMLOCK 200809L
-
- /* Locking of ranges of memory is supported. */
--#define _POSIX_MEMLOCK_RANGE 200112L
-+#define _POSIX_MEMLOCK_RANGE 200809L
-
- /* Setting of memory protections is supported. */
--#define _POSIX_MEMORY_PROTECTION 200112L
-+#define _POSIX_MEMORY_PROTECTION 200809L
-
- /* Only root can change owner of file. */
- #define _POSIX_CHOWN_RESTRICTED 1
-@@ -76,29 +76,29 @@
- #define _XOPEN_SHM 1
-
- /* Tell we have POSIX threads. */
--#define _POSIX_THREADS 200112L
-+#define _POSIX_THREADS 200809L
-
- /* We have the reentrant functions described in POSIX. */
- #define _POSIX_REENTRANT_FUNCTIONS 1
--#define _POSIX_THREAD_SAFE_FUNCTIONS 200112L
-+#define _POSIX_THREAD_SAFE_FUNCTIONS 200809L
-
- /* We provide priority scheduling for threads. */
--#define _POSIX_THREAD_PRIORITY_SCHEDULING 200112L
-+#define _POSIX_THREAD_PRIORITY_SCHEDULING 200809L
-
- /* We support user-defined stack sizes. */
--#define _POSIX_THREAD_ATTR_STACKSIZE 200112L
-+#define _POSIX_THREAD_ATTR_STACKSIZE 200809L
-
- /* We support user-defined stacks. */
--#define _POSIX_THREAD_ATTR_STACKADDR 200112L
-+#define _POSIX_THREAD_ATTR_STACKADDR 200809L
-
- /* We support POSIX.1b semaphores, but only the non-shared form for now. */
--#define _POSIX_SEMAPHORES 200112L
-+#define _POSIX_SEMAPHORES 200809L
-
- /* Real-time signals are not available. */
- #define _POSIX_REALTIME_SIGNALS -1
-
- /* We support asynchronous I/O. */
--#define _POSIX_ASYNCHRONOUS_IO 200112L
-+#define _POSIX_ASYNCHRONOUS_IO 200809L
- #define _POSIX_ASYNC_IO 1
- /* Alternative name for Unix98. */
- #define _LFS_ASYNCHRONOUS_IO 1
-@@ -114,7 +114,7 @@
- #define _LFS64_STDIO 1
-
- /* POSIX shared memory objects are implemented. */
--#define _POSIX_SHARED_MEMORY_OBJECTS 200112L
-+#define _POSIX_SHARED_MEMORY_OBJECTS 200809L
-
- /* CPU-time clocks somewhere supported. */
- #define _POSIX_CPUTIME 0
-@@ -126,25 +126,25 @@
- #define _POSIX_REGEXP 1
-
- /* Reader/Writer locks are available. */
--#define _POSIX_READER_WRITER_LOCKS 200112L
-+#define _POSIX_READER_WRITER_LOCKS 200809L
-
- /* We have a POSIX shell. */
- #define _POSIX_SHELL 1
-
- /* We support the Timeouts option. */
--#define _POSIX_TIMEOUTS 200112L
-+#define _POSIX_TIMEOUTS 200809L
-
- /* We support spinlocks. */
--#define _POSIX_SPIN_LOCKS 200112L
-+#define _POSIX_SPIN_LOCKS 200809L
-
- /* The `spawn' function family is supported. */
--#define _POSIX_SPAWN 200112L
-+#define _POSIX_SPAWN 200809L
-
- /* We have POSIX timers. */
--#define _POSIX_TIMERS 200112L
-+#define _POSIX_TIMERS 200809L
-
- /* The barrier functions are available. */
--#define _POSIX_BARRIERS 200112L
-+#define _POSIX_BARRIERS 200809L
-
- /* POSIX message queues are not available. */
- #define _POSIX_MESSAGE_PASSING -1
-@@ -153,7 +153,7 @@
- #define _POSIX_THREAD_PROCESS_SHARED -1
-
- /* The monotonic clock is available. */
--#define _POSIX_MONOTONIC_CLOCK 200112L
-+#define _POSIX_MONOTONIC_CLOCK 200809L
-
- /* The clock selection interfaces are not available. */
- #define _POSIX_CLOCK_SELECTION -1
-@@ -162,13 +162,13 @@
- #define _POSIX_ADVISORY_INFO -1
-
- /* IPv6 support is available. */
--#define _POSIX_IPV6 200112L
-+#define _POSIX_IPV6 200809L
-
- /* Raw socket support is available. */
--#define _POSIX_RAW_SOCKETS 200112L
-+#define _POSIX_RAW_SOCKETS 200809L
-
- /* We have at least one terminal. */
--#define _POSIX2_CHAR_TERM 200112L
-+#define _POSIX2_CHAR_TERM 200809L
-
- /* Neither process nor thread sporadic server interfaces is available. */
- #define _POSIX_SPORADIC_SERVER -1
---- a/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/nptl/bits/posix_opt.h
---- b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/nptl/bits/posix_opt.h
-@@ -31,25 +31,25 @@
- #define _POSIX_SAVED_IDS 1
-
- /* Priority scheduling is supported. */
--#define _POSIX_PRIORITY_SCHEDULING 200112L
-+#define _POSIX_PRIORITY_SCHEDULING 200809L
-
- /* Synchronizing file data is supported. */
--#define _POSIX_SYNCHRONIZED_IO 200112L
-+#define _POSIX_SYNCHRONIZED_IO 200809L
-
- /* The fsync function is present. */
--#define _POSIX_FSYNC 200112L
-+#define _POSIX_FSYNC 200809L
-
- /* Mapping of files to memory is supported. */
--#define _POSIX_MAPPED_FILES 200112L
-+#define _POSIX_MAPPED_FILES 200809L
-
- /* Locking of all memory is supported. */
--#define _POSIX_MEMLOCK 200112L
-+#define _POSIX_MEMLOCK 200809L
-
- /* Locking of ranges of memory is supported. */
--#define _POSIX_MEMLOCK_RANGE 200112L
-+#define _POSIX_MEMLOCK_RANGE 200809L
-
- /* Setting of memory protections is supported. */
--#define _POSIX_MEMORY_PROTECTION 200112L
-+#define _POSIX_MEMORY_PROTECTION 200809L
-
- /* Only root can change owner of file. */
- #define _POSIX_CHOWN_RESTRICTED 1
-@@ -76,29 +76,29 @@
- #define _XOPEN_SHM 1
-
- /* Tell we have POSIX threads. */
--#define _POSIX_THREADS 200112L
-+#define _POSIX_THREADS 200809L
-
- /* We have the reentrant functions described in POSIX. */
- #define _POSIX_REENTRANT_FUNCTIONS 1
--#define _POSIX_THREAD_SAFE_FUNCTIONS 200112L
-+#define _POSIX_THREAD_SAFE_FUNCTIONS 200809L
-
- /* We provide priority scheduling for threads. */
--#define _POSIX_THREAD_PRIORITY_SCHEDULING 200112L
-+#define _POSIX_THREAD_PRIORITY_SCHEDULING 200809L
-
- /* We support user-defined stack sizes. */
--#define _POSIX_THREAD_ATTR_STACKSIZE 200112L
-+#define _POSIX_THREAD_ATTR_STACKSIZE 200809L
-
- /* We support user-defined stacks. */
--#define _POSIX_THREAD_ATTR_STACKADDR 200112L
-+#define _POSIX_THREAD_ATTR_STACKADDR 200809L
-
- /* We support POSIX.1b semaphores, but only the non-shared form for now. */
--#define _POSIX_SEMAPHORES 200112L
-+#define _POSIX_SEMAPHORES 200809L
-
- /* Real-time signals are not available. */
- #define _POSIX_REALTIME_SIGNALS -1
-
- /* We support asynchronous I/O. */
--#define _POSIX_ASYNCHRONOUS_IO 200112L
-+#define _POSIX_ASYNCHRONOUS_IO 200809L
- #define _POSIX_ASYNC_IO 1
- /* Alternative name for Unix98. */
- #define _LFS_ASYNCHRONOUS_IO 1
-@@ -114,7 +114,7 @@
- #define _LFS64_STDIO 1
-
- /* POSIX shared memory objects are implemented. */
--#define _POSIX_SHARED_MEMORY_OBJECTS 200112L
-+#define _POSIX_SHARED_MEMORY_OBJECTS 200809L
-
- /* CPU-time clocks somewhere supported. */
- #define _POSIX_CPUTIME 0
-@@ -126,25 +126,25 @@
- #define _POSIX_REGEXP 1
-
- /* Reader/Writer locks are available. */
--#define _POSIX_READER_WRITER_LOCKS 200112L
-+#define _POSIX_READER_WRITER_LOCKS 200809L
-
- /* We have a POSIX shell. */
- #define _POSIX_SHELL 1
-
- /* We support the Timeouts option. */
--#define _POSIX_TIMEOUTS 200112L
-+#define _POSIX_TIMEOUTS 200809L
-
- /* We support spinlocks. */
--#define _POSIX_SPIN_LOCKS 200112L
-+#define _POSIX_SPIN_LOCKS 200809L
-
- /* The `spawn' function family is supported. */
--#define _POSIX_SPAWN 200112L
-+#define _POSIX_SPAWN 200809L
-
- /* We have POSIX timers. */
--#define _POSIX_TIMERS 200112L
-+#define _POSIX_TIMERS 200809L
-
- /* The barrier functions are available. */
--#define _POSIX_BARRIERS 200112L
-+#define _POSIX_BARRIERS 200809L
-
- /* POSIX message queues are not available. */
- #define _POSIX_MESSAGE_PASSING -1
-@@ -153,7 +153,7 @@
- #define _POSIX_THREAD_PROCESS_SHARED -1
-
- /* The monotonic clock is available. */
--#define _POSIX_MONOTONIC_CLOCK 200112L
-+#define _POSIX_MONOTONIC_CLOCK 200809L
-
- /* The clock selection interfaces are not available. */
- #define _POSIX_CLOCK_SELECTION -1
-@@ -162,13 +162,13 @@
- #define _POSIX_ADVISORY_INFO -1
-
- /* IPv6 support is available. */
--#define _POSIX_IPV6 200112L
-+#define _POSIX_IPV6 200809L
-
- /* Raw socket support is available. */
--#define _POSIX_RAW_SOCKETS 200112L
-+#define _POSIX_RAW_SOCKETS 200809L
-
- /* We have at least one terminal. */
--#define _POSIX2_CHAR_TERM 200112L
-+#define _POSIX2_CHAR_TERM 200809L
-
- /* Neither process nor thread sporadic server interfaces is available. */
- #define _POSIX_SPORADIC_SERVER -1
---- a/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/sysconf.c
-+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/sysconf.c
-@@ -36,7 +36,7 @@
- #if HP_TIMING_AVAIL
- // XXX We can add here test for machines which cannot support a
- // XXX usable TSC.
-- return 200112L;
-+ return 200809L;
- #else
- return -1;
- #endif
---- a/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/x86_64/Makefile
-+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/x86_64/Makefile
-@@ -13,5 +13,5 @@
-
- ifeq ($(subdir),misc)
- # For <sys/io.h> and <sys/perm.h>.
--sysdep_routines += iopl
-+sysdep_routines += iopl ioperm
- endif
---- a/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/x86_64/Versions
-+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/x86_64/Versions
-@@ -2,4 +2,7 @@
- GLIBC_2.3.4 {
- iopl;
- }
-+ GLIBC_2.10 {
-+ ioperm;
-+ }
- }
---- a/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/x86_64/ioperm.c
-+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/x86_64/ioperm.c
-@@ -0,0 +1,32 @@
-+/* Copyright (C) 2002 Free Software Foundation, Inc.
-+ This file is part of the GNU C Library.
-+
-+ The GNU C Library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) any later version.
-+
-+ The GNU C Library 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
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with the GNU C Library; if not, write to the Free
-+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+ 02111-1307 USA. */
-+
-+#include <sys/perm.h>
-+#include <sysarch.h>
-+
-+int
-+ioperm (unsigned long int from, unsigned long int num, int turn_on)
-+{
-+ struct i386_ioperm_args args;
-+
-+ args.start = from;
-+ args.length = num;
-+ args.enable = turn_on;
-+
-+ return __sysarch (I386_SET_IOPERM, &args);
-+}
---- a/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/x86_64/sys/perm.h
-+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/x86_64/sys/perm.h
-@@ -23,6 +23,11 @@
-
- __BEGIN_DECLS
-
-+/* Set port input/output permissions. */
-+extern int ioperm (unsigned long int __from, unsigned long int __num,
-+ int __turn_on) __THROW;
-+
-+
- /* Change I/O privilege level. */
- extern int iopl (int __level) __THROW;
-
---- a/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/x86_64/sys/io.h
-+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/x86_64/sys/io.h
-@@ -23,6 +23,15 @@
-
- __BEGIN_DECLS
-
-+/* If TURN_ON is TRUE, request for permission to do direct i/o on the
-+ port numbers in the range [FROM,FROM+NUM-1]. Otherwise, turn I/O
-+ permission off for that range. This call requires root privileges.
-+
-+ Portability note: not all kFreeBSD platforms support this call. Most
-+ platforms based on the PC I/O architecture probably will, however. */
-+extern int ioperm (unsigned long int __from, unsigned long int __num,
-+ int __turn_on) __THROW;
-+
- /* Set the I/O privilege level to LEVEL. If LEVEL>3, permission to
- access any I/O port is granted. This call requires root
- privileges. */
---- a/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/Versions
---- b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/Versions
-@@ -81,6 +81,11 @@
- # functions used in inline functions or macros
- __libc_sa_len;
- }
-+ GLIBC_2.10 {
-+ devname;
-+ devname_r;
-+ sysctlnametomib;
-+ }
- GLIBC_PRIVATE {
- # needed by libpthread.
- __clone; __libc_fork; __libc_sigaction;
Modified: glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2009-10-18 20:34:50 UTC (rev 3881)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2009-10-19 14:32:29 UTC (rev 3882)
@@ -186,7 +186,7 @@
+endif
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/Versions
-@@ -0,0 +1,103 @@
+@@ -0,0 +1,109 @@
+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
@@ -270,6 +270,12 @@
+ # functions used in inline functions or macros
+ __libc_sa_len;
+ }
++ GLIBC_2.10 {
++ devname;
++ devname_r;
++ kenv;
++ sysctlnametomib;
++ }
+ GLIBC_PRIVATE {
+ # needed by libpthread.
+ __clone; __libc_fork; __libc_sigaction;
@@ -8115,7 +8121,7 @@
+#include_next <dl-machine.h>
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/dl-osinfo.h
-@@ -0,0 +1,83 @@
+@@ -0,0 +1,98 @@
+/* Operating system specific code for generic dynamic loader functions.
+ Copyright (C) 2006 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -8180,7 +8186,7 @@
+ } while (0)
+
+static inline uintptr_t __attribute__ ((always_inline))
-+_dl_setup_stack_chk_guard (void)
++_dl_setup_stack_chk_guard (void *dl_random)
+{
+ uintptr_t ret;
+#ifdef ENABLE_STACKGUARD_RANDOMIZE
@@ -8199,6 +8205,21 @@
+ p[sizeof (ret) - 2] = '\n';
+ return ret;
+}
++
++static inline uintptr_t __attribute__ ((always_inline))
++_dl_setup_pointer_guard (void *dl_random, uintptr_t stack_chk_guard)
++{
++ uintptr_t ret;
++
++ ret = stack_chk_guard;
++# ifndef HP_TIMING_NONAVAIL
++ hp_timing_t now;
++ HP_TIMING_NOW (now);
++ ret ^= now;
++# endif
++ return ret;
++}
++
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/dl-sysdep.c
@@ -0,0 +1,56 @@
@@ -14925,25 +14946,25 @@
+#define _POSIX_SAVED_IDS 1
+
+/* Priority scheduling is supported. */
-+#define _POSIX_PRIORITY_SCHEDULING 200112L
++#define _POSIX_PRIORITY_SCHEDULING 200809L
+
+/* Synchronizing file data is supported. */
-+#define _POSIX_SYNCHRONIZED_IO 200112L
++#define _POSIX_SYNCHRONIZED_IO 200809L
+
+/* The fsync function is present. */
-+#define _POSIX_FSYNC 200112L
++#define _POSIX_FSYNC 200809L
+
+/* Mapping of files to memory is supported. */
-+#define _POSIX_MAPPED_FILES 200112L
++#define _POSIX_MAPPED_FILES 200809L
+
+/* Locking of all memory is supported. */
-+#define _POSIX_MEMLOCK 200112L
++#define _POSIX_MEMLOCK 200809L
+
+/* Locking of ranges of memory is supported. */
-+#define _POSIX_MEMLOCK_RANGE 200112L
++#define _POSIX_MEMLOCK_RANGE 200809L
+
+/* Setting of memory protections is supported. */
-+#define _POSIX_MEMORY_PROTECTION 200112L
++#define _POSIX_MEMORY_PROTECTION 200809L
+
+/* Only root can change owner of file. */
+#define _POSIX_CHOWN_RESTRICTED 1
@@ -14970,29 +14991,29 @@
+#define _XOPEN_SHM 1
+
+/* Tell we have POSIX threads. */
-+#define _POSIX_THREADS 200112L
++#define _POSIX_THREADS 200809L
+
+/* We have the reentrant functions described in POSIX. */
+#define _POSIX_REENTRANT_FUNCTIONS 1
-+#define _POSIX_THREAD_SAFE_FUNCTIONS 200112L
++#define _POSIX_THREAD_SAFE_FUNCTIONS 200809L
+
+/* We provide priority scheduling for threads. */
-+#define _POSIX_THREAD_PRIORITY_SCHEDULING 200112L
++#define _POSIX_THREAD_PRIORITY_SCHEDULING 200809L
+
+/* We support user-defined stack sizes. */
-+#define _POSIX_THREAD_ATTR_STACKSIZE 200112L
++#define _POSIX_THREAD_ATTR_STACKSIZE 200809L
+
+/* We support user-defined stacks. */
-+#define _POSIX_THREAD_ATTR_STACKADDR 200112L
++#define _POSIX_THREAD_ATTR_STACKADDR 200809L
+
+/* We support POSIX.1b semaphores, but only the non-shared form for now. */
-+#define _POSIX_SEMAPHORES 200112L
++#define _POSIX_SEMAPHORES 200809L
+
+/* Real-time signals are not available. */
+#define _POSIX_REALTIME_SIGNALS -1
+
+/* We support asynchronous I/O. */
-+#define _POSIX_ASYNCHRONOUS_IO 200112L
++#define _POSIX_ASYNCHRONOUS_IO 200809L
+#define _POSIX_ASYNC_IO 1
+/* Alternative name for Unix98. */
+#define _LFS_ASYNCHRONOUS_IO 1
@@ -15008,7 +15029,7 @@
+#define _LFS64_STDIO 1
+
+/* POSIX shared memory objects are implemented. */
-+#define _POSIX_SHARED_MEMORY_OBJECTS 200112L
++#define _POSIX_SHARED_MEMORY_OBJECTS 200809L
+
+/* CPU-time clocks somewhere supported. */
+#define _POSIX_CPUTIME 0
@@ -15020,25 +15041,25 @@
+#define _POSIX_REGEXP 1
+
+/* Reader/Writer locks are available. */
-+#define _POSIX_READER_WRITER_LOCKS 200112L
++#define _POSIX_READER_WRITER_LOCKS 200809L
+
+/* We have a POSIX shell. */
+#define _POSIX_SHELL 1
+
+/* We support the Timeouts option. */
-+#define _POSIX_TIMEOUTS 200112L
++#define _POSIX_TIMEOUTS 200809L
+
+/* We support spinlocks. */
-+#define _POSIX_SPIN_LOCKS 200112L
++#define _POSIX_SPIN_LOCKS 200809L
+
+/* The `spawn' function family is supported. */
-+#define _POSIX_SPAWN 200112L
++#define _POSIX_SPAWN 200809L
+
+/* We have POSIX timers. */
-+#define _POSIX_TIMERS 200112L
++#define _POSIX_TIMERS 200809L
+
+/* The barrier functions are available. */
-+#define _POSIX_BARRIERS 200112L
++#define _POSIX_BARRIERS 200809L
+
+/* POSIX message queues are not available. */
+#define _POSIX_MESSAGE_PASSING -1
@@ -15047,7 +15068,7 @@
+#define _POSIX_THREAD_PROCESS_SHARED -1
+
+/* The monotonic clock is available. */
-+#define _POSIX_MONOTONIC_CLOCK 200112L
++#define _POSIX_MONOTONIC_CLOCK 200809L
+
+/* The clock selection interfaces are not available. */
+#define _POSIX_CLOCK_SELECTION -1
@@ -15056,13 +15077,13 @@
+#define _POSIX_ADVISORY_INFO -1
+
+/* IPv6 support is available. */
-+#define _POSIX_IPV6 200112L
++#define _POSIX_IPV6 200809L
+
+/* Raw socket support is available. */
-+#define _POSIX_RAW_SOCKETS 200112L
++#define _POSIX_RAW_SOCKETS 200809L
+
+/* We have at least one terminal. */
-+#define _POSIX2_CHAR_TERM 200112L
++#define _POSIX2_CHAR_TERM 200809L
+
+/* Neither process nor thread sporadic server interfaces is available. */
+#define _POSIX_SPORADIC_SERVER -1
@@ -17339,25 +17360,25 @@
+#define _POSIX_SAVED_IDS 1
+
+/* Priority scheduling is supported. */
-+#define _POSIX_PRIORITY_SCHEDULING 200112L
++#define _POSIX_PRIORITY_SCHEDULING 200809L
+
+/* Synchronizing file data is supported. */
-+#define _POSIX_SYNCHRONIZED_IO 200112L
++#define _POSIX_SYNCHRONIZED_IO 200809L
+
+/* The fsync function is present. */
-+#define _POSIX_FSYNC 200112L
++#define _POSIX_FSYNC 200809L
+
+/* Mapping of files to memory is supported. */
-+#define _POSIX_MAPPED_FILES 200112L
++#define _POSIX_MAPPED_FILES 200809L
+
+/* Locking of all memory is supported. */
-+#define _POSIX_MEMLOCK 200112L
++#define _POSIX_MEMLOCK 200809L
+
+/* Locking of ranges of memory is supported. */
-+#define _POSIX_MEMLOCK_RANGE 200112L
++#define _POSIX_MEMLOCK_RANGE 200809L
+
+/* Setting of memory protections is supported. */
-+#define _POSIX_MEMORY_PROTECTION 200112L
++#define _POSIX_MEMORY_PROTECTION 200809L
+
+/* Only root can change owner of file. */
+#define _POSIX_CHOWN_RESTRICTED 1
@@ -17384,29 +17405,29 @@
+#define _XOPEN_SHM 1
+
+/* Tell we have POSIX threads. */
-+#define _POSIX_THREADS 200112L
++#define _POSIX_THREADS 200809L
+
+/* We have the reentrant functions described in POSIX. */
+#define _POSIX_REENTRANT_FUNCTIONS 1
-+#define _POSIX_THREAD_SAFE_FUNCTIONS 200112L
++#define _POSIX_THREAD_SAFE_FUNCTIONS 200809L
+
+/* We provide priority scheduling for threads. */
-+#define _POSIX_THREAD_PRIORITY_SCHEDULING 200112L
++#define _POSIX_THREAD_PRIORITY_SCHEDULING 200809L
+
+/* We support user-defined stack sizes. */
-+#define _POSIX_THREAD_ATTR_STACKSIZE 200112L
++#define _POSIX_THREAD_ATTR_STACKSIZE 200809L
+
+/* We support user-defined stacks. */
-+#define _POSIX_THREAD_ATTR_STACKADDR 200112L
++#define _POSIX_THREAD_ATTR_STACKADDR 200809L
+
+/* We support POSIX.1b semaphores, but only the non-shared form for now. */
-+#define _POSIX_SEMAPHORES 200112L
++#define _POSIX_SEMAPHORES 200809L
+
+/* Real-time signals are not available. */
+#define _POSIX_REALTIME_SIGNALS -1
+
+/* We support asynchronous I/O. */
-+#define _POSIX_ASYNCHRONOUS_IO 200112L
++#define _POSIX_ASYNCHRONOUS_IO 200809L
+#define _POSIX_ASYNC_IO 1
+/* Alternative name for Unix98. */
+#define _LFS_ASYNCHRONOUS_IO 1
@@ -17422,7 +17443,7 @@
+#define _LFS64_STDIO 1
+
+/* POSIX shared memory objects are implemented. */
-+#define _POSIX_SHARED_MEMORY_OBJECTS 200112L
++#define _POSIX_SHARED_MEMORY_OBJECTS 200809L
+
+/* CPU-time clocks somewhere supported. */
+#define _POSIX_CPUTIME 0
@@ -17434,25 +17455,25 @@
+#define _POSIX_REGEXP 1
+
+/* Reader/Writer locks are available. */
-+#define _POSIX_READER_WRITER_LOCKS 200112L
++#define _POSIX_READER_WRITER_LOCKS 200809L
+
+/* We have a POSIX shell. */
+#define _POSIX_SHELL 1
+
+/* We support the Timeouts option. */
-+#define _POSIX_TIMEOUTS 200112L
++#define _POSIX_TIMEOUTS 200809L
+
+/* We support spinlocks. */
-+#define _POSIX_SPIN_LOCKS 200112L
++#define _POSIX_SPIN_LOCKS 200809L
+
+/* The `spawn' function family is supported. */
-+#define _POSIX_SPAWN 200112L
++#define _POSIX_SPAWN 200809L
+
+/* We have POSIX timers. */
-+#define _POSIX_TIMERS 200112L
++#define _POSIX_TIMERS 200809L
+
+/* The barrier functions are available. */
-+#define _POSIX_BARRIERS 200112L
++#define _POSIX_BARRIERS 200809L
+
+/* POSIX message queues are not available. */
+#define _POSIX_MESSAGE_PASSING -1
@@ -17461,7 +17482,7 @@
+#define _POSIX_THREAD_PROCESS_SHARED -1
+
+/* The monotonic clock is available. */
-+#define _POSIX_MONOTONIC_CLOCK 200112L
++#define _POSIX_MONOTONIC_CLOCK 200809L
+
+/* The clock selection interfaces are not available. */
+#define _POSIX_CLOCK_SELECTION -1
@@ -17470,13 +17491,13 @@
+#define _POSIX_ADVISORY_INFO -1
+
+/* IPv6 support is available. */
-+#define _POSIX_IPV6 200112L
++#define _POSIX_IPV6 200809L
+
+/* Raw socket support is available. */
-+#define _POSIX_RAW_SOCKETS 200112L
++#define _POSIX_RAW_SOCKETS 200809L
+
+/* We have at least one terminal. */
-+#define _POSIX2_CHAR_TERM 200112L
++#define _POSIX2_CHAR_TERM 200809L
+
+/* Neither process nor thread sporadic server interfaces is available. */
+#define _POSIX_SPORADIC_SERVER -1
@@ -22588,7 +22609,7 @@
+#if HP_TIMING_AVAIL
+ // XXX We can add here test for machines which cannot support a
+ // XXX usable TSC.
-+ return 200112L;
++ return 200809L;
+#else
+ return -1;
+#endif
@@ -24079,15 +24100,18 @@
+
+ifeq ($(subdir),misc)
+# For <sys/io.h> and <sys/perm.h>.
-+sysdep_routines += iopl
++sysdep_routines += iopl ioperm
+endif
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/x86_64/Versions
-@@ -0,0 +1,5 @@
+@@ -0,0 +1,8 @@
+libc {
+ GLIBC_2.3.4 {
+ iopl;
+ }
++ GLIBC_2.10 {
++ ioperm;
++ }
+}
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/x86_64/bits/mcontext.h
@@ -24788,6 +24812,41 @@
+
+weak_alias(__getcontext, getcontext)
--- /dev/null
++++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/x86_64/ioperm.c
+@@ -0,0 +1,32 @@
++/* Copyright (C) 2009 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library 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
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, write to the Free
++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++ 02111-1307 USA. */
++
++#include <sys/perm.h>
++#include <sysarch.h>
++
++int
++ioperm (unsigned long int from, unsigned long int num, int turn_on)
++{
++ struct i386_ioperm_args args;
++
++ args.start = from;
++ args.length = num;
++ args.enable = turn_on;
++
++ return __sysarch (I386_SET_IOPERM, &args);
++}
+--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/x86_64/iopl.c
@@ -0,0 +1 @@
+#include "../i386/iopl.c"
@@ -25687,7 +25746,7 @@
+weak_alias(__swapcontext, swapcontext)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/x86_64/sys/io.h
-@@ -0,0 +1,171 @@
+@@ -0,0 +1,180 @@
+/* Copyright (C) 1996, 2000, 2002, 2004 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -25713,6 +25772,15 @@
+
+__BEGIN_DECLS
+
++/* If TURN_ON is TRUE, request for permission to do direct i/o on the
++ port numbers in the range [FROM,FROM+NUM-1]. Otherwise, turn I/O
++ permission off for that range. This call requires root privileges.
++
++ Portability note: not all kFreeBSD platforms support this call. Most
++ platforms based on the PC I/O architecture probably will, however. */
++extern int ioperm (unsigned long int __from, unsigned long int __num,
++ int __turn_on) __THROW;
++
+/* Set the I/O privilege level to LEVEL. If LEVEL>3, permission to
+ access any I/O port is granted. This call requires root
+ privileges. */
@@ -25861,7 +25929,7 @@
+#endif /* _SYS_IO_H */
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/x86_64/sys/perm.h
-@@ -0,0 +1,31 @@
+@@ -0,0 +1,36 @@
+/* Copyright (C) 1996, 1999, 2002 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -25887,6 +25955,11 @@
+
+__BEGIN_DECLS
+
++/* Set port input/output permissions. */
++extern int ioperm (unsigned long int __from, unsigned long int __num,
++ int __turn_on) __THROW;
++
++
+/* Change I/O privilege level. */
+extern int iopl (int __level) __THROW;
+
Modified: glibc-package/trunk/debian/patches/series.kfreebsd-amd64
===================================================================
--- glibc-package/trunk/debian/patches/series.kfreebsd-amd64 2009-10-18 20:34:50 UTC (rev 3881)
+++ glibc-package/trunk/debian/patches/series.kfreebsd-amd64 2009-10-19 14:32:29 UTC (rev 3882)
@@ -8,5 +8,4 @@
kfreebsd/local-scripts.diff
kfreebsd/local-sys_queue_h.diff
kfreebsd/local-sysdeps.diff
-kfreebsd/local-sysdeps-2.10.diff
kfreebsd/local-undef-glibc.diff
Modified: glibc-package/trunk/debian/patches/series.kfreebsd-i386
===================================================================
--- glibc-package/trunk/debian/patches/series.kfreebsd-i386 2009-10-18 20:34:50 UTC (rev 3881)
+++ glibc-package/trunk/debian/patches/series.kfreebsd-i386 2009-10-19 14:32:29 UTC (rev 3882)
@@ -8,5 +8,4 @@
kfreebsd/local-scripts.diff
kfreebsd/local-sys_queue_h.diff
kfreebsd/local-sysdeps.diff
-kfreebsd/local-sysdeps-2.10.diff
kfreebsd/local-undef-glibc.diff
Reply to: