aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2008-03-17 23:41:58 +0000
committerJakub Jelinek <jakub@redhat.com>2008-03-17 23:41:58 +0000
commit354b75277bc86768eafbbf5f590deb27e0a71d89 (patch)
tree2841483923500a0c3a42449e2d993d5759ebaa94
parent4564918515272927ca7d0e2b586330c2b8af3c34 (diff)
downloadglibc-354b75277bc86768eafbbf5f590deb27e0a71d89.zip
glibc-354b75277bc86768eafbbf5f590deb27e0a71d89.tar.gz
glibc-354b75277bc86768eafbbf5f590deb27e0a71d89.tar.bz2
* 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.
-rw-r--r--ChangeLog5
-rw-r--r--nptl/ChangeLog7
-rw-r--r--nptl/sysdeps/unix/sysv/linux/i386/dl-sysdep.h2
-rw-r--r--nptl/sysdeps/unix/sysv/linux/i386/i686/dl-sysdep.h2
-rw-r--r--nptl/sysdeps/unix/sysv/linux/ia64/dl-sysdep.h2
-rw-r--r--sysdeps/unix/sysv/linux/dl-sysdep.h2
6 files changed, 16 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 0687255..e50b5a5 100644
--- 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
index b67a8b0..1627caa 100644
--- 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
index 50902a5..a3b2c77 100644
--- 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
index 1298e59..978f1f7 100644
--- 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
index 42c37ae..5c16bd7 100644
--- 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
index 0371fe8..f44fa98 100644
--- 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