aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2006-02-22 07:28:05 +0000
committerRoland McGrath <roland@gnu.org>2006-02-22 07:28:05 +0000
commit76ecf81ebf76fdccaf7b46c208039ad5427fa2a0 (patch)
tree1f38a679fac366ed99b9dcd08d6faee2d8b37477
parentf094829e484cd9e7c2eaee3acf86a6ceee0dc4a2 (diff)
downloadglibc-76ecf81ebf76fdccaf7b46c208039ad5427fa2a0.tar
glibc-76ecf81ebf76fdccaf7b46c208039ad5427fa2a0.tar.gz
glibc-76ecf81ebf76fdccaf7b46c208039ad5427fa2a0.tar.bz2
glibc-76ecf81ebf76fdccaf7b46c208039ad5427fa2a0.zip
* sysdeps/unix/sysv/linux/kernel-features.h
(__ASSUME_CLONE_THREAD_FLAGS): Consolidate definitions. 2006-02-03 Jakub Jelinek <jakub@redhat.com> * manual/filesys.texi (futimes): Fix prototype.
-rw-r--r--ChangeLog11
-rw-r--r--sysdeps/unix/sysv/linux/kernel-features.h20
2 files changed, 14 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog
index e0e84af73a..14e00523bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,15 @@
-2006-02-03 Jakub Jelinek <jakub@redhat.com>
-
- * manual/filesys.texi (futimes): Fix prototype.
-
2006-02-21 Roland McGrath <roland@redhat.com>
+ * sysdeps/unix/sysv/linux/kernel-features.h
+ (__ASSUME_CLONE_THREAD_FLAGS): Consolidate definitions.
+
* sysdeps/unix/sysv/linux/x86_64/sys/epoll.h: Update comment, remove
__THROW from epoll_wait, to match .../linux/sys/epoll.h file.
+2006-02-03 Jakub Jelinek <jakub@redhat.com>
+
+ * manual/filesys.texi (futimes): Fix prototype.
+
2004-08-09 Paul Eggert <eggert@cs.ucla.edu>
[BZ #315]
diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h
index 888819a455..9f3f3965f4 100644
--- a/sysdeps/unix/sysv/linux/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/kernel-features.h
@@ -286,8 +286,13 @@
/* The late 2.5 kernels saw a lot of new CLONE_* flags. Summarize
their availability with one define. The changes were made first
for i386 and the have to be done separately for the other archs.
- For i386 we pick 2.5.50 as the first version with support. */
-#if __LINUX_KERNEL_VERSION >= 132402 && defined __i386__
+ For i386 we pick 2.5.50 as the first version with support.
+ For ia64, s390*, PPC, x86-64, and SH we pick 2.5.64 as the first
+ version with support. */
+#if ((__LINUX_KERNEL_VERSION >= 132402 && defined __i386__) \
+ || (__LINUX_KERNEL_VERSION >= 132416 \
+ && (defined __ia64__ || defined __s390__ \
+ || defined __powerpc__ || defined __x86_64__ || defined __sh__)))
# define __ASSUME_CLONE_THREAD_FLAGS 1
#endif
@@ -311,17 +316,6 @@
# define __ASSUME_POSIX_CPU_TIMERS 1
#endif
-/* The late 2.5 kernels saw a lot of new CLONE_* flags. Summarize
- their availability with one define. The changes were made first
- for i386 and the have to be done separately for the other archs.
- For ia64, s390*, PPC, x86-64 we pick 2.5.64 as the first version
- with support. */
-#if __LINUX_KERNEL_VERSION >= 132416 \
- && (defined __ia64__ || defined __s390__ || defined __powerpc__ \
- || defined __x86_64__ || defined __sh__)
-# define __ASSUME_CLONE_THREAD_FLAGS 1
-#endif
-
/* With kernel 2.4.17 we always have netlink support. */
#if __LINUX_KERNEL_VERSION >= (132096+17)
# define __ASSUME_NETLINK_SUPPORT 1