2.7.90-11

This commit is contained in:
Jakub Jelinek 2008-03-17 23:43:22 +00:00
parent e8c0bf7811
commit 192fbabef9
2 changed files with 45 additions and 1 deletions

View File

@ -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

View File

@ -980,7 +980,7 @@ rm -f *.filelist*
%endif
%changelog
* Fri Mar 14 2008 Jakub Jelinek <jakub@redhat.com> 2.7.90-11
* Tue Mar 18 2008 Jakub Jelinek <jakub@redhat.com> 2.7.90-11
- update to trunk
- remove <stropts.h>, define _XOPEN_STREAMS -1 (#436349)