Use __ASSEMBLER__ test macro not ASSEMBLER.

diff --git a/sysdeps/arm/sysdep.h b/sysdeps/arm/sysdep.h
index eeef7aa..4fc90ae 100644 (file)
--- a/sysdeps/arm/sysdep.h
+++ b/sysdeps/arm/sysdep.h
@@ -19,7 +19,7 @@
 
 #include <sysdeps/generic/sysdep.h>
 
-#ifdef ASSEMBLER
+#ifdef __ASSEMBLER__
 
 /* Syntactic details of assembler.  */
 
@@ -89,4 +89,4 @@
 #define mcount         _mcount
 #endif
 
-#endif /* ASSEMBLER */
+#endif /* __ASSEMBLER__ */

diff --git a/sysdeps/m68k/sysdep.h b/sysdeps/m68k/sysdep.h
index 58789f7..1770a09 100644 (file)
--- a/sysdeps/m68k/sysdep.h
+++ b/sysdeps/m68k/sysdep.h
@@ -19,7 +19,7 @@
 
 #include <sysdeps/generic/sysdep.h>
 
-#ifdef ASSEMBLER
+#ifdef __ASSEMBLER__
 
 /* Syntactic details of assembler.  */
 
@@ -96,4 +96,4 @@
 #define JUMPTARGET(name)       name
 #endif
 
-#endif /* ASSEMBLER */
+#endif /* __ASSEMBLER__ */

diff --git a/sysdeps/mach/mips/sysdep.h b/sysdeps/mach/mips/sysdep.h
index a4e6dff..7bacb02 100644 (file)
--- a/sysdeps/mach/mips/sysdep.h
+++ b/sysdeps/mach/mips/sysdep.h
@@ -57,7 +57,7 @@ _start:\n\
 
 #include <syscall.h>
 
-#if defined (ASSEMBLER)
+#if defined (__ASSEMBLER__)
 
 #define ALIGN  2
 

diff --git a/sysdeps/unix/alpha/sysdep.h b/sysdeps/unix/alpha/sysdep.h
index e27909a..f43c7f8 100644 (file)
--- a/sysdeps/unix/alpha/sysdep.h
+++ b/sysdeps/unix/alpha/sysdep.h
@@ -19,7 +19,7 @@
 
 #include <sysdeps/unix/sysdep.h>
 
-#ifdef ASSEMBLER
+#ifdef __ASSEMBLER__
 
 #ifdef __linux__
 # include <alpha/regdef.h>

diff --git a/sysdeps/unix/bsd/hp/m68k/sysdep.h b/sysdeps/unix/bsd/hp/m68k/sysdep.h
index b0a8daa..f173ce4 100644 (file)
--- a/sysdeps/unix/bsd/hp/m68k/sysdep.h
+++ b/sysdeps/unix/bsd/hp/m68k/sysdep.h
@@ -20,7 +20,7 @@
 
 #include <sysdeps/unix/sysdep.h>
 
-#ifdef ASSEMBLER
+#ifdef __ASSEMBLER__
 
 #define        POUND   #
 
@@ -53,4 +53,4 @@
 #define        r1      d1
 #define        MOVE(x,y)       movel x , y
 
-#endif /* ASSEMBLER */
+#endif /* __ASSEMBLER__ */

diff --git a/sysdeps/unix/bsd/osf/alpha/sysdep.h b/sysdeps/unix/bsd/osf/alpha/sysdep.h
index e9ad4d5..929dfc4 100644 (file)
--- a/sysdeps/unix/bsd/osf/alpha/sysdep.h
+++ b/sysdeps/unix/bsd/osf/alpha/sysdep.h
@@ -22,7 +22,7 @@
 
 #include <sysdeps/unix/alpha/sysdep.h>
 
-#ifdef ASSEMBLER
+#ifdef __ASSEMBLER__
 
 #include <machine/pal.h>               /* get PAL_callsys */
 #include <regdef.h>

diff --git a/sysdeps/unix/bsd/sequent/i386/sysdep.h b/sysdeps/unix/bsd/sequent/i386/sysdep.h
index c54193f..90f2ed0 100644 (file)
--- a/sysdeps/unix/bsd/sequent/i386/sysdep.h
+++ b/sysdeps/unix/bsd/sequent/i386/sysdep.h
@@ -19,7 +19,7 @@
 
 #include <sysdeps/unix/i386/sysdep.h>
 
-#ifdef ASSEMBLER
+#ifdef __ASSEMBLER__
 
 /* Get the symbols for system call interrupts.  */
 #include <machine/trap.h>
@@ -79,4 +79,4 @@
 #undef scratch
 #define scratch        %edx    /* Call-clobbered register for random use.  */
 
-#endif /* ASSEMBLER */
+#endif /* __ASSEMBLER__ */

diff --git a/sysdeps/unix/bsd/sony/newsos/m68k/sysdep.h b/sysdeps/unix/bsd/sony/newsos/m68k/sysdep.h
index e459856..28cf9e2 100644 (file)
--- a/sysdeps/unix/bsd/sony/newsos/m68k/sysdep.h
+++ b/sysdeps/unix/bsd/sony/newsos/m68k/sysdep.h
@@ -18,7 +18,7 @@
 
 #include <sysdeps/unix/sysdep.h>
 
-#ifdef ASSEMBLER
+#ifdef __ASSEMBLER__
 
 #define        POUND   #
 

diff --git a/sysdeps/unix/bsd/sun/m68k/sysdep.h b/sysdeps/unix/bsd/sun/m68k/sysdep.h
index 1c501bc..8bd3861 100644 (file)
--- a/sysdeps/unix/bsd/sun/m68k/sysdep.h
+++ b/sysdeps/unix/bsd/sun/m68k/sysdep.h
@@ -18,7 +18,7 @@
 
 #include <sysdeps/unix/sysdep.h>
 
-#ifdef ASSEMBLER
+#ifdef __ASSEMBLER__
 
 #define        POUND   #
 
@@ -59,4 +59,4 @@
 #define        r1      d1
 #define        MOVE(x,y)       movel x , y
 
-#endif /* ASSEMBLER */
+#endif /* __ASSEMBLER__ */

diff --git a/sysdeps/unix/bsd/vax/sysdep.h b/sysdeps/unix/bsd/vax/sysdep.h
index a2cf007..19ab59b 100644 (file)
--- a/sysdeps/unix/bsd/vax/sysdep.h
+++ b/sysdeps/unix/bsd/vax/sysdep.h
@@ -18,7 +18,7 @@
 
 #include <sysdeps/unix/sysdep.h>
 
-#ifdef ASSEMBLER
+#ifdef __ASSEMBLER__
 
 #ifdef __STDC__
 #define        ENTRY(name)                                                           \
@@ -52,4 +52,4 @@
 
 #define MOVE(x,y)      movl x , y
 
-#endif /* ASSEMBLER */
+#endif /* __ASSEMBLER__ */

diff --git a/sysdeps/unix/mips/sysdep.h b/sysdeps/unix/mips/sysdep.h
index cbafbdc..4514d07 100644 (file)
--- a/sysdeps/unix/mips/sysdep.h
+++ b/sysdeps/unix/mips/sysdep.h
@@ -19,7 +19,7 @@
 
 #include <sysdeps/unix/sysdep.h>
 
-#ifdef ASSEMBLER
+#ifdef __ASSEMBLER__
 
 #include <regdef.h>
 

diff --git a/sysdeps/unix/sysv/linux/alpha/sysdep.h b/sysdeps/unix/sysv/linux/alpha/sysdep.h
index 6c88f76..29d973f 100644 (file)
--- a/sysdeps/unix/sysv/linux/alpha/sysdep.h
+++ b/sysdeps/unix/sysv/linux/alpha/sysdep.h
@@ -17,7 +17,7 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#ifdef ASSEMBLER
+#ifdef __ASSEMBLER__
 
 #include <asm/pal.h>
 #include <alpha/regdef.h>

diff --git a/sysdeps/unix/sysv/linux/arm/sysdep.h b/sysdeps/unix/sysv/linux/arm/sysdep.h
index 14dd17c..381ce26 100644 (file)
--- a/sysdeps/unix/sysv/linux/arm/sysdep.h
+++ b/sysdeps/unix/sysv/linux/arm/sysdep.h
@@ -33,7 +33,7 @@
 #define SYS_ify(syscall_name)  (__NR_##syscall_name)
 
 
-#ifdef ASSEMBLER
+#ifdef __ASSEMBLER__
 
 /* Linux uses a negative return value to indicate syscall errors,
    unlike most Unices, which use the condition codes' carry flag.
@@ -104,6 +104,6 @@
 #define UNDOARGS_4 /* nothing */
 #define UNDOARGS_5 ldr r4, [sp];
 
-#endif /* ASSEMBLER */
+#endif /* __ASSEMBLER__ */
 
 #endif /* linux/arm/sysdep.h */

diff --git a/sysdeps/unix/sysv/linux/m68k/sysdep.h b/sysdeps/unix/sysv/linux/m68k/sysdep.h
index 4d9249d..8fdd26f 100644 (file)
--- a/sysdeps/unix/sysv/linux/m68k/sysdep.h
+++ b/sysdeps/unix/sysv/linux/m68k/sysdep.h
@@ -32,7 +32,7 @@
 # define SYS_ify(syscall_name) __NR_/**/syscall_name
 #endif
 
-#ifdef ASSEMBLER
+#ifdef __ASSEMBLER__
 
 /* Linux uses a negative return value to indicate syscall errors, unlike
    most Unices, which use the condition codes' carry flag.
@@ -149,4 +149,4 @@ syscall_error:                                                                    \
 #define        MOVE(x,y)       movel x , y
 #endif
 
-#endif /* ASSEMBLER */
+#endif /* __ASSEMBLER__ */

diff --git a/sysdeps/unix/sysv/sysv4/solaris2/sparc/sysdep.h b/sysdeps/unix/sysv/sysv4/solaris2/sparc/sysdep.h
index 7cc10fd..1530ff6 100644 (file)
--- a/sysdeps/unix/sysv/sysv4/solaris2/sparc/sysdep.h
+++ b/sysdeps/unix/sysv/sysv4/solaris2/sparc/sysdep.h
@@ -24,7 +24,7 @@
 
 #include <sysdeps/unix/sysdep.h>
 
-#ifdef ASSEMBLER
+#ifdef __ASSEMBLER__
 
 /* As of gcc-2.6.0, it complains about pound signs in front of things
    that aren't arguments to the macro.  So we use this to pull it off
@@ -51,4 +51,4 @@
 #define        r1              %o1
 #define        MOVE(x,y)       mov x, y
 
-#endif /* ASSEMBLER */
+#endif /* __ASSEMBLER__ */