Remove support for 80386 processors. Apologies if you have one of

the rare 80386-bases system with enough memory, a 387 FPU, a useable
disk subsystem, and the patience to wait for it to unpack the
distribution .tgz files.

approval from art@ and many others (esp. nick@); ok deraadt@

6 files changed, 11 insertions, 21 deletions

diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 10a8187e170..6e51d4f1e97 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.562 2007/05/28 23:50:23 beck Exp $
+#	$OpenBSD: GENERIC,v 1.563 2007/05/29 18:18:19 tom Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -13,8 +13,7 @@ machine		i386
 include		"../../../conf/GENERIC"
 maxusers	32			# estimated number of users
 
-option		I386_CPU	# CPU classes; at least one is REQUIRED
-option		I486_CPU
+option		I486_CPU	# CPU classes; at least one is REQUIRED
 option		I586_CPU
 option		I686_CPU
 
diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386
index 6f61d92eaa4..a5058be4b16 100644
--- a/sys/arch/i386/conf/Makefile.i386
+++ b/sys/arch/i386/conf/Makefile.i386
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.i386,v 1.45 2006/11/29 22:40:11 miod Exp $
+#	$OpenBSD: Makefile.i386,v 1.46 2007/05/29 18:18:19 tom Exp $
 
 # Makefile for OpenBSD
 #
@@ -39,11 +39,6 @@ CDIAGFLAGS=	-Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
 		-Wno-uninitialized -Wno-format -Wno-main \
 		-Wstack-larger-than-2047
 
-.if !${IDENT:M-DI386_CPU}
-CMACHFLAGS=	-march=i486
-.else
-CMACHFLAGS=
-.endif
 .if ${IDENT:M-DNO_PROPOLICE}
 CMACHFLAGS+=	-fno-stack-protector
 .endif
diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK
index c32a4d3de3a..f44df65916b 100644
--- a/sys/arch/i386/conf/RAMDISK
+++ b/sys/arch/i386/conf/RAMDISK
@@ -1,12 +1,11 @@
-#	$OpenBSD: RAMDISK,v 1.151 2007/05/28 03:12:38 krw Exp $
+#	$OpenBSD: RAMDISK,v 1.152 2007/05/29 18:18:19 tom Exp $
 
 machine		i386		# architecture, used by config; REQUIRED
 
 option		SCSITERSE
 option		APM_NOPRINT
 
-option		I386_CPU	# CPU classes; at least one is REQUIRED
-option		I486_CPU
+option		I486_CPU	# CPU classes; at least one is REQUIRED
 option		I586_CPU
 option		I686_CPU
 
diff --git a/sys/arch/i386/conf/RAMDISKB b/sys/arch/i386/conf/RAMDISKB
index 39e70ae6ea7..8c50c1e6f87 100644
--- a/sys/arch/i386/conf/RAMDISKB
+++ b/sys/arch/i386/conf/RAMDISKB
@@ -1,12 +1,11 @@
-#	$OpenBSD: RAMDISKB,v 1.96 2007/05/28 03:12:38 krw Exp $
+#	$OpenBSD: RAMDISKB,v 1.97 2007/05/29 18:18:19 tom Exp $
 
 machine		i386		# architecture, used by config; REQUIRED
 
 option		SCSITERSE
 option		APM_NOPRINT
 
-option		I386_CPU	# CPU classes; at least one is REQUIRED
-option		I486_CPU
+option		I486_CPU	# CPU classes; at least one is REQUIRED
 option		I586_CPU
 option		I686_CPU
 
diff --git a/sys/arch/i386/conf/RAMDISKC b/sys/arch/i386/conf/RAMDISKC
index 858bc16e9c9..48dd78dab70 100644
--- a/sys/arch/i386/conf/RAMDISKC
+++ b/sys/arch/i386/conf/RAMDISKC
@@ -1,12 +1,11 @@
-#	$OpenBSD: RAMDISKC,v 1.73 2007/05/28 03:12:38 krw Exp $
+#	$OpenBSD: RAMDISKC,v 1.74 2007/05/29 18:18:19 tom Exp $
 
 machine		i386		# architecture, used by config; REQUIRED
 
 option		SCSITERSE
 option		APM_NOPRINT
 
-option		I386_CPU	# CPU classes; at least one is REQUIRED
-option		I486_CPU
+option		I486_CPU	# CPU classes; at least one is REQUIRED
 option		I586_CPU
 option		I686_CPU
 
diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD
index 5b89d0480d8..f8476b74cc7 100644
--- a/sys/arch/i386/conf/RAMDISK_CD
+++ b/sys/arch/i386/conf/RAMDISK_CD
@@ -1,12 +1,11 @@
-#	$OpenBSD: RAMDISK_CD,v 1.139 2007/05/28 03:12:38 krw Exp $
+#	$OpenBSD: RAMDISK_CD,v 1.140 2007/05/29 18:18:19 tom Exp $
 
 machine		i386		# architecture, used by config; REQUIRED
 
 option		SCSITERSE
 option		APM_NOPRINT
 
-option		I386_CPU	# CPU classes; at least one is REQUIRED
-option		I486_CPU
+option		I486_CPU	# CPU classes; at least one is REQUIRED
 option		I586_CPU
 option		I686_CPU