[commits] r5559 - in /fsf/trunk/libc: ./ nptl/ nptl/sysdeps/unix/sysv/linux/i386/ nptl/sysdeps/unix/sysv/linux/i386/i686/ nptl/sysdeps...

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Tue Mar 18 00:04:01 2008
New Revision: 5559

Log:
Import glibc-mainline for 2008-03-18

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/nptl/ChangeLog
    fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/i386/dl-sysdep.h
    fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/i386/i686/dl-sysdep.h
    fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/ia64/dl-sysdep.h
    fsf/trunk/libc/sysdeps/unix/sysv/linux/dl-sysdep.h

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Tue Mar 18 00:04:01 2008
@@ -1,3 +1,8 @@
+2008-03-18  Jakub Jelinek  <jakub@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/dl-sysdep.h: Use __ASSEMBLER__ instead
+	of ASSEMBLER.
+
 2008-03-11  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	[BZ #5903]

Modified: fsf/trunk/libc/nptl/ChangeLog
==============================================================================
--- fsf/trunk/libc/nptl/ChangeLog (original)
+++ fsf/trunk/libc/nptl/ChangeLog Tue Mar 18 00:04:01 2008
@@ -1,3 +1,10 @@
+2008-03-18  Jakub Jelinek  <jakub@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/ia64/dl-sysdep.h: Use __ASSEMBLER__ instead
+	of ASSEMBLER.
+	* sysdeps/unix/sysv/linux/i386/i686/dl-sysdep.h: Likewise.
+	* sysdeps/unix/sysv/linux/i386/dl-sysdep.h: Likewise.
+
 2008-03-14  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/i386/dl-sysdep.h: Define

Modified: fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/i386/dl-sysdep.h
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/i386/dl-sysdep.h (original)
+++ fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/i386/dl-sysdep.h Tue Mar 18 00:04:01 2008
@@ -64,7 +64,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

Modified: fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/i386/i686/dl-sysdep.h
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/i386/i686/dl-sysdep.h (original)
+++ fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/i386/i686/dl-sysdep.h Tue Mar 18 00:04:01 2008
@@ -61,7 +61,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

Modified: fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/ia64/dl-sysdep.h
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/ia64/dl-sysdep.h (original)
+++ fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/ia64/dl-sysdep.h Tue Mar 18 00:04:01 2008
@@ -68,7 +68,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

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/dl-sysdep.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/dl-sysdep.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/dl-sysdep.h Tue Mar 18 00:04:01 2008
@@ -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