4 files changed, 11 insertions, 5 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 95feff2ac6..2fe02b1fd8 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,9 @@
+2002-07-25  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/i386/tls.h: Use __ASSEMBLER__ test macro not ASSEMBLER.
+	* sysdeps/i386/pt-machine.h: Likewise.
+	* sysdeps/i386/useldt.h: Likewise.
+
 2002-07-22  Ulrich Drepper  <drepper@redhat.com>
 
 	* pthread.c (__pthread_initialize_minimal): If !SHARED and TLS
diff --git a/linuxthreads/sysdeps/i386/pt-machine.h b/linuxthreads/sysdeps/i386/pt-machine.h
index ec92ce2418..919eda2edb 100644
--- a/linuxthreads/sysdeps/i386/pt-machine.h
+++ b/linuxthreads/sysdeps/i386/pt-machine.h
@@ -22,7 +22,7 @@
 #ifndef _PT_MACHINE_H
 #define _PT_MACHINE_H	1
 
-#ifndef ASSEMBLER
+#ifndef __ASSEMBLER__
 #ifndef PT_EI
 # define PT_EI extern inline
 #endif
@@ -103,6 +103,6 @@ compare_and_swap_is_available (void)
      Otherwise, it's a 486 or above and it has cmpxchg.  */
   return changed != 0;
 }
-#endif /* ASSEMBLER */
+#endif /* __ASSEMBLER__ */
 
 #endif /* pt-machine.h */
diff --git a/linuxthreads/sysdeps/i386/tls.h b/linuxthreads/sysdeps/i386/tls.h
index 44f947c9c6..24671dbb48 100644
--- a/linuxthreads/sysdeps/i386/tls.h
+++ b/linuxthreads/sysdeps/i386/tls.h
@@ -22,7 +22,7 @@
 
 # include <pt-machine.h>
 
-#ifndef ASSEMBLER
+#ifndef __ASSEMBLER__
 # include <stddef.h>
 
 /* Type for the dtv.  */
@@ -49,7 +49,7 @@ typedef struct
 /* Signal that TLS support is available.  */
 # define USE_TLS	1
 
-# ifndef ASSEMBLER
+# ifndef __ASSEMBLER__
 /* Get system call information.  */
 #  include <sysdep.h>
 
diff --git a/linuxthreads/sysdeps/i386/useldt.h b/linuxthreads/sysdeps/i386/useldt.h
index 64a3b52123..3edcdca26c 100644
--- a/linuxthreads/sysdeps/i386/useldt.h
+++ b/linuxthreads/sysdeps/i386/useldt.h
@@ -19,7 +19,7 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#ifndef ASSEMBLER
+#ifndef __ASSEMBLER__
 #include <stddef.h>	/* For offsetof.  */
 #include <stdlib.h>	/* For abort().  */