r3307 - in glibc-package/trunk/debian: . patches patches/any
Author: aurel32
Date: 2009-02-24 21:46:57 +0000 (Tue, 24 Feb 2009)
New Revision: 3307
Added:
glibc-package/trunk/debian/patches/any/submitted-futex_lock_pi.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* patches/any/submitted-futex_lock_pi.diff: new patch to correctly
define when PI futexes have been introduced in the kernel, on a
per architecture basis.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2009-02-23 17:39:53 UTC (rev 3306)
+++ glibc-package/trunk/debian/changelog 2009-02-24 21:46:57 UTC (rev 3307)
@@ -10,8 +10,11 @@
* testsuite-checking/expected-results-arm-linux-gnueabi-libc: ignore
result of test-fenv.out and test-fpucw.out, as they were already
failing with glibc 2.7.
+ * patches/any/submitted-futex_lock_pi.diff: new patch to correctly
+ define when PI futexes have been introduced in the kernel, on a
+ per architecture basis.
- -- Aurelien Jarno <aurel32@debian.org> Mon, 23 Feb 2009 18:30:23 +0100
+ -- Aurelien Jarno <aurel32@debian.org> Tue, 24 Feb 2009 22:45:48 +0100
glibc (2.9-3) unstable; urgency=low
Added: glibc-package/trunk/debian/patches/any/submitted-futex_lock_pi.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/submitted-futex_lock_pi.diff (rev 0)
+++ glibc-package/trunk/debian/patches/any/submitted-futex_lock_pi.diff 2009-02-24 21:46:57 UTC (rev 3307)
@@ -0,0 +1,92 @@
+2009-09-24 Aurelien Jarno <aurelien@aurel32.net>
+
+ * sysdeps/unix/sysv/linux/kernel-features.h
+ (__LINUX_KERNEL_VERSION): Update per-arch conditions when each
+ feature was introduced.
+
+diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h
+index 29afe27..f16298b 100644
+--- a/sysdeps/unix/sysv/linux/kernel-features.h
++++ b/sysdeps/unix/sysv/linux/kernel-features.h
+@@ -462,8 +462,15 @@
+ # define __ASSUME_SET_ROBUST_LIST 1
+ #endif
+
+-/* Support for PI futexes was added in 2.6.18. */
+-#if __LINUX_KERNEL_VERSION >= 0x020612
++/* Support for PI futexes was added in 2.6.18 on i386, powerpc, s390, sparc64
++ x86_64. It was added in 2.6.19 on ia64 and in 2.6.23 on sh. */
++#if (__LINUX_KERNEL_VERSION >= 0x020612 && defined __i386__) \
++ || (__LINUX_KERNEL_VERSION >= 0x020612 && defined __powerpc__) \
++ || (__LINUX_KERNEL_VERSION >= 0x020612 && defined __s390__) \
++ || (__LINUX_KERNEL_VERSION >= 0x020612 && defined __sparc__ && __arch64__) \
++ || (__LINUX_KERNEL_VERSION >= 0x020612 && defined __x86_64__) \
++ || (__LINUX_KERNEL_VERSION >= 0x020613 && defined __ia64__) \
++ || (__LINUX_KERNEL_VERSION >= 0x020617 && defined __sh__)
+ # define __ASSUME_FUTEX_LOCK_PI 1
+ #endif
+
+
+2009-09-24 Aurelien Jarno <aurelien@aurel32.net>
+
+ * sysdeps/unix/sysv/linux/arm/kernel-features.h
+ (__LINUX_KERNEL_VERSION): Define for 2.6.28 and later.
+
+diff --git a/ports/ports/sysdeps/unix/sysv/linux/arm/kernel-features.h b/ports/ports/sysdeps/unix/sysv/linux/arm/kernel-features.h
+index ea439d5..2a40f09 100644
+--- a/ports/sysdeps/unix/sysv/linux/arm/kernel-features.h
++++ b/ports/sysdeps/unix/sysv/linux/arm/kernel-features.h
+@@ -51,6 +51,11 @@
+ # define __ASSUME_SIGFRAME_V2 1
+ #endif
+
++/* Support for PI futexes was added in 2.6.28. */
++#if __LINUX_KERNEL_VERSION >= 132636
++ # define __ASSUME_FUTEX_LOCK_PI 1
++#endif
++
+ #include_next <kernel-features.h>
+
+ /* These syscalls are not implemented yet for ARM. */
+
+
+2009-09-24 Aurelien Jarno <aurelien@aurel32.net>
+
+ * sysdeps/unix/sysv/linux/hppa/kernel-features.h
+ (__LINUX_KERNEL_VERSION): Define for 2.6.19 and later.
+
+diff --git a/ports/sysdeps/unix/sysv/linux/hppa/ports/kernel-features.h b/ports/sysdeps/unix/sysv/linux/hppa/ports/kernel-features.h
+index e29f6e0..234f0c3 100644
+--- a/ports/sysdeps/unix/sysv/linux/hppa/ports/kernel-features.h
++++ b/ports/sysdeps/unix/sysv/linux/hppa/ports/kernel-features.h
+@@ -36,4 +36,9 @@
+ # define __ASSUME_LWS_CAS 1
+ #endif
+
++/* Support for PI futexes was added in 2.6.19. */
++#if __LINUX_KERNEL_VERSION >= 0x020613
++ # define __ASSUME_FUTEX_LOCK_PI 1
++#endif
++
+ #include_next <kernel-features.h>
+
+
+2009-09-24 Aurelien Jarno <aurelien@aurel32.net>
+
+ * sysdeps/unix/sysv/linux/mips/kernel-features.h
+ (__LINUX_KERNEL_VERSION): Define for 2.6.18 and later.
+
+diff --git a/ports/sysdeps/unix/sysv/linux/mips/kernel-features.h b/ports/sysdeps/unix/sysv/linux/mips/kernel-features.h
+index f479b60..f746c01 100644
+--- a/ports/sysdeps/unix/sysv/linux/mips/kernel-features.h
++++ b/ports/sysdeps/unix/sysv/linux/mips/kernel-features.h
+@@ -31,4 +31,9 @@
+ # define __ASSUME_FCNTL64 1
+ #endif
+
++/* Support for PI futexes was added in 2.6.18. */
++#if __LINUX_KERNEL_VERSION >= 132626
++ # define __ASSUME_FUTEX_LOCK_PI 1
++#endif
++
+ #include_next <kernel-features.h>
Property changes on: glibc-package/trunk/debian/patches/any/submitted-futex_lock_pi.diff
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2009-02-23 17:39:53 UTC (rev 3306)
+++ glibc-package/trunk/debian/patches/series 2009-02-24 21:46:57 UTC (rev 3307)
@@ -185,3 +185,4 @@
any/local-linuxthreads-thread_self.diff
any/cvs-pthread_h.diff
any/local-bashisms.diff
+any/submitted-futex_lock_pi.diff
Reply to: