From 1484fa567d6c2475a2c6a329b14e75fe3401c2be Mon Sep 17 00:00:00 2001
From: thorpej <thorpej@NetBSD.org>
Date: Thu, 15 Jan 1998 19:47:36 +0000
Subject: [PATCH] Generate dependencies on the CPU type options (I386_CPU,
 I486_CPU, ...)

---
 sys/arch/i386/conf/files.i386  | 5 ++++-
 sys/arch/i386/i386/locore.s    | 5 +++--
 sys/arch/i386/i386/machdep.c   | 4 +++-
 sys/arch/i386/i386/pmap.c      | 4 +++-
 sys/arch/i386/include/endian.h | 8 ++++++--
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index fd4cd28e6678..23b0aa4dfae9 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -1,4 +1,4 @@
-#	$NetBSD: files.i386,v 1.99 1998/01/15 07:40:06 thorpej Exp $
+#	$NetBSD: files.i386,v 1.100 1998/01/15 19:47:36 thorpej Exp $
 #
 # new style config file for i386 architecture
 #
@@ -8,6 +8,9 @@ maxpartitions 8
 
 maxusers 2 16 64
 
+# Processor type options.
+defopt	opt_cputype.h I386_CPU I486_CPU I586_CPU I686_CPU
+
 file	arch/i386/i386/autoconf.c
 file	arch/i386/i386/conf.c
 file	arch/i386/i386/db_disasm.c	ddb
diff --git a/sys/arch/i386/i386/locore.s b/sys/arch/i386/i386/locore.s
index 252de7ae9699..453580fabc73 100644
--- a/sys/arch/i386/i386/locore.s
+++ b/sys/arch/i386/i386/locore.s
@@ -1,5 +1,4 @@
-
-/*	$NetBSD: locore.s,v 1.179 1997/11/19 11:11:22 mycroft Exp $	*/
+/*	$NetBSD: locore.s,v 1.180 1998/01/15 19:47:37 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994, 1995, 1997
@@ -41,6 +40,8 @@
  *	@(#)locore.s	7.3 (Berkeley) 5/13/91
  */
 
+#include "opt_cputype.h"
+
 #include "npx.h"
 #include "assym.h"
 #include "apm.h"
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index f05d2da19e15..748583a4981a 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.270 1998/01/13 12:52:16 mrg Exp $	*/
+/*	$NetBSD: machdep.c,v 1.271 1998/01/15 19:47:39 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -78,6 +78,8 @@
  *	@(#)machdep.c	7.4 (Berkeley) 6/3/91
  */
 
+#include "opt_cputype.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/signalvar.h>
diff --git a/sys/arch/i386/i386/pmap.c b/sys/arch/i386/i386/pmap.c
index 990f5a1356f3..4ca6eaf50185 100644
--- a/sys/arch/i386/i386/pmap.c
+++ b/sys/arch/i386/i386/pmap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.51 1998/01/13 12:52:21 mrg Exp $	*/
+/*	$NetBSD: pmap.c,v 1.52 1998/01/15 19:47:42 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1993, 1994, 1995, 1997 Charles M. Hannum.  All rights reserved.
@@ -78,6 +78,8 @@
  *	and to when physical maps must be made correct.
  */
 
+#include "opt_cputype.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
diff --git a/sys/arch/i386/include/endian.h b/sys/arch/i386/include/endian.h
index af751a3117d0..0d365f9ea534 100644
--- a/sys/arch/i386/include/endian.h
+++ b/sys/arch/i386/include/endian.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: endian.h,v 1.21 1997/10/09 15:42:22 bouyer Exp $	*/
+/*	$NetBSD: endian.h,v 1.22 1998/01/15 19:47:43 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1995 Charles M. Hannum.  All rights reserved.
@@ -75,7 +75,11 @@ __END_DECLS
 
 #ifdef __GNUC__
 
-#if defined(_KERNEL) && !defined(I386_CPU)
+#if defined(_KERNEL) && !defined(_LKM)
+#include "opt_cputype.h"
+#endif
+
+#if defined(_KERNEL) && !defined(_LKM) && !defined(I386_CPU)
 #define	__byte_swap_long_variable(x) \
 ({ register in_addr_t __x = (x); \
    __asm ("bswap %1" \