summaryrefslogtreecommitdiff
path: root/sysdeps
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-05-29 10:21:16 +0000
committerUlrich Drepper <drepper@redhat.com>1998-05-29 10:21:16 +0000
commit66715f834cb1f2f5c3742e94f73bd630ea4b14eb (patch)
treeddf10eb9dab578cbe895b7bf351584d47f64a2fc /sysdeps
parentf962d792472c45c9bccdc6b0697ad3d6350e9270 (diff)
downloadglibc-66715f834cb1f2f5c3742e94f73bd630ea4b14eb.tar.gz
Update.
1998-05-28 00:53 Zack Weinberg <zack@rabi.phys.columbia.edu> * glibcbug.in: Send to bugs@gnu or libc-alpha@cygnus depending on whether this is a stable release or not (keeps snapshot bug reports out of the database). * include/libc-symbols.h: Use __ASSEMBLER__ test macro not ASSEMBLER. * sysdeps/arm/sysdep.h: Likewise. * sysdeps/i386/sysdep.h: Likewise. * sysdeps/m68k/sysdep.h: Likewise. * sysdeps/mach/mips/sysdep.h: Likewise. * sysdeps/mach/sys/reboot.h: Likewise. * sysdeps/mach/sysdep.h: Likewise. * sysdeps/unix/alpha/sysdep.h: Likewise. * sysdeps/unix/bsd/hp/m68k/sysdep.h: Likewise. * sysdeps/unix/bsd/osf/alpha/sysdep.h: Likewise. * sysdeps/unix/bsd/sequent/i386/sysdep.h: Likewise. * sysdeps/unix/bsd/sony/newsos/m68k/sysdep.h: Likewise. * sysdeps/unix/bsd/sun/m68k/sysdep.h: Likewise. * sysdeps/unix/bsd/vax/sysdep.h: Likewise. * sysdeps/unix/i386/sysdep.h: Likewise. * sysdeps/unix/mips/sysdep.h: Likewise. * sysdeps/unix/sparc/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/alpha/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/arm/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/i386/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/m68k/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/powerpc/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h: Likewise. * sysdeps/unix/sysv/sysv4/solaris2/sparc/sysdep.h: Likewise. 1998-05-27 Mark Kettenis <kettenis@phys.uva.nl> * mach/Machrules: Use $(move-if-change). 1998-05-27 Mark Kettenis <kettenis@phys.uva.nl> * Makeconfig [elf=yes] (+interp): New variable, set to interp.os. * Makerules (lib%.so): Depend on $(+interp). (libc.so): Add interp.os to list of dependencies. (interp-obj): Remove variable. * mach/Machrules (+interp): Define to empty since libhurduser and libmachuser don't need to have the interpreter set. 1998-05-28 Andreas Jaeger <aj@arthur.rhein-neckar.de> * resolv/res_send.c: Security fixes from bind 4.9.7-REL. * resolv/gethnamaddr.c: Likewise. * resolv/res_comp.c: Likewise. 1998-05-28 Mark Kettenis <kettenis@phys.uva.nl> * sysdeps/mach/hurd/wait4.c (__wait4): Use ANSI-style definition so that transparent union works.
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/arm/sysdep.h4
-rw-r--r--sysdeps/i386/sysdep.h4
-rw-r--r--sysdeps/m68k/sysdep.h4
-rw-r--r--sysdeps/mach/hurd/wait4.c9
-rw-r--r--sysdeps/mach/mips/sysdep.h2
-rw-r--r--sysdeps/mach/sys/reboot.h10
-rw-r--r--sysdeps/mach/sysdep.h4
-rw-r--r--sysdeps/unix/alpha/sysdep.h2
-rw-r--r--sysdeps/unix/bsd/hp/m68k/sysdep.h4
-rw-r--r--sysdeps/unix/bsd/osf/alpha/sysdep.h2
-rw-r--r--sysdeps/unix/bsd/sequent/i386/sysdep.h4
-rw-r--r--sysdeps/unix/bsd/sony/newsos/m68k/sysdep.h2
-rw-r--r--sysdeps/unix/bsd/sun/m68k/sysdep.h4
-rw-r--r--sysdeps/unix/bsd/vax/sysdep.h4
-rw-r--r--sysdeps/unix/i386/sysdep.h4
-rw-r--r--sysdeps/unix/mips/sysdep.h2
-rw-r--r--sysdeps/unix/sparc/sysdep.h4
-rw-r--r--sysdeps/unix/sysv/linux/alpha/sysdep.h2
-rw-r--r--sysdeps/unix/sysv/linux/arm/sysdep.h4
-rw-r--r--sysdeps/unix/sysv/linux/i386/sysdep.h4
-rw-r--r--sysdeps/unix/sysv/linux/m68k/sysdep.h4
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/sysdep.h4
-rw-r--r--sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h4
-rw-r--r--sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h4
-rw-r--r--sysdeps/unix/sysv/sysv4/solaris2/sparc/sysdep.h4
25 files changed, 48 insertions, 51 deletions
diff --git a/sysdeps/arm/sysdep.h b/sysdeps/arm/sysdep.h
index eeef7aaded..4fc90aeed0 100644
--- 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/i386/sysdep.h b/sysdeps/i386/sysdep.h
index af04c4a229..1c574f8b73 100644
--- a/sysdeps/i386/sysdep.h
+++ b/sysdeps/i386/sysdep.h
@@ -19,7 +19,7 @@
#include <sysdeps/generic/sysdep.h>
-#ifdef ASSEMBLER
+#ifdef __ASSEMBLER__
/* Syntactic details of assembler. */
@@ -125,4 +125,4 @@ lose: SYSCALL_PIC_SETUP \
#define L(name) name
#endif
-#endif /* ASSEMBLER */
+#endif /* __ASSEMBLER__ */
diff --git a/sysdeps/m68k/sysdep.h b/sysdeps/m68k/sysdep.h
index 58789f77b5..1770a09410 100644
--- 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/hurd/wait4.c b/sysdeps/mach/hurd/wait4.c
index 8d29875032..0b505ba0d8 100644
--- a/sysdeps/mach/hurd/wait4.c
+++ b/sysdeps/mach/hurd/wait4.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 94, 95, 96, 97, 98 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -23,11 +23,8 @@
#include <hurd/port.h>
pid_t
-__wait4 (pid, stat_loc, options, usage)
- pid_t pid;
- __WAIT_STATUS_DEFN stat_loc;
- int options;
- struct rusage *usage;
+__wait4 (pid_t pid, __WAIT_STATUS_DEFN stat_loc, int options,
+ struct rusage *usage)
{
pid_t dead;
error_t err;
diff --git a/sysdeps/mach/mips/sysdep.h b/sysdeps/mach/mips/sysdep.h
index a4e6dff148..7bacb02cf4 100644
--- 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/mach/sys/reboot.h b/sysdeps/mach/sys/reboot.h
index 6435fea00c..1a2a5f56b2 100644
--- a/sysdeps/mach/sys/reboot.h
+++ b/sysdeps/mach/sys/reboot.h
@@ -26,8 +26,8 @@
/*
* HISTORY
* $Log$
- * Revision 1.1 1993/08/03 22:25:15 roland
- * entered into RCS
+ * Revision 1.2 1998/05/29 10:19:59 drepper
+ * Use __ASSEMBLER__ test macro not ASSEMBLER.
*
* Revision 1.1 1993/08/03 22:25:15 roland
* entered into RCS
@@ -43,7 +43,7 @@
* Revision 2.6 91/06/19 11:59:44 rvb
* Second byte of boothowto is flags for "startup" program.
* [91/06/18 rvb]
- * Add ifndef ASSEMBLER so that vax_init.s can include it.
+ * Add ifndef __ASSEMBLER__ so that vax_init.s can include it.
* [91/06/11 rvb]
*
* Revision 2.5 91/05/14 17:40:11 mrt
@@ -145,9 +145,9 @@
#ifdef KERNEL
-#ifndef ASSEMBLER
+#ifndef __ASSEMBLER__
extern int boothowto;
-#endif ASSEMBLER
+#endif /* __ASSEMBLER__ */
#endif
#endif /* _SYS_REBOOT_H_ */
diff --git a/sysdeps/mach/sysdep.h b/sysdeps/mach/sysdep.h
index 6b09fcf684..123e7105da 100644
--- a/sysdeps/mach/sysdep.h
+++ b/sysdeps/mach/sysdep.h
@@ -16,7 +16,7 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#ifdef ASSEMBLER
+#ifdef __ASSEMBLER__
/* Get the Mach definitions of ENTRY and kernel_trap. */
#include <mach/machine/syscall_sw.h>
@@ -45,7 +45,7 @@
try to do anything else. Just to be safe, deallocate the reply port so
bogons arriving on it don't foul up future RPCs. */
-#ifndef ASSEMBLER
+#ifndef __ASSEMBLER__
#define FATAL_PREPARE_INCLUDE <mach/mig_support.h>
#define FATAL_PREPARE __mig_dealloc_reply_port (MACH_PORT_NULL)
#endif
diff --git a/sysdeps/unix/alpha/sysdep.h b/sysdeps/unix/alpha/sysdep.h
index e27909ad9b..f43c7f8edf 100644
--- 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 b0a8daa318..f173ce4d0d 100644
--- 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 e9ad4d5fac..929dfc4013 100644
--- 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 c54193fec2..90f2ed09d4 100644
--- 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 e459856ff9..28cf9e22d1 100644
--- 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 1c501bcb5a..8bd3861e91 100644
--- 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 a2cf00750f..19ab59b615 100644
--- 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/i386/sysdep.h b/sysdeps/unix/i386/sysdep.h
index 97fb1dc4a2..ff2c6ab95b 100644
--- a/sysdeps/unix/i386/sysdep.h
+++ b/sysdeps/unix/i386/sysdep.h
@@ -19,7 +19,7 @@
#include <sysdeps/unix/sysdep.h>
#include <sysdeps/i386/sysdep.h>
-#ifdef ASSEMBLER
+#ifdef __ASSEMBLER__
/* This is defined as a separate macro so that other sysdep.h files
can include this one and then redefine DO_CALL. */
@@ -33,4 +33,4 @@
#define scratch %ecx /* Call-clobbered register for random use. */
#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 cbafbdcd9a..4514d07c66 100644
--- 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/sparc/sysdep.h b/sysdeps/unix/sparc/sysdep.h
index 576813a52c..3534048547 100644
--- a/sysdeps/unix/sparc/sysdep.h
+++ b/sysdeps/unix/sparc/sysdep.h
@@ -18,7 +18,7 @@
#include <sysdeps/unix/sysdep.h>
-#ifdef ASSEMBLER
+#ifdef __ASSEMBLER__
#ifdef NO_UNDERSCORES
/* Since C identifiers are not normally prefixed with an underscore
@@ -57,4 +57,4 @@
#define r1 %o1
#define MOVE(x,y) mov x, y
-#endif /* ASSEMBLER */
+#endif /* __ASSEMBLER__ */
diff --git a/sysdeps/unix/sysv/linux/alpha/sysdep.h b/sysdeps/unix/sysv/linux/alpha/sysdep.h
index 6c88f76eaf..29d973f5b9 100644
--- 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 14dd17c02a..381ce26979 100644
--- 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/i386/sysdep.h b/sysdeps/unix/sysv/linux/i386/sysdep.h
index 2bb82a2009..5231d3e9a1 100644
--- a/sysdeps/unix/sysv/linux/i386/sysdep.h
+++ b/sysdeps/unix/sysv/linux/i386/sysdep.h
@@ -34,7 +34,7 @@
#undef L
#define L(name) .L##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.
@@ -195,6 +195,6 @@ syscall_error: \
#define _DOARGS_5(n) movl n(%esp), %edi; _DOARGS_4 (n-4)
#define _POPARGS_5 _POPARGS_4; popl %edi
-#endif /* ASSEMBLER */
+#endif /* __ASSEMBLER__ */
#endif /* linux/i386/sysdep.h */
diff --git a/sysdeps/unix/sysv/linux/m68k/sysdep.h b/sysdeps/unix/sysv/linux/m68k/sysdep.h
index 4d9249d34d..8fdd26f52f 100644
--- 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/linux/powerpc/sysdep.h b/sysdeps/unix/sysv/linux/powerpc/sysdep.h
index c75e2a88ba..55f0891b0c 100644
--- a/sysdeps/unix/sysv/linux/powerpc/sysdep.h
+++ b/sysdeps/unix/sysv/linux/powerpc/sysdep.h
@@ -29,7 +29,7 @@
# define SYS_ify(syscall_name) __NR_/**/syscall_name
#endif
-#ifdef ASSEMBLER
+#ifdef __ASSEMBLER__
/* This seems to always be the case on PPC. */
#define ALIGNARG(log2) log2
@@ -141,4 +141,4 @@
#undef L
#define L(x) .L##x
-#endif /* ASSEMBLER */
+#endif /* __ASSEMBLER__ */
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h b/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h
index 730332f367..003c0483a8 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h
@@ -25,7 +25,7 @@
#undef SYS_ify
#define SYS_ify(syscall_name) __NR_##syscall_name
-#ifdef ASSEMBLER
+#ifdef __ASSEMBLER__
#ifdef DONT_LOAD_G1
# define LOADSYSCALL(x)
@@ -82,6 +82,6 @@
SYSCALL_ERROR_HANDLER; \
9000:;
-#endif /* ASSEMBLER */
+#endif /* __ASSEMBLER__ */
#endif /* linux/sparc/sysdep.h */
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h b/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h
index 1a3736201c..2cc8547c1a 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h
@@ -25,7 +25,7 @@
#undef SYS_ify
#define SYS_ify(syscall_name) __NR_##syscall_name
-#ifdef ASSEMBLER
+#ifdef __ASSEMBLER__
#ifdef DONT_LOAD_G1
# define LOADSYSCALL(x)
@@ -116,7 +116,7 @@
#define r1 %o1
#define MOVE(x,y) mov x, y
-#endif /* ASSEMBLER */
+#endif /* __ASSEMBLER__ */
/* This is the offset from the %sp to the backing store above the
register windows. So if you poke stack memory directly you add this. */
diff --git a/sysdeps/unix/sysv/sysv4/solaris2/sparc/sysdep.h b/sysdeps/unix/sysv/sysv4/solaris2/sparc/sysdep.h
index 7cc10fd44f..1530ff64d5 100644
--- 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__ */