rpms/glibc/devel glibc-fedora.patch, 1.260, 1.261 glibc.spec, 1.347, 1.348

[Jakub Jelinek (jakub)]

Author: jakub

Update of /cvs/pkgs/rpms/glibc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15159

Modified Files:
	glibc-fedora.patch glibc.spec 
Log Message:
2.7.90-11

glibc-fedora.patch:

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -r1.260 -r1.261
--- glibc-fedora.patch	14 Mar 2008 23:00:20 -0000	1.260
+++ glibc-fedora.patch	17 Mar 2008 23:43:22 -0000	1.261
@@ -2354,3 +2354,47 @@
  
  	cfi_startproc;
  PSEUDO_END (BP_SYM (__clone))
+--- libc/nptl/sysdeps/unix/sysv/linux/ia64/dl-sysdep.h.jj	2008-03-14 22:53:51.000000000 +0100
++++ libc/nptl/sysdeps/unix/sysv/linux/ia64/dl-sysdep.h	2008-03-18 00:36:11.000000000 +0100
+@@ -68,7 +68,7 @@ extern int _dl_sysinfo_break attribute_h
+ 
+ /* The _dl_discover_osversion function is so far only needed in sysconf
+    to check for kernels later than 2.6.23.  */
+-#if !defined ASSEMBLER && __LINUX_KERNEL_VERSION < 0x020617
++#if !defined __ASSEMBLER__ && __LINUX_KERNEL_VERSION < 0x020617
+ /* Get version of the OS.  */
+ extern int _dl_discover_osversion (void) attribute_hidden;
+ # define HAVE_DL_DISCOVER_OSVERSION	1
+--- libc/nptl/sysdeps/unix/sysv/linux/i386/i686/dl-sysdep.h.jj	2008-03-14 22:52:53.000000000 +0100
++++ libc/nptl/sysdeps/unix/sysv/linux/i386/i686/dl-sysdep.h	2008-03-18 00:36:03.000000000 +0100
+@@ -61,7 +61,7 @@ extern void _dl_sysinfo_int80 (void) att
+ 
+ /* The _dl_discover_osversion function is so far only needed in sysconf
+    to check for kernels later than 2.6.23.  */
+-#if !defined ASSEMBLER && __LINUX_KERNEL_VERSION < 0x020617
++#if !defined __ASSEMBLER__ && __LINUX_KERNEL_VERSION < 0x020617
+ /* Get version of the OS.  */
+ extern int _dl_discover_osversion (void) attribute_hidden;
+ # define HAVE_DL_DISCOVER_OSVERSION	1
+--- libc/nptl/sysdeps/unix/sysv/linux/i386/dl-sysdep.h.jj	2008-03-14 22:53:51.000000000 +0100
++++ libc/nptl/sysdeps/unix/sysv/linux/i386/dl-sysdep.h	2008-03-18 00:35:54.000000000 +0100
+@@ -64,7 +64,7 @@ extern void _dl_sysinfo_int80 (void) att
+ 
+ /* The _dl_discover_osversion function is so far only needed in sysconf
+    to check for kernels later than 2.6.23.  */
+-#if !defined ASSEMBLER && __LINUX_KERNEL_VERSION < 0x020617
++#if !defined __ASSEMBLER__ && __LINUX_KERNEL_VERSION < 0x020617
+ /* Get version of the OS.  */
+ extern int _dl_discover_osversion (void) attribute_hidden;
+ # define HAVE_DL_DISCOVER_OSVERSION	1
+--- libc/sysdeps/unix/sysv/linux/dl-sysdep.h.jj	2008-03-14 22:52:55.000000000 +0100
++++ libc/sysdeps/unix/sysv/linux/dl-sysdep.h	2008-03-18 00:35:40.000000000 +0100
+@@ -29,7 +29,7 @@
+ 
+ /* The _dl_discover_osversion function is so far only needed in sysconf
+    to check for kernels later than 2.6.23.  */
+-#if !defined ASSEMBLER && __LINUX_KERNEL_VERSION < 0x020617
++#if !defined __ASSEMBLER__ && __LINUX_KERNEL_VERSION < 0x020617
+ /* Get version of the OS.  */
+ extern int _dl_discover_osversion (void) attribute_hidden;
+ # define HAVE_DL_DISCOVER_OSVERSION	1


Index: glibc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.347
retrieving revision 1.348
diff -u -r1.347 -r1.348
--- glibc.spec	14 Mar 2008 23:00:20 -0000	1.347
+++ glibc.spec	17 Mar 2008 23:43:22 -0000	1.348
@@ -980,7 +980,7 @@
 %endif
 
 %changelog
-* Fri Mar 14 2008 Jakub Jelinek <jakub at redhat.com> 2.7.90-11
+* Tue Mar 18 2008 Jakub Jelinek <jakub at redhat.com> 2.7.90-11
 - update to trunk
 - remove <stropts.h>, define _XOPEN_STREAMS -1 (#436349)