r2795 - in glibc-package/trunk/debian: . patches/kfreebsd
Author: aurel32
Date: 2008-01-27 19:12:09 +0000 (Sun, 27 Jan 2008)
New Revision: 2795
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
Log:
* kfreebsd/local-sysdeps.diff: update to revision 2117 (from glibc-bsd).
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2008-01-25 07:04:52 UTC (rev 2794)
+++ glibc-package/trunk/debian/changelog 2008-01-27 19:12:09 UTC (rev 2795)
@@ -14,10 +14,11 @@
nvidia-glx. Closes: #453480.
* patches/mips/local-r10k.diff: new patch from Florian Lohoff to
workaround LL/SC bug on R10k. Closes: #462112.
- * patches/mips/submitted-mipsn32.diff: new patch to fix truncate64()
+ * patches/mips/submitted-mipsn32.diff: new patch to fix truncate64()
on MIPS n32.
+ * kfreebsd/local-sysdeps.diff: update to revision 2117 (from glibc-bsd).
- -- Aurelien Jarno <aurel32@debian.org> Thu, 24 Jan 2008 15:37:11 +0100
+ -- Aurelien Jarno <aurel32@debian.org> Sun, 27 Jan 2008 20:11:39 +0100
glibc (2.7-6) unstable; urgency=low
Modified: glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2008-01-25 07:04:52 UTC (rev 2794)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2008-01-27 19:12:09 UTC (rev 2795)
@@ -4346,8 +4346,8 @@
+};
diff -x .svn -Nurd null/sysdeps/unix/bsd/bsd4.4/kfreebsd/bits/sched.h ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/bits/sched.h
--- null/sysdeps/unix/bsd/bsd4.4/kfreebsd/bits/sched.h 1970-01-01 01:00:00.000000000 +0100
-+++ ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/bits/sched.h 2007-10-31 18:15:37.000000000 +0100
-@@ -0,0 +1,120 @@
++++ ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/bits/sched.h 2008-01-27 20:08:31.000000000 +0100
+@@ -0,0 +1,177 @@
+/* Definitions of constants and data structure for POSIX 1003.1b-1993
+ scheduling interface.
+ Copyright (C) 1996, 1997, 2001, 2003 Free Software Foundation, Inc.
@@ -4380,13 +4380,7 @@
+#define SCHED_FIFO 1
+#define SCHED_RR 3
+
-+/* Data structure to describe a process' schedulability. */
-+struct sched_param
-+{
-+ int __sched_priority;
-+};
+
-+
+#ifdef __USE_MISC
+/* Cloning flags. */
+# define CSIGNAL 0x000000ff /* Signal mask to be sent at exit. */
@@ -4400,29 +4394,38 @@
+# define CLONE_SYSVSEM 0x00040000 /* share system V SEM_UNDO semantics */
+#endif
+
++/* The official definition. */
++struct sched_param
++ {
++ int __sched_priority;
++ };
++
+__BEGIN_DECLS
+
++#ifdef __USE_MISC
+/* Clone current process. */
-+#ifdef __USE_MISC
+extern int clone (int (*__fn) (void *__arg), void *__child_stack,
+ int __flags, void *__arg) __THROW;
++
++/* Unshare the specified resources. */
++extern int unshare (int __flags) __THROW;
++
++/* Get index of currently used CPU. */
++extern int sched_getcpu (void) __THROW;
+#endif
+
+__END_DECLS
+
+#endif /* need schedparam */
+
-+
+#if !defined __defined_schedparam \
+ && (defined __need_schedparam || defined _SCHED_H)
+# define __defined_schedparam 1
-+
+/* Data structure to describe a process' schedulability. */
+struct __sched_param
+ {
+ int __sched_priority;
+ };
-+
+# undef __need_schedparam
+#endif
+
@@ -4433,7 +4436,7 @@
+# define __CPU_SETSIZE 1024
+# define __NCPUBITS (8 * sizeof (__cpu_mask))
+
-+/* Type for array elements in 'cpu_set'. */
++/* Type for array elements in 'cpu_set_t'. */
+typedef unsigned long int __cpu_mask;
+
+/* Basic access functions. */
@@ -4447,27 +4450,81 @@
+} cpu_set_t;
+
+/* Access functions for CPU masks. */
-+# define __CPU_ZERO(cpusetp) \
++# if __GNUC_PREREQ (2, 91)
++# define __CPU_ZERO_S(setsize, cpusetp) \
++ do __builtin_memset (cpusetp, '\0', setsize); while (0)
++# else
++# define __CPU_ZERO_S(setsize, cpusetp) \
+ do { \
-+ unsigned int __i; \
-+ cpu_set *__arr = (cpusetp); \
-+ for (__i = 0; __i < sizeof (cpu_set) / sizeof (__cpu_mask); ++__i) \
++ size_t __i; \
++ size_t __imax = (setsize) / sizeof (__cpu_mask); \
++ cpu_set_t *__arr = (cpusetp); \
++ for (__i = 0; __i < __imax; ++__i) \
+ __arr->__bits[__i] = 0; \
+ } while (0)
-+# define __CPU_SET(cpu, cpusetp) \
-+ ((cpusetp)->__bits[__CPUELT (cpu)] |= __CPUMASK (cpu))
-+# define __CPU_CLR(cpu, cpusetp) \
-+ ((cpusetp)->__bits[__CPUELT (cpu)] &= ~__CPUMASK (cpu))
-+# define __CPU_ISSET(cpu, cpusetp) \
-+ (((cpusetp)->__bits[__CPUELT (cpu)] & __CPUMASK (cpu)) != 0)
++# endif
++# define __CPU_SET_S(cpu, setsize, cpusetp) \
++ (__extension__ \
++ ({ size_t __cpu = (cpu); \
++ __cpu < 8 * (setsize) \
++ ? ((cpusetp)->__bits[__CPUELT (__cpu)] |= __CPUMASK (__cpu)) : 0; }))
++# define __CPU_CLR_S(cpu, setsize, cpusetp) \
++ (__extension__ \
++ ({ size_t __cpu = (cpu); \
++ __cpu < 8 * (setsize) \
++ ? ((cpusetp)->__bits[__CPUELT (__cpu)] &= ~__CPUMASK (__cpu)) : 0; }))
++# define __CPU_ISSET_S(cpu, setsize, cpusetp) \
++ (__extension__ \
++ ({ size_t __cpu = (cpu); \
++ __cpu < 8 * (setsize) \
++ ? (((cpusetp)->__bits[__CPUELT (__cpu)] & __CPUMASK (__cpu))) != 0 \
++ : 0; }))
+
++# define __CPU_COUNT_S(setsize, cpusetp) \
++ __sched_cpucount (setsize, cpusetp)
++
++# if __GNUC_PREREQ (2, 91)
++# define __CPU_EQUAL_S(setsize, cpusetp1, cpusetp2) \
++ (__builtin_memcmp (cpusetp1, cpusetp2, setsize) == 0)
++# else
++# define __CPU_EQUAL_S(setsize, cpusetp1, cpusetp2) \
++ (__extension__ \
++ ({ cpu_set_t *__arr1 = (cpusetp1); \
++ cpu_set_t *__arr2 = (cpusetp2); \
++ size_t __imax = (setsize) / sizeof (__cpu_mask); \
++ size_t __i; \
++ for (__i = 0; __i < __imax; ++__i) \
++ if (__arr1->__bits[__i] != __arr2->__bits[__i]) \
++ break; \
++ __i == __imax; }))
++# endif
++
++# define __CPU_OP_S(setsize, destset, srcset1, srcset2, op) \
++ (__extension__ \
++ ({ cpu_set_t *__dest = (destset); \
++ cpu_set_t *__arr1 = (srcset1); \
++ cpu_set_t *__arr2 = (srcset2); \
++ size_t __imax = (setsize) / sizeof (__cpu_mask); \
++ size_t __i; \
++ for (__i = 0; __i < __imax; ++__i) \
++ __dest->__bits[__i] = __arr1->__bits[__i] op __arr2->__bits[__i]; \
++ __dest; }))
++
+# define __CPU_ALLOC_SIZE(count) \
-+ ((((count) + __NCPUBITS - 1) / __NCPUBITS) * 8)
++ ((((count) + __NCPUBITS - 1) / __NCPUBITS) * 8)
+# define __CPU_ALLOC(count) __sched_cpualloc (count)
+# define __CPU_FREE(cpuset) __sched_cpufree (cpuset)
+
++__BEGIN_DECLS
++
++extern int __sched_cpucount (size_t __setsize, const cpu_set_t *__setp)
++ __THROW;
++extern cpu_set_t *__sched_cpualloc (size_t __count) __THROW __wur;
++extern void __sched_cpufree (cpu_set_t *__set) __THROW;
++
++__END_DECLS
++
+#endif
-+
diff -x .svn -Nurd null/sysdeps/unix/bsd/bsd4.4/kfreebsd/bits/sem.h ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/bits/sem.h
--- null/sysdeps/unix/bsd/bsd4.4/kfreebsd/bits/sem.h 1970-01-01 01:00:00.000000000 +0100
+++ ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/bits/sem.h 2006-11-22 11:44:31.000000000 +0100
@@ -6718,7 +6775,7 @@
+#include <sysdeps/unix/clock_settime.c>
diff -x .svn -Nurd null/sysdeps/unix/bsd/bsd4.4/kfreebsd/clone.c ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/clone.c
--- null/sysdeps/unix/bsd/bsd4.4/kfreebsd/clone.c 1970-01-01 01:00:00.000000000 +0100
-+++ ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/clone.c 2006-10-18 09:59:59.000000000 +0200
++++ ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/clone.c 2008-01-06 03:10:51.000000000 +0100
@@ -0,0 +1,105 @@
+/* Create a thread.
+ Copyright (C) 2002 Free Software Foundation, Inc.
@@ -10781,7 +10838,7 @@
+ (handler)((signo), SIGCONTEXT_EXTRA_ARGS (ctx))
diff -x .svn -Nurd null/sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/start_thread.S ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/start_thread.S
--- null/sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/start_thread.S 1970-01-01 01:00:00.000000000 +0100
-+++ ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/start_thread.S 2007-11-16 13:47:48.000000000 +0100
++++ ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/i386/start_thread.S 2008-01-27 20:08:25.000000000 +0100
@@ -0,0 +1,207 @@
+/* Copyright (C) 2002 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -21630,7 +21687,7 @@
+ (handler)((signo), SIGCONTEXT_EXTRA_ARGS (ctx))
diff -x .svn -Nurd null/sysdeps/unix/bsd/bsd4.4/kfreebsd/x86_64/start_thread.S ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/x86_64/start_thread.S
--- null/sysdeps/unix/bsd/bsd4.4/kfreebsd/x86_64/start_thread.S 1970-01-01 01:00:00.000000000 +0100
-+++ ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/x86_64/start_thread.S 2006-10-18 09:59:58.000000000 +0200
++++ ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/x86_64/start_thread.S 2008-01-06 03:10:36.000000000 +0100
@@ -0,0 +1,196 @@
+/* Copyright (C) 2002 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
Reply to: