From a1350964e9872e8b6b7737df25bab7fd756e5c40 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Fri, 27 Jan 1995 20:48:38 +0000 Subject: [PATCH] [ASSEMBLER]: Protect macros with this. --- sysdeps/unix/bsd/Attic/osf1/alpha/sysdep.h | 7 ++++++- sysdeps/unix/bsd/sequent/i386/sysdep.h | 6 +++++- sysdeps/unix/bsd/sony/newsos/m68k/sysdep.h | 8 +++++--- sysdeps/unix/bsd/sun/m68k/sysdep.h | 8 +++++--- sysdeps/unix/bsd/vax/sysdep.h | 6 +++++- sysdeps/unix/mips/sysdep.h | 7 ++++++- sysdeps/unix/sysv/sysv4/solaris2/sparc/sysdep.h | 5 ++++- 7 files changed, 36 insertions(+), 11 deletions(-) diff --git a/sysdeps/unix/bsd/Attic/osf1/alpha/sysdep.h b/sysdeps/unix/bsd/Attic/osf1/alpha/sysdep.h index 279461b089..3669a69b9b 100644 --- a/sysdeps/unix/bsd/Attic/osf1/alpha/sysdep.h +++ b/sysdeps/unix/bsd/Attic/osf1/alpha/sysdep.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1993 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1995 Free Software Foundation, Inc. Contributed by Brendan Kehoe (brendan@zen.org). The GNU C Library is free software; you can redistribute it and/or @@ -17,6 +17,9 @@ not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include + +#ifdef ASSEMBLER + #include /* get PAL_callsys */ #include @@ -66,3 +69,5 @@ Cambridge, MA 02139, USA. */ #define r0 v0 #define r1 a4 #define MOVE(x,y) mov x, y + +#endif /* ASSEMBLER */ diff --git a/sysdeps/unix/bsd/sequent/i386/sysdep.h b/sysdeps/unix/bsd/sequent/i386/sysdep.h index 05fe24cef7..f1365e764e 100644 --- a/sysdeps/unix/bsd/sequent/i386/sysdep.h +++ b/sysdeps/unix/bsd/sequent/i386/sysdep.h @@ -1,5 +1,5 @@ /* System call interface code for Sequent Symmetry running Dynix version 3. -Copyright (C) 1993 Free Software Foundation, Inc. +Copyright (C) 1993, 1995 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 @@ -19,6 +19,8 @@ Cambridge, MA 02139, USA. */ #include +#ifdef ASSEMBLER + /* Get the symbols for system call interrupts. */ #include @@ -76,3 +78,5 @@ Cambridge, MA 02139, USA. */ #define r1 %ecx /* Secondary return-value register. */ #undef scratch #define scratch %edx /* Call-clobbered register for random use. */ + +#endif /* ASSEMBLER */ diff --git a/sysdeps/unix/bsd/sony/newsos/m68k/sysdep.h b/sysdeps/unix/bsd/sony/newsos/m68k/sysdep.h index 43ef480ee9..a62c17edbc 100644 --- a/sysdeps/unix/bsd/sony/newsos/m68k/sysdep.h +++ b/sysdeps/unix/bsd/sony/newsos/m68k/sysdep.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1994 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1994, 1995 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 @@ -16,10 +16,10 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* This code wants to be run through m4. */ - #include +#ifdef ASSEMBLER + #define POUND # #ifdef __STDC__ @@ -52,3 +52,5 @@ Cambridge, MA 02139, USA. */ #define r0 d0 #define r1 d1 #define MOVE(x,y) movel x , y + +#endif diff --git a/sysdeps/unix/bsd/sun/m68k/sysdep.h b/sysdeps/unix/bsd/sun/m68k/sysdep.h index 8655f37147..80f6aba7b0 100644 --- a/sysdeps/unix/bsd/sun/m68k/sysdep.h +++ b/sysdeps/unix/bsd/sun/m68k/sysdep.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992, 1994 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1992, 1994, 1995 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 @@ -16,10 +16,10 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* This code wants to be run through m4; see sysdeps/m68k/Makefile. */ - #include +#ifdef ASSEMBLER + #define POUND # #ifdef __STDC__ @@ -58,3 +58,5 @@ Cambridge, MA 02139, USA. */ #define r0 d0 #define r1 d1 #define MOVE(x,y) movel x , y + +#endif /* ASSEMBLER */ diff --git a/sysdeps/unix/bsd/vax/sysdep.h b/sysdeps/unix/bsd/vax/sysdep.h index 60e01acf7b..aeddad99ae 100644 --- a/sysdeps/unix/bsd/vax/sysdep.h +++ b/sysdeps/unix/bsd/vax/sysdep.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1992, 1995 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 @@ -18,6 +18,8 @@ Cambridge, MA 02139, USA. */ #include +#ifdef ASSEMBLER + #ifdef __STDC__ #define ENTRY(name) \ .globl _##name; \ @@ -49,3 +51,5 @@ Cambridge, MA 02139, USA. */ #endif #define MOVE(x,y) movl x , y + +#endif /* ASSEMBLER */ diff --git a/sysdeps/unix/mips/sysdep.h b/sysdeps/unix/mips/sysdep.h index bbf742b733..ee047fb28e 100644 --- a/sysdeps/unix/mips/sysdep.h +++ b/sysdeps/unix/mips/sysdep.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1992 Free Software Foundation, Inc. +/* Copyright (C) 1992, 1995 Free Software Foundation, Inc. Contributed by Brendan Kehoe (brendan@zen.org). The GNU C Library is free software; you can redistribute it and/or @@ -17,6 +17,9 @@ not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include + +#ifdef ASSEMBLER + #include #ifdef __STDC__ @@ -65,3 +68,5 @@ syse1: #define r1 v1 /* The mips move insn is d,s. */ #define MOVE(x,y) move y , x + +#endif diff --git a/sysdeps/unix/sysv/sysv4/solaris2/sparc/sysdep.h b/sysdeps/unix/sysv/sysv4/solaris2/sparc/sysdep.h index 90e2b38427..edb98309e6 100644 --- a/sysdeps/unix/sysv/sysv4/solaris2/sparc/sysdep.h +++ b/sysdeps/unix/sysv/sysv4/solaris2/sparc/sysdep.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1994 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1994, 1995 Free Software Foundation, Inc. Contributed by Brendan Kehoe (brendan@zen.org). The GNU C Library is free software; you can redistribute it and/or @@ -21,6 +21,8 @@ Cambridge, MA 02139, USA. */ #include +#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 instead. */ @@ -46,3 +48,4 @@ Cambridge, MA 02139, USA. */ #define r1 %o1 #define MOVE(x,y) mov x, y +#endif /* ASSEMBLER */ -- 2.43.5