Make config(8) choose which source files to exclude, from the kernel

configuration file options, rather than putting ugly preprocessor
statements and compile empty files.

5 files changed, 9 insertions, 28 deletions

diff --git a/sys/arch/mvme88k/conf/files.mvme88k b/sys/arch/mvme88k/conf/files.mvme88k
index 8f9c433a1b2..bff0c508a1a 100644
--- a/sys/arch/mvme88k/conf/files.mvme88k
+++ b/sys/arch/mvme88k/conf/files.mvme88k
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.mvme88k,v 1.10 2001/05/11 07:13:15 deraadt Exp $
+#	$OpenBSD: files.mvme88k,v 1.11 2001/08/07 22:12:27 miod Exp $
 #	
 maxpartitions 16
 
@@ -92,15 +92,15 @@ file	arch/mvme88k/mvme88k/autoconf.c
 file	arch/mvme88k/mvme88k/conf.c
 file	arch/mvme88k/mvme88k/cmmu.c
 file	arch/mvme88k/mvme88k/m18x_cmmu.c
-file	arch/mvme88k/mvme88k/m197_cmmu.c
+file	arch/mvme88k/mvme88k/m197_cmmu.c		mvme197
 file	arch/mvme88k/mvme88k/disksubr.c
 file	arch/mvme88k/mvme88k/dkbad.c
 file	arch/mvme88k/mvme88k/eh.S
 file	arch/mvme88k/mvme88k/locore_asm_routines.S
 file	arch/mvme88k/mvme88k/locore_c_routines.c
-file	arch/mvme88k/mvme88k/m88100_fp.S
-file	arch/mvme88k/mvme88k/m88110_fp.S
-file	arch/mvme88k/mvme88k/m88110_mmu.S
+file	arch/mvme88k/mvme88k/m88100_fp.S		mvme187 | mvme188
+file	arch/mvme88k/mvme88k/m88110_fp.S		mvme197
+file	arch/mvme88k/mvme88k/m88110_mmu.S		mvme197
 file	arch/mvme88k/mvme88k/machdep.c
 file	arch/mvme88k/mvme88k/mem.c
 file	arch/mvme88k/mvme88k/pmap.c
diff --git a/sys/arch/mvme88k/mvme88k/m197_cmmu.c b/sys/arch/mvme88k/mvme88k/m197_cmmu.c
index bf17ea716b6..c4ab34d2c4c 100644
--- a/sys/arch/mvme88k/mvme88k/m197_cmmu.c
+++ b/sys/arch/mvme88k/mvme88k/m197_cmmu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: m197_cmmu.c,v 1.3 2000/12/28 21:21:24 smurph Exp $	*/
+/*	$OpenBSD: m197_cmmu.c,v 1.4 2001/08/07 22:12:31 miod Exp $	*/
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -57,8 +57,6 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */
-#ifdef MVME197
-
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/simplelock.h>
@@ -97,7 +95,6 @@ extern unsigned cache_policy;
 extern unsigned cpu_sets[];
 extern unsigned number_cpus;
 extern unsigned master_cpu;
-extern int      max_cpus, max_cmmus;
 extern int      cpu_cmmu_ratio;
 int init_done;
 
@@ -807,7 +804,3 @@ m197_table_search(pmap_t map, vm_offset_t virt, int write, int kernel, int data)
 	}
 	return 0;
 }
-
-#endif /* MVME197 */
-
-
diff --git a/sys/arch/mvme88k/mvme88k/m88100_fp.S b/sys/arch/mvme88k/mvme88k/m88100_fp.S
index d1824335c06..fcedb50b037 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.9 2001/05/20 05:53:10 miod Exp $	*/
+/* $OpenBSD: m88100_fp.S,v 1.10 2001/08/07 22:12:31 miod Exp $	*/
 /*
  * Mach Operating System
  * Copyright (c) 1991 Carnegie Mellon University
@@ -31,7 +31,6 @@
 #include <machine/trap.h>
 #include <machine/asm.h>
 
-#if defined(MVME187) || defined(MVME188)
 #define psr cr1
 #define spsr cr2
 #define ssb cr3
@@ -2299,4 +2298,3 @@ Iwritesingle:
 	st	r11, r3 [r2]
 /* Return.. */
 	jmp	r1
-#endif /* defined(MVME187) || defined(MVME188) */
diff --git a/sys/arch/mvme88k/mvme88k/m88110_fp.S b/sys/arch/mvme88k/mvme88k/m88110_fp.S
index 3fda66c8e14..f6d7c88ba2d 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.4 2001/05/20 05:53:10 miod Exp $	*/
+/* $OpenBSD: m88110_fp.S,v 1.5 2001/08/07 22:12:31 miod Exp $	*/
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
  * All rights reserved.
@@ -52,7 +52,6 @@
 #include <machine/trap.h>
 #include <machine/asm.h>
 
-#ifdef MVME197
 	.text
 ENTRY(m88110_Xfp_precise)
 	or	r29, r3, r0     /*  r29 is now the E.F. */
@@ -259,5 +258,3 @@ ENTRY(get_mmureg)
 	ldcr	r2,	cr26
 regmark2: jmp.n	r1
 	ldcr	r2,	cr25
-#endif /* MVME197 */
-	
diff --git a/sys/arch/mvme88k/mvme88k/m88110_mmu.S b/sys/arch/mvme88k/mvme88k/m88110_mmu.S
index c7c112b28fc..b3230e4d49e 100644
--- a/sys/arch/mvme88k/mvme88k/m88110_mmu.S
+++ b/sys/arch/mvme88k/mvme88k/m88110_mmu.S
@@ -1,12 +1,7 @@
-#	$OpenBSD: m88110_mmu.S,v 1.3 2001/07/04 08:09:24 niklas Exp $
-
-#ifndef ASSEMBLER
-#define	ASSEMBLER
-#endif /* ASSEMBLER */
+#	$OpenBSD: m88110_mmu.S,v 1.4 2001/08/07 22:12:31 miod Exp $
 
 #include <machine/asm.h>
 
-#ifdef MVME197
 /* set routines */
 ENTRY(set_icmd)
 	jmp.n	r1
@@ -161,5 +156,3 @@ ENTRY(get_dlar)
 ENTRY(get_dpar)
 	jmp.n	r1
 	ldcr	r2, DPAR
-#endif /* MVME197 */
-