rpms/glibc/devel glibc-s390-waitid.patch, 1.1, 1.2 glibc.spec, 1.205, 1.206

[fedora-cvs-commits at redhat.com]

Author: jakub

Update of /cvs/dist/rpms/glibc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19958

Modified Files:
	glibc-s390-waitid.patch glibc.spec 
Log Message:
2.3.90-27


glibc-s390-waitid.patch:
 kernel-features.h |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

Index: glibc-s390-waitid.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc-s390-waitid.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glibc-s390-waitid.patch	4 Jan 2006 09:41:29 -0000	1.1
+++ glibc-s390-waitid.patch	6 Jan 2006 05:06:44 -0000	1.2
@@ -1,10 +1,12 @@
-2006-01-04  Jakub Jelinek  <jakub at redhat.com>
+2006-01-05  Jakub Jelinek  <jakub at redhat.com>
 
 	* sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_WAITID_SYSCALL):
 	Only define for 2.6.12+ on s390{,x}.
+	(__ASSUME_GETDENTS32_D_TYPE): Only define for 2.6.8+ on most arches
+	and only for 2.6.11+ on s390{,x}.
 
 --- libc/sysdeps/unix/sysv/linux/kernel-features.h.jj	2005-12-13 16:42:22.000000000 +0100
-+++ libc/sysdeps/unix/sysv/linux/kernel-features.h	2006-01-04 10:36:38.000000000 +0100
++++ libc/sysdeps/unix/sysv/linux/kernel-features.h	2006-01-05 22:52:21.000000000 +0100
 @@ -1,6 +1,6 @@
  /* Set flags signalling availability of kernel features based on given
     kernel version number.
@@ -13,7 +15,20 @@
     This file is part of the GNU C Library.
  
     The GNU C Library is free software; you can redistribute it and/or
-@@ -435,9 +435,11 @@
+@@ -423,8 +423,10 @@
+ #endif
+ 
+ /* Starting with version 2.6.4-rc1 the getdents syscall returns d_type
+-   information as well.  */
+-#if __LINUX_KERNEL_VERSION >= 132612
++   information as well and in between 2.6.5 and 2.6.8 most compat wrappers
++   were fixed too.  Except s390{,x} which was fixed in 2.6.11.  */
++#if (__LINUX_KERNEL_VERSION >= 0x020608 && !defined __s390__) \
++    || (__LINUX_KERNEL_VERSION >= 0x02060b && defined __s390__)
+ # define __ASSUME_GETDENTS32_D_TYPE	1
+ #endif
+ 
+@@ -435,9 +437,11 @@
  #endif
  
  /* Starting with version 2.6.9, the waitid system call is available.


Index: glibc.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- glibc.spec	4 Jan 2006 09:38:31 -0000	1.205
+++ glibc.spec	6 Jan 2006 05:06:44 -0000	1.206
@@ -3,7 +3,7 @@
 %define glibcsrcdir glibc-20060104T0754
 %define glibc_release_tarballs 0
 %define glibcversion 2.3.90
-%define glibcrelease 26
+%define glibcrelease 27
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define prelinkarches noarch
 %define xenarches i686 athlon
@@ -1135,6 +1135,9 @@
 %endif
 
 %changelog
+* Fri Jan  6 2006 Jakub Jelinek <jakub at redhat.com> 2.3.90-27
+- only rely on d_type in 32-bit getdents on s390 for 2.6.11+
+
 * Wed Jan  4 2006 Jakub Jelinek <jakub at redhat.com> 2.3.90-26
 - update from CVS
   - for newly linked lio_listio* callers, send per request