* sysdeps/unix/sysv/linux/dl-sysdep.h: Use __ASSEMBLER__ instead

of ASSEMBLER. nptl/ * 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-18 Jakub Jelinek <jakub@redhat.com> * sysdeps/unix/sysv/linux/dl-sysdep.h: Use __ASSEMBLER__ instead of ASSEMBLER.
git-mirror · Mar 17, 2008 · 354b752 · 354b752
1 parent 4564918
commit 354b752
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 4 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-18  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/unix/sysv/linux/dl-sysdep.h: Use __ASSEMBLER__ instead
+	of ASSEMBLER.
+
 2008-03-11  Ulrich Drepper  <drepper@redhat.com>
 
 	[BZ #5903]

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
@@ -1,3 +1,10 @@
+2008-03-18  Jakub Jelinek  <jakub@redhat.com>
+
+	* 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@redhat.com>
 
 	* sysdeps/unix/sysv/linux/i386/dl-sysdep.h: Define

diff --git a/nptl/sysdeps/unix/sysv/linux/i386/dl-sysdep.h b/nptl/sysdeps/unix/sysv/linux/i386/dl-sysdep.h
@@ -64,7 +64,7 @@ extern void _dl_sysinfo_int80 (void) attribute_hidden;
 
 /* 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

diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i686/dl-sysdep.h b/nptl/sysdeps/unix/sysv/linux/i386/i686/dl-sysdep.h
@@ -61,7 +61,7 @@ extern void _dl_sysinfo_int80 (void) attribute_hidden;
 
 /* 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

diff --git a/nptl/sysdeps/unix/sysv/linux/ia64/dl-sysdep.h b/nptl/sysdeps/unix/sysv/linux/ia64/dl-sysdep.h
@@ -68,7 +68,7 @@ extern int _dl_sysinfo_break attribute_hidden;
 
 /* 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

diff --git a/sysdeps/unix/sysv/linux/dl-sysdep.h b/sysdeps/unix/sysv/linux/dl-sysdep.h
@@ -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