From 95895b842e6e3fac88cae5d30692340dbee9e8af Mon Sep 17 00:00:00 2001
From: cgd <cgd@NetBSD.org>
Date: Thu, 20 May 1993 14:32:17 +0000
Subject: [PATCH] update config files for correct "cpu" usage

---
 sys/arch/i386/conf/AHATEST        | 6 ++++--
 sys/arch/i386/conf/AHBTEST        | 6 ++++--
 sys/arch/i386/conf/ALL            | 6 ++++--
 sys/arch/i386/conf/BOAT_ANCHOR    | 4 ++--
 sys/arch/i386/conf/BTTEST         | 6 ++++--
 sys/arch/i386/conf/CLIENT         | 6 ++++--
 sys/arch/i386/conf/DEVEL          | 6 ++++--
 sys/arch/i386/conf/DUALITY        | 4 ++--
 sys/arch/i386/conf/GENERICAHA     | 6 ++++--
 sys/arch/i386/conf/GENERICAHA_DDB | 6 ++++--
 sys/arch/i386/conf/GENERICAHB     | 6 ++++--
 sys/arch/i386/conf/GENERICAHBBT   | 6 ++++--
 sys/arch/i386/conf/GENERICISA     | 6 ++++--
 sys/arch/i386/conf/GENERICISA_DDB | 6 ++++--
 sys/arch/i386/conf/LARGE          | 6 ++++--
 sys/arch/i386/conf/ODYSSEUS       | 5 +++--
 sys/arch/i386/conf/PAIN           | 4 ++--
 sys/arch/i386/conf/PHOENIX        | 5 +++--
 sys/arch/i386/conf/SERVER         | 6 ++++--
 sys/arch/i386/conf/SMALL          | 6 ++++--
 sys/arch/i386/conf/SUMNER         | 4 ++--
 sys/arch/i386/conf/SUN_LAMP       | 4 ++--
 sys/arch/i386/conf/TDR            | 7 ++++---
 sys/arch/i386/conf/TRINITY        | 5 ++---
 sys/arch/i386/conf/UHATEST        | 6 ++++--
 sys/arch/i386/conf/files.i386     | 4 ++--
 26 files changed, 88 insertions(+), 54 deletions(-)

diff --git a/sys/arch/i386/conf/AHATEST b/sys/arch/i386/conf/AHATEST
index f04af33a8c48..3d48c16fb7be 100644
--- a/sys/arch/i386/conf/AHATEST
+++ b/sys/arch/i386/conf/AHATEST
@@ -1,10 +1,11 @@
 #
 # SCSITEST -- Generic ISA machine -- scsi test kernel
 #
-#	$Id: AHATEST,v 1.11 1993/05/07 08:33:00 cgd Exp $
+#	$Id: AHATEST,v 1.12 1993/05/20 14:32:17 cgd Exp $
 #
 machine		"i386"
-cpu		"i386"
+cpu		"I386_CPU"
+cpu		"I486_CPU"
 ident		SCSITEST
 timezone	8 dst
 maxusers	10
@@ -13,6 +14,7 @@ options		"COMPAT_43"
 options		"TCP_COMPAT_42"
 options		SCSI
 options		DDB
+options		"MATH_EMULATE"
 
 config		netbsd	root on wd0 swap on wd0 and sd0
 
diff --git a/sys/arch/i386/conf/AHBTEST b/sys/arch/i386/conf/AHBTEST
index 205b0a715ec0..a574bc29f6fb 100644
--- a/sys/arch/i386/conf/AHBTEST
+++ b/sys/arch/i386/conf/AHBTEST
@@ -1,10 +1,11 @@
 #
 # SCSITEST -- Generic ISA machine -- scsi test kernel
 #
-#	$Id: AHBTEST,v 1.11 1993/05/07 08:33:02 cgd Exp $
+#	$Id: AHBTEST,v 1.12 1993/05/20 14:32:18 cgd Exp $
 #
 machine		"i386"
-cpu		"i386"
+cpu		"I386_CPU"
+cpu		"I486_CPU"
 ident		SCSITEST
 timezone	8 dst
 maxusers	10
@@ -13,6 +14,7 @@ options		"COMPAT_43"
 options		"TCP_COMPAT_42"
 options		SCSI
 options 	DDB
+options		"MATH_EMULATE"
 
 config		netbsd	root on sd0 swap on sd0
 
diff --git a/sys/arch/i386/conf/ALL b/sys/arch/i386/conf/ALL
index 5cda75fd5196..1b8c214d4b25 100644
--- a/sys/arch/i386/conf/ALL
+++ b/sys/arch/i386/conf/ALL
@@ -1,10 +1,11 @@
 #
 #	ALL -- everything that's currently supported
 #
-#	$Id: ALL,v 1.7 1993/05/07 08:32:23 cgd Exp $
+#	$Id: ALL,v 1.8 1993/05/20 14:32:19 cgd Exp $
 #
 machine		"i386"
-cpu		"i386"
+cpu		"I386_CPU"
+cpu		"I486_CPU"
 ident		ALL
 timezone	8 dst
 maxusers	30
@@ -28,6 +29,7 @@ options DDB
 options FDESC
 options KERNFS
 options SCSI
+options	"MATH_EMULATE"
 
 options		"COMPAT_43"
 options		"TCP_COMPAT_42"
diff --git a/sys/arch/i386/conf/BOAT_ANCHOR b/sys/arch/i386/conf/BOAT_ANCHOR
index b825757cfc2a..5cde9295cb7b 100644
--- a/sys/arch/i386/conf/BOAT_ANCHOR
+++ b/sys/arch/i386/conf/BOAT_ANCHOR
@@ -1,10 +1,10 @@
 #
 #	BOAT_ANCHOR -- kernel for the 386-20 the gang uses for testing
 #
-#	$Id: BOAT_ANCHOR,v 1.13 1993/05/07 08:33:04 cgd Exp $
+#	$Id: BOAT_ANCHOR,v 1.14 1993/05/20 14:32:20 cgd Exp $
 #
 machine		"i386"
-cpu		"i386"
+cpu		"I386_CPU"
 ident		BOAT_ANCHOR
 timezone	8 dst
 maxusers	10
diff --git a/sys/arch/i386/conf/BTTEST b/sys/arch/i386/conf/BTTEST
index bd785e4b75a2..ec30a72f03af 100644
--- a/sys/arch/i386/conf/BTTEST
+++ b/sys/arch/i386/conf/BTTEST
@@ -1,10 +1,11 @@
 #
 #	SCSITEST -- Generic ISA machine -- scsi test kernel
 #
-#	$Id: BTTEST,v 1.11 1993/05/07 08:33:07 cgd Exp $
+#	$Id: BTTEST,v 1.12 1993/05/20 14:32:21 cgd Exp $
 #
 machine		"i386"
-cpu		"i386"
+cpu		"I386_CPU"
+cpu		"I486_CPU"
 ident		SCSITEST
 timezone	8 dst
 maxusers	10
@@ -13,6 +14,7 @@ options		"COMPAT_43"
 options		"TCP_COMPAT_42"
 options		SCSI
 options		DDB
+options		"MATH_EMULATE"
 
 config		netbsd	root on sd0 swap on sd0
 
diff --git a/sys/arch/i386/conf/CLIENT b/sys/arch/i386/conf/CLIENT
index 3ae71545ad06..04e3ad8f4f76 100644
--- a/sys/arch/i386/conf/CLIENT
+++ b/sys/arch/i386/conf/CLIENT
@@ -1,10 +1,11 @@
 #
 #	CLIENT -- an NFS client machine
 #
-#	$Id: CLIENT,v 1.6 1993/05/07 08:33:08 cgd Exp $
+#	$Id: CLIENT,v 1.7 1993/05/20 14:32:23 cgd Exp $
 #
 machine		"i386"
-cpu		"i386"
+cpu		"I386_CPU"
+cpu		"I486_CPU"
 ident		CLIENT
 timezone	8 dst
 maxusers	10
@@ -14,6 +15,7 @@ options		"TCP_COMPAT_42"
 options		"i387"
 options		XSERVER,UCONSOLE
 options		KERNFS,FDESC,DDB
+options		"MATH_EMULATE"
 
 config		netbsd	root on wd0 swap on wd0 and as0
 
diff --git a/sys/arch/i386/conf/DEVEL b/sys/arch/i386/conf/DEVEL
index 9e5982de33f1..247112f72b81 100644
--- a/sys/arch/i386/conf/DEVEL
+++ b/sys/arch/i386/conf/DEVEL
@@ -1,16 +1,18 @@
 #
 # Developement config
 #
-#	$Id: DEVEL,v 1.6 1993/05/07 08:33:10 cgd Exp $
+#	$Id: DEVEL,v 1.7 1993/05/20 14:32:24 cgd Exp $
 #
 machine		"i386"
-cpu		"i386"
+cpu		"I386_CPU"
+cpu		"I486_CPU"
 ident		DEVEL
 timezone	8 dst
 maxusers	2
 options		INET,DDB
 options		"COMPAT_43"
 options		"TCP_COMPAT_42"
+options		"MATH_EMULATE"
 
 config		netbsd	root on dk0 swap on dk0
 
diff --git a/sys/arch/i386/conf/DUALITY b/sys/arch/i386/conf/DUALITY
index ca975001e9e5..a9522483b6fc 100644
--- a/sys/arch/i386/conf/DUALITY
+++ b/sys/arch/i386/conf/DUALITY
@@ -1,11 +1,11 @@
 #
 # DUALITY -- Mycroft's 486 box
 #
-#	$Id: DUALITY,v 1.7 1993/05/07 08:33:12 cgd Exp $
+#	$Id: DUALITY,v 1.8 1993/05/20 14:32:26 cgd Exp $
 #
 
 machine		"i386"
-cpu		"i486"
+cpu		"I486_CPU"
 ident		DUALITY
 timezone	5 dst
 maxusers	16
diff --git a/sys/arch/i386/conf/GENERICAHA b/sys/arch/i386/conf/GENERICAHA
index a660eaf80eb9..96540bc15801 100644
--- a/sys/arch/i386/conf/GENERICAHA
+++ b/sys/arch/i386/conf/GENERICAHA
@@ -1,11 +1,12 @@
 #
 # GENERICISA -- Generic ISA machine -- distribution floppy
 #
-#	$Id: GENERICAHA,v 1.15 1993/05/07 08:33:20 cgd Exp $
+#	$Id: GENERICAHA,v 1.16 1993/05/20 14:32:29 cgd Exp $
 #
 
 machine		"i386"
-cpu		"i386"
+cpu		"I386_CPU"
+cpu		"I486_CPU"
 ident		GENERICISA
 timezone	8 dst
 maxusers	10
@@ -15,6 +16,7 @@ options		"TCP_COMPAT_42"
 options		XSERVER,UCONSOLE
 options		PCFS,KERNFS
 options		SCSI
+options		"MATH_EMULATE"
 
 config		netbsd	root on wd0 swap on wd0 and sd0
 
diff --git a/sys/arch/i386/conf/GENERICAHA_DDB b/sys/arch/i386/conf/GENERICAHA_DDB
index d73b9e1deac5..8c1e20dc46ea 100644
--- a/sys/arch/i386/conf/GENERICAHA_DDB
+++ b/sys/arch/i386/conf/GENERICAHA_DDB
@@ -2,11 +2,12 @@
 # GENERICAHA_DDB -- Generic ISA machine, w/non-EISA scsi controller support
 #		    and the kernel debugger.
 #
-#	$Id: GENERICAHA_DDB,v 1.4 1993/05/07 08:33:17 cgd Exp $
+#	$Id: GENERICAHA_DDB,v 1.5 1993/05/20 14:32:27 cgd Exp $
 #
 
 machine		"i386"
-cpu		"i386"
+cpu		"I386_CPU"
+cpu		"I486_CPU"
 ident		GENERICAHA_DDB
 timezone	8 dst
 maxusers	10
@@ -17,6 +18,7 @@ options		XSERVER,UCONSOLE
 options		PCFS,KERNFS
 options		SCSI
 options		DDB
+options		"MATH_EMULATE"
 
 config		netbsd	root on sd0 swap on sd0
 
diff --git a/sys/arch/i386/conf/GENERICAHB b/sys/arch/i386/conf/GENERICAHB
index 55c6fad456ac..76d1f271d18a 100644
--- a/sys/arch/i386/conf/GENERICAHB
+++ b/sys/arch/i386/conf/GENERICAHB
@@ -1,11 +1,12 @@
 #
 # GENERICISA -- Generic ISA machine with aha1742 -- distribution floppy
 #
-#	$Id: GENERICAHB,v 1.11 1993/05/07 08:33:18 cgd Exp $
+#	$Id: GENERICAHB,v 1.12 1993/05/20 14:32:28 cgd Exp $
 #
 
 machine		"i386"
-cpu		"i386"
+cpu		"I386_CPU"
+cpu		"I486_CPU"
 ident		GENERICAHBBT
 timezone	8 dst
 maxusers	10
@@ -15,6 +16,7 @@ options		"TCP_COMPAT_42"
 options		XSERVER,UCONSOLE
 options		PCFS,KERNFS
 options		SCSI
+options		"MATH_EMULATE"
 
 config		netbsd	root on wd0 swap on wd0 and sd0
 
diff --git a/sys/arch/i386/conf/GENERICAHBBT b/sys/arch/i386/conf/GENERICAHBBT
index bf592ce572cc..83e3a612602b 100644
--- a/sys/arch/i386/conf/GENERICAHBBT
+++ b/sys/arch/i386/conf/GENERICAHBBT
@@ -1,11 +1,12 @@
 #
 # GENERICISA -- Generic ISA machine with aha1742 -- distribution floppy
 #
-#	$Id: GENERICAHBBT,v 1.11 1993/05/07 08:33:18 cgd Exp $
+#	$Id: GENERICAHBBT,v 1.12 1993/05/20 14:32:28 cgd Exp $
 #
 
 machine		"i386"
-cpu		"i386"
+cpu		"I386_CPU"
+cpu		"I486_CPU"
 ident		GENERICAHBBT
 timezone	8 dst
 maxusers	10
@@ -15,6 +16,7 @@ options		"TCP_COMPAT_42"
 options		XSERVER,UCONSOLE
 options		PCFS,KERNFS
 options		SCSI
+options		"MATH_EMULATE"
 
 config		netbsd	root on wd0 swap on wd0 and sd0
 
diff --git a/sys/arch/i386/conf/GENERICISA b/sys/arch/i386/conf/GENERICISA
index 1e514404001d..429886ea90ea 100644
--- a/sys/arch/i386/conf/GENERICISA
+++ b/sys/arch/i386/conf/GENERICISA
@@ -1,11 +1,12 @@
 #
 # GENERICISA -- Generic ISA machine -- distribution floppy
 #
-#	$Id: GENERICISA,v 1.15 1993/05/07 08:33:20 cgd Exp $
+#	$Id: GENERICISA,v 1.16 1993/05/20 14:32:29 cgd Exp $
 #
 
 machine		"i386"
-cpu		"i386"
+cpu		"I386_CPU"
+cpu		"I486_CPU"
 ident		GENERICISA
 timezone	8 dst
 maxusers	10
@@ -15,6 +16,7 @@ options		"TCP_COMPAT_42"
 options		XSERVER,UCONSOLE
 options		PCFS,KERNFS
 options		SCSI
+options		"MATH_EMULATE"
 
 config		netbsd	root on wd0 swap on wd0 and sd0
 
diff --git a/sys/arch/i386/conf/GENERICISA_DDB b/sys/arch/i386/conf/GENERICISA_DDB
index fbdb91157491..fcc4e0a3801a 100644
--- a/sys/arch/i386/conf/GENERICISA_DDB
+++ b/sys/arch/i386/conf/GENERICISA_DDB
@@ -1,11 +1,12 @@
 #
 # GENERICISA_DDB -- Generic ISA machine, w/wd and the kernel debugger.
 #
-#	$Id: GENERICISA_DDB,v 1.5 1993/05/07 09:22:40 cgd Exp $
+#	$Id: GENERICISA_DDB,v 1.6 1993/05/20 14:32:30 cgd Exp $
 #
 
 machine		"i386"
-cpu		"i386"
+cpu		"I386_CPU"
+cpu		"I486_CPU"
 ident		GENERICISA_DDB
 timezone	8 dst
 maxusers	10
@@ -15,6 +16,7 @@ options		"TCP_COMPAT_42"
 options		XSERVER,UCONSOLE
 options		PCFS,KERNFS
 options		DDB,"SYMTAB_SPACE=64000"
+options		"MATH_EMULATE"
 
 config		netbsd	root on wd0 swap on wd0
 
diff --git a/sys/arch/i386/conf/LARGE b/sys/arch/i386/conf/LARGE
index e9c2ff84311d..9ecca69d2072 100644
--- a/sys/arch/i386/conf/LARGE
+++ b/sys/arch/i386/conf/LARGE
@@ -1,16 +1,18 @@
 #
 # Everthing sans OSI (need to get an ACCUNET connection -wfj)
 #
-#	$Id: LARGE,v 1.8 1993/05/07 08:33:25 cgd Exp $
+#	$Id: LARGE,v 1.9 1993/05/20 14:32:32 cgd Exp $
 #
 machine		"i386"
-cpu		"i386"
+cpu		"I386_CPU"
+cpu		"I486_CPU"
 ident		LARGE
 timezone	8 dst
 maxusers	30
 options		INET,NFSSERVER,NFSCLIENT,MFS,HSFS,DIAGNOSTIC # OSI real soon
 options		"COMPAT_43","TCP_COMPAT_42"
 options 	DDB
+options		"MATH_EMULATE"
 
 config		netbsd	root on dk0 swap on dk0
 
diff --git a/sys/arch/i386/conf/ODYSSEUS b/sys/arch/i386/conf/ODYSSEUS
index ad153bceb619..fae55828f936 100644
--- a/sys/arch/i386/conf/ODYSSEUS
+++ b/sys/arch/i386/conf/ODYSSEUS
@@ -1,10 +1,10 @@
 #
 # Laptop 386SX Odysseus
 #
-#	$Id: ODYSSEUS,v 1.7 1993/05/07 08:33:28 cgd Exp $
+#	$Id: ODYSSEUS,v 1.8 1993/05/20 14:32:33 cgd Exp $
 #
 machine		"i386"
-cpu		"i386"
+cpu		"I386_CPU"
 ident		ODYSSEUS
 timezone	8 dst
 maxusers	2
@@ -17,6 +17,7 @@ options		DEBUG
 options		DIAGNOSTIC
 options		KGDB
 options		"KGDBDEV=0x800"
+options		"MATH_EMULATE"
 
 config		netbsd	root on dk0 swap on dk0
 
diff --git a/sys/arch/i386/conf/PAIN b/sys/arch/i386/conf/PAIN
index 2b593abdc6bb..c12de6b378a6 100644
--- a/sys/arch/i386/conf/PAIN
+++ b/sys/arch/i386/conf/PAIN
@@ -1,10 +1,10 @@
 #
 # PAIN -- kernel for another of cgd's 486/50 EISA boxes...
 #
-#	$Id: PAIN,v 1.2 1993/05/17 06:17:41 cgd Exp $
+#	$Id: PAIN,v 1.3 1993/05/20 14:32:33 cgd Exp $
 #
 machine         "i386"
-cpu             "i486"
+cpu             "I486_CPU"
 ident           PAIN
 timezone        8 dst
 maxusers        10
diff --git a/sys/arch/i386/conf/PHOENIX b/sys/arch/i386/conf/PHOENIX
index fc73de4b935a..9171b60c535f 100644
--- a/sys/arch/i386/conf/PHOENIX
+++ b/sys/arch/i386/conf/PHOENIX
@@ -1,10 +1,10 @@
 #
 # Compaq DeskPro/20 PHOENIX
 #
-#	$Id: PHOENIX,v 1.8 1993/05/07 08:33:30 cgd Exp $
+#	$Id: PHOENIX,v 1.9 1993/05/20 14:32:35 cgd Exp $
 #
 machine		"i386"
-cpu		"i386"
+cpu		"I386_CPU"
 ident		PHOENIX
 timezone	8 dst
 maxusers	4
@@ -17,6 +17,7 @@ options		"TCP_COMPAT_42"
 #options		DEBUG
 options		DIAGNOSTIC
 options		DDB
+options		"MATH_EMULATE"
 
 config		netbsd	root on wd0 swap on wd0 and as0
 
diff --git a/sys/arch/i386/conf/SERVER b/sys/arch/i386/conf/SERVER
index d80443178e91..cd091efaf949 100644
--- a/sys/arch/i386/conf/SERVER
+++ b/sys/arch/i386/conf/SERVER
@@ -1,10 +1,11 @@
 #
 #	SERVER -- an NFS server
 #
-#	$Id: SERVER,v 1.6 1993/05/07 08:33:32 cgd Exp $
+#	$Id: SERVER,v 1.7 1993/05/20 14:32:36 cgd Exp $
 #
 machine		"i386"
-cpu		"i386"
+cpu		"I386_CPU"
+cpu		"I486_CPU"
 ident		SERVER
 timezone	8 dst
 maxusers	10
@@ -14,6 +15,7 @@ options		"TCP_COMPAT_42"
 options		"i387"
 options		XSERVER,UCONSOLE
 options		KERNFS,FDESC,DDB
+options		"MATH_EMULATE"
 
 config		netbsd	root on wd0 swap on wd0 and as0
 
diff --git a/sys/arch/i386/conf/SMALL b/sys/arch/i386/conf/SMALL
index c4a800ba31d1..e13ee93b7096 100644
--- a/sys/arch/i386/conf/SMALL
+++ b/sys/arch/i386/conf/SMALL
@@ -1,16 +1,18 @@
 #
 # Distribution Floppy
 #
-#	$Id: SMALL,v 1.6 1993/05/07 08:33:33 cgd Exp $
+#	$Id: SMALL,v 1.7 1993/05/20 14:32:37 cgd Exp $
 #
 machine		"i386"
-cpu		"i386"
+cpu		"I386_CPU"
+cpu		"I486_CPU"
 ident		SMALL
 timezone	8 dst
 maxusers	2
 options		INET
 options		"COMPAT_43"
 options		"TCP_COMPAT_42"
+options		"MATH_EMULATE"
 
 config		netbsd	root on dk0 swap on dk0
 
diff --git a/sys/arch/i386/conf/SUMNER b/sys/arch/i386/conf/SUMNER
index aca95fdcb7e5..21cd60929fa8 100644
--- a/sys/arch/i386/conf/SUMNER
+++ b/sys/arch/i386/conf/SUMNER
@@ -1,10 +1,10 @@
 #
 # Thos Sumner's 50Mhz 486
 #
-#	$Id: SUMNER,v 1.9 1993/05/07 08:33:35 cgd Exp $
+#	$Id: SUMNER,v 1.10 1993/05/20 14:32:38 cgd Exp $
 #
 machine		"i386"
-cpu		"i486"
+cpu		"I486_CPU"
 ident		SUMNER
 timezone	8 dst
 maxusers	4
diff --git a/sys/arch/i386/conf/SUN_LAMP b/sys/arch/i386/conf/SUN_LAMP
index 67d58a121008..870bff704f40 100644
--- a/sys/arch/i386/conf/SUN_LAMP
+++ b/sys/arch/i386/conf/SUN_LAMP
@@ -1,10 +1,10 @@
 #
 # SUN_LAMP -- kernel for one of cgd's 486/50 EISA boxes...
 #
-#	$Id: SUN_LAMP,v 1.15 1993/05/07 08:33:37 cgd Exp $
+#	$Id: SUN_LAMP,v 1.16 1993/05/20 14:32:39 cgd Exp $
 #
 machine		"i386"
-cpu		"i486"
+cpu		"I486_CPU"
 ident		SUN_LAMP
 timezone	8 dst
 maxusers	24
diff --git a/sys/arch/i386/conf/TDR b/sys/arch/i386/conf/TDR
index af499d6aefed..f529ee8b7e0f 100644
--- a/sys/arch/i386/conf/TDR
+++ b/sys/arch/i386/conf/TDR
@@ -1,10 +1,10 @@
 #
-# GENERICISA -- Generic ISA machine -- distribution floppy
+# Theo Deraadt's 386
 #
-#	$Id: TDR,v 1.7 1993/05/07 08:33:39 cgd Exp $
+#	$Id: TDR,v 1.8 1993/05/20 14:32:40 cgd Exp $
 #
 machine		"i386"
-cpu		"i386"
+cpu		"I386_CPU"
 ident		TDR
 timezone	7 dst
 maxusers	10
@@ -13,6 +13,7 @@ options		"COMPAT_43"
 options		"TCP_COMPAT_42"
 options		SCSI,ISOFS
 options 	DDB
+options		"MATH_EMULATE"
 
 config		netbsd	root on wd0 swap on wd0
 
diff --git a/sys/arch/i386/conf/TRINITY b/sys/arch/i386/conf/TRINITY
index 3180e121d61c..4e59ad899bc8 100644
--- a/sys/arch/i386/conf/TRINITY
+++ b/sys/arch/i386/conf/TRINITY
@@ -1,15 +1,14 @@
 #
 # TRINITY -- Mycroft's 386 box
 #
-#	$Id: TRINITY,v 1.6 1993/05/07 08:33:40 cgd Exp $
+#	$Id: TRINITY,v 1.7 1993/05/20 14:32:41 cgd Exp $
 #
 
 machine		"i386"
-cpu		"i386"
+cpu		"I386_CPU"
 ident		TRINITY
 timezone	5 dst
 maxusers	16
-options		"i387"
 options		INET,NFSCLIENT
 options		"COMPAT_43"
 options		"TCP_COMPAT_42"
diff --git a/sys/arch/i386/conf/UHATEST b/sys/arch/i386/conf/UHATEST
index e8db4adb6aef..aa904c0ee38e 100644
--- a/sys/arch/i386/conf/UHATEST
+++ b/sys/arch/i386/conf/UHATEST
@@ -1,10 +1,11 @@
 #
 # SCSITEST -- Generic ISA machine -- scsi test kernel -ultrastore 14f adapter
 #
-#	$Id: UHATEST,v 1.10 1993/05/07 08:33:42 cgd Exp $
+#	$Id: UHATEST,v 1.11 1993/05/20 14:32:42 cgd Exp $
 #
 machine		"i386"
-cpu		"i386"
+cpu		"I386_CPU"
+cpu		"I486_CPU"
 ident		UHATEST
 timezone	8 dst
 maxusers	10
@@ -13,6 +14,7 @@ options		"COMPAT_43"
 options		"TCP_COMPAT_42"
 options		SCSI
 options		DDB
+options		"MATH_EMULATE"
 
 config		netbsd	root on wd0 swap on wd0 and sd0
 
diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index 1c16cf889555..9a35d4f94d78 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -1,4 +1,4 @@
-# $Id: files.i386,v 1.11 1993/05/18 08:54:22 cgd Exp $
+# $Id: files.i386,v 1.12 1993/05/20 14:32:43 cgd Exp $
 #
 arch/i386/i386/autoconf.c	standard
 arch/i386/i386/cons.c	standard
@@ -7,7 +7,7 @@ arch/i386/i386/db_interface.c	optional ddb
 arch/i386/i386/db_trace.c	optional ddb
 arch/i386/i386/in_cksum.c	optional inet
 arch/i386/i386/machdep.c	standard config-dependent
-arch/i386/i386/math_emulate.c	standard
+arch/i386/i386/math_emulate.c	optional math_emulate
 arch/i386/i386/mem.c		standard
 arch/i386/i386/microtime.s   standard
 arch/i386/i386/ns_cksum.c	optional ns