Get rid of definitions of ASSEMBLER, LOCORE and such. We will get

the correct defines from the Makefile now.

6 files changed, 7 insertions, 32 deletions

diff --git a/sys/arch/mvme88k/mvme88k/eh.S b/sys/arch/mvme88k/mvme88k/eh.S
index ac358533514..78415e6a6dd 100644
--- a/sys/arch/mvme88k/mvme88k/eh.S
+++ b/sys/arch/mvme88k/mvme88k/eh.S
@@ -1,4 +1,4 @@
-/*   $OpenBSD: eh.S,v 1.10 2001/02/01 03:38:19 smurph Exp $   */
+/*   $OpenBSD: eh.S,v 1.11 2001/03/07 23:40:35 miod Exp $   */
 /*
  * Mach Operating System
  * Copyright (c) 1993-1991 Carnegie Mellon University
@@ -213,10 +213,6 @@
  *
  */
 
-#ifndef ASSEMBLER
-#define ASSEMBLER
-#endif
-
 #include "assym.s"
 #include <machine/trap.h>           /* for T_ defines */
 #include <machine/asm.h>
diff --git a/sys/arch/mvme88k/mvme88k/locore.S b/sys/arch/mvme88k/mvme88k/locore.S
index 7319705b686..3947496a863 100644
--- a/sys/arch/mvme88k/mvme88k/locore.S
+++ b/sys/arch/mvme88k/mvme88k/locore.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: locore.S,v 1.11 2001/02/12 08:16:24 smurph Exp $	*/
+/*	$OpenBSD: locore.S,v 1.12 2001/03/07 23:40:35 miod Exp $	*/
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -57,10 +57,6 @@
  * rights to redistribute these changes.
  */
 
-#ifndef ASSEMBLER
-#define ASSEMBLER
-#endif
-
 #include "assym.s"
 #include "machine/asm.h"
 #include "machine/trap.h"
diff --git a/sys/arch/mvme88k/mvme88k/locore_asm_routines.S b/sys/arch/mvme88k/mvme88k/locore_asm_routines.S
index e308358ec7b..8f8458e4c87 100644
--- a/sys/arch/mvme88k/mvme88k/locore_asm_routines.S
+++ b/sys/arch/mvme88k/mvme88k/locore_asm_routines.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: locore_asm_routines.S,v 1.10 2001/02/01 03:38:20 smurph Exp $	*/
+/* $OpenBSD: locore_asm_routines.S,v 1.11 2001/03/07 23:40:35 miod Exp $	*/
 /*
  * Mach Operating System
  * Copyright (c) 1993-1992 Carnegie Mellon University
@@ -36,10 +36,6 @@
  *
  **************************************************************RCS*****/
 
-#ifndef ASSEMBLER
-# define ASSEMBLER
-#endif
-
 #include "assym.s"
 #include <machine/trap.h>
 #include <machine/cpu_number.h>
diff --git a/sys/arch/mvme88k/mvme88k/m88100_fp.S b/sys/arch/mvme88k/mvme88k/m88100_fp.S
index c80d4eeb15f..470cd0b93b7 100644
--- a/sys/arch/mvme88k/mvme88k/m88100_fp.S
+++ b/sys/arch/mvme88k/mvme88k/m88100_fp.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: m88100_fp.S,v 1.6 1999/09/27 19:13:22 smurph Exp $	*/
+/* $OpenBSD: m88100_fp.S,v 1.7 2001/03/07 23:40:35 miod Exp $	*/
 /*
  * Mach Operating System
  * Copyright (c) 1991 Carnegie Mellon University
@@ -28,10 +28,6 @@
 
 /* Floating point trouble routines */
 
-#define LOCORE
-
-#define ASSEMBLER
-
 #include "assym.s"
 #include <machine/trap.h>
 #include <machine/asm.h>
diff --git a/sys/arch/mvme88k/mvme88k/m88110_fp.S b/sys/arch/mvme88k/mvme88k/m88110_fp.S
index 365e74ad12f..f291e184150 100644
--- a/sys/arch/mvme88k/mvme88k/m88110_fp.S
+++ b/sys/arch/mvme88k/mvme88k/m88110_fp.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: m88110_fp.S,v 1.1 1999/09/27 19:13:23 smurph Exp $	*/
+/* $OpenBSD: m88110_fp.S,v 1.2 2001/03/07 23:40:35 miod Exp $	*/
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
  * All rights reserved.
@@ -48,9 +48,6 @@
  * 2) Floating Point Privilege Violation
  */
 
-#define LOCORE
-#define ASSEMBLER
-
 #include "assym.s"
 #include <machine/trap.h>
 #include <machine/asm.h>
diff --git a/sys/arch/mvme88k/mvme88k/process.S b/sys/arch/mvme88k/mvme88k/process.S
index 34d7867ede5..0768e87930c 100644
--- a/sys/arch/mvme88k/mvme88k/process.S
+++ b/sys/arch/mvme88k/mvme88k/process.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: process.S,v 1.6 2001/01/12 07:29:26 smurph Exp $	*/
+/*	$OpenBSD: process.S,v 1.7 2001/03/07 23:40:35 miod Exp $	*/
 /*
  * Copyright (c) 1996 Nivas Madhur
  * All rights reserved.
@@ -29,18 +29,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
-#ifndef ASSEMBLER
-#define ASSEMBLER
-#endif
 
 #include "assym.s"
 #include "machine/asm.h"
 #include "machine/psl.h"
 
-#ifndef NBPG
-#define	NBPG 4096
-#endif /* NBPG */
-
 	data
 	align 4
 Lsw0:
@@ -344,3 +337,4 @@ ENTRY(savectx)
 	st	r2, r10, PCB_IPL	/* save interrupt mask */
 	jmp.n	r1
 	or	r2,r0,r0
+