>From NetBSD

Change the cpu "i386" line to 2 lines:
cpu "I386_CPU"
cpu "I486_CPU"
This is so we can do real CPU classification of code.

Fix missing depend for assym.s which does depend on genassym.c

diff --git a/sys/i386/conf/GENERICAH b/sys/i386/conf/GENERICAH
index c18d8ba..d61cdd3 100644 (file)
--- a/sys/i386/conf/GENERICAH
+++ b/sys/i386/conf/GENERICAH
@@ -1,11 +1,12 @@
 #
 # GENERICAH -- Generic machine with WD/AHx family disks
 #
 #
 # GENERICAH -- Generic machine with WD/AHx family disks
 #

-#      $Id: GENERICAH,v 1.11 1993/09/30 20:44:29 rgrimes Exp $
+#      $Id: GENERICAH,v 1.12 1993/10/01 04:20:13 rgrimes Exp $

 #
 
 machine                "i386"
 #
 
 machine                "i386"

-cpu            "i386"
+cpu            "I386_CPU"
+cpu            "I486_CPU"

 ident          GENERICAH
 timezone       8 dst
 maxusers       10
 ident          GENERICAH
 timezone       8 dst
 maxusers       10

diff --git a/sys/i386/conf/GENERICBT b/sys/i386/conf/GENERICBT
index 8d236ba..1092fac 100644 (file)
--- a/sys/i386/conf/GENERICBT
+++ b/sys/i386/conf/GENERICBT
@@ -1,11 +1,12 @@
 #
 # GENERICBT -- Generic machine with WD/BTx family disks
 #
 #
 # GENERICBT -- Generic machine with WD/BTx family disks
 #

-#      $Id: GENERICBT,v 1.9 1993/09/30 20:44:31 rgrimes Exp $
+#      $Id: GENERICBT,v 1.10 1993/10/01 04:20:14 rgrimes Exp $

 #
 
 machine                "i386"
 #
 
 machine                "i386"

-cpu            "i386"
+cpu            "I386_CPU"
+cpu            "I486_CPU"

 ident          GENERICBT
 timezone       8 dst
 maxusers       10
 ident          GENERICBT
 timezone       8 dst
 maxusers       10

diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index c89925f..ad1fe79 100644 (file)
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -4,11 +4,12 @@
 #
 #      This kernel is NOT MEANT to be runnable!
 #
 #
 #      This kernel is NOT MEANT to be runnable!
 #

-#      $Id: LINT,v 1.12 1993/09/30 20:45:37 rgrimes Exp $
+#      $Id: LINT,v 1.13 1993/10/01 04:20:16 rgrimes Exp $

 #
 
 machine                "i386"
 #
 
 machine                "i386"

-cpu            "i386"
+cpu            "I386_CPU"
+cpu            "I486_CPU"

 ident          LINT
 timezone       8 dst
 maxusers       10
 ident          LINT
 timezone       8 dst
 maxusers       10

diff --git a/sys/i386/conf/Makefile.i386 b/sys/i386/conf/Makefile.i386
index eb526af..5b04970 100644 (file)
--- a/sys/i386/conf/Makefile.i386
+++ b/sys/i386/conf/Makefile.i386
@@ -1,6 +1,6 @@
 # Copyright 1990 W. Jolitz
 #      from: @(#)Makefile.i386 7.1 5/10/91
 # Copyright 1990 W. Jolitz
 #      from: @(#)Makefile.i386 7.1 5/10/91

-#      $Id: Makefile.i386,v 1.5 1993/09/26 19:44:33 rgrimes Exp $
+#      $Id: Makefile.i386,v 1.6 1993/10/06 20:49:17 rgrimes Exp $

 #
 # Makefile for FreeBSD
 #
 #
 # Makefile for FreeBSD
 #


@@ -106,7 +106,7 @@ assym.s: $S/sys/param.h machine/pte.h $S/sys/buf.h \
 assym.s: genassym
        ./genassym >assym.s
 
 assym.s: genassym
        ./genassym >assym.s
 

-genassym:
+genassym: ${I386}/i386/genassym.c

        ${CC} ${INCLUDES} -DKERNEL ${IDENT} ${PARAM} \
                 ${I386}/i386/genassym.c -o genassym
 
        ${CC} ${INCLUDES} -DKERNEL ${IDENT} ${PARAM} \
                 ${I386}/i386/genassym.c -o genassym
 

diff --git a/sys/i386/conf/SYSCONS b/sys/i386/conf/SYSCONS
index 0fe588d..221333f 100644 (file)
--- a/sys/i386/conf/SYSCONS
+++ b/sys/i386/conf/SYSCONS
@@ -1,11 +1,12 @@
 #
 # SYSCONS -- Generic machine with WD/AHx family disks and syscons
 #
 #
 # SYSCONS -- Generic machine with WD/AHx family disks and syscons
 #

-#      $Id: SYSCONS,v 1.8 1993/10/01 04:20:18 rgrimes Exp $
+#      $Id: SYSCONS,v 1.9 1993/10/01 04:26:21 rgrimes Exp $

 #
 
 machine                "i386"
 #
 
 machine                "i386"

-cpu            "i386"
+cpu            "I386_CPU"
+cpu            "I486_CPU"

 ident          SYSCONS
 timezone       8 dst
 maxusers       10
 ident          SYSCONS
 timezone       8 dst
 maxusers       10